From f69c1e4e774ee6db9c9551ec7a6a32c840686f18 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Sun, 13 Jul 2014 21:47:16 +0200
Subject: Fixed base path resolution of include path entities * the base path
 of entities resolved through square bracket include paths was not resolved
 correctly due to missing extraction

---
 src/support/include_entity_resolver.cc | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/support')

diff --git a/src/support/include_entity_resolver.cc b/src/support/include_entity_resolver.cc
index b9e20f9..deac1d5 100644
--- a/src/support/include_entity_resolver.cc
+++ b/src/support/include_entity_resolver.cc
@@ -40,11 +40,17 @@ namespace InputXSLT {
 
 boost::filesystem::path IncludeEntityResolver::getPathFromSystemId(
 	const XMLCh* const systemId) {
-	return boost::filesystem::path(
+	const std::string rawPath(
 		*XercesStringGuard<char>(
 			shiftSystemIdPastPrefix(systemId)
 		)
 	);
+
+	if ( auto extractedPath = extractFilePath(rawPath) ) {
+		return *extractedPath;
+	} else {
+		return boost::filesystem::path(rawPath);
+	}
 }
 
 IncludeEntityResolver::IncludeEntityResolver(
-- 
cgit v1.2.3