From 516ff636f760458c33676458fc88892faab9d376 Mon Sep 17 00:00:00 2001
From: Adrian Kummerländer
Date: Mon, 9 Jun 2014 14:24:26 +0200
Subject: Added include path resolution to FilesystemContext constructor *
 extracted system id handling into separate "resolve" method overload of
 "IncludeEntityResolver" class * paths to be resolved against the include path
 vector are enclosed by square brackets ** FilesystemContext for external
 functions was instantiated using the unmodified systemId provided by
 xalan::Locator ** this commit adds include path resolution to that step ***
 exceptions were thrown as the program tried to instantiate a
 FilesystemContext instance without resolving the square bracket syntax *
 changed FunctionTransform "target" attribute content to the target path
 filename instead of the full path

---
 src/function/base.h       |  6 +++++-
 src/function/transform.cc | 16 ++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'src/function')

diff --git a/src/function/base.h b/src/function/base.h
index 3ca1d61..f2b3d5c 100644
--- a/src/function/base.h
+++ b/src/function/base.h
@@ -100,7 +100,11 @@ class FunctionBase : public xalan::Function {
 				static_cast<Implementation*>(
 					const_cast<FunctionBase*>(this)
 				)->constructDocument(
-					FilesystemContext(locator),
+					FilesystemContext(
+						this->include_resolver_->resolve(
+							locator->getSystemId()
+						)
+					),
 					XObjectValue::get<typename std::tuple_element<
 						Index,
 						std::tuple<Types...>
diff --git a/src/function/transform.cc b/src/function/transform.cc
index 7e6207c..059260d 100644
--- a/src/function/transform.cc
+++ b/src/function/transform.cc
@@ -34,9 +34,6 @@ xercesc::DOMDocument* FunctionTransform::constructDocument(
 	std::string                         targetPath,
 	xalan::XObjectPtr                   parameterObject
 ) {
-	transformationPath = fsContext.resolve(transformationPath).string();
-	targetPath         = fsContext.resolve(targetPath).string();
-
 	xercesc::DOMDocument* const domDocument(
 		xercesc::DOMImplementation::getImplementation()->createDocument(
 			nullptr,
@@ -50,15 +47,22 @@ xercesc::DOMDocument* FunctionTransform::constructDocument(
 	);
 
 	ResultNodeFacade result(domDocument, rootNode, "transformation");
-	result.setAttribute("target", targetPath);
+
+	result.setAttribute(
+		"target",
+		boost::filesystem::path(targetPath).filename().string()
+	);
 
 	if ( auto transformation = TransformationFacade::try_create(
-		transformationPath,
+		fsContext.resolve(transformationPath).string(),
 		this->include_resolver_,
 		handleErrors(result)
 	) ) {
 		try {
-			transformation->generate(targetPath, parameterObject);
+			transformation->generate(
+				fsContext.resolve(targetPath).string(),
+				parameterObject
+			);
 
 			result.setAttribute("result", "success");
 		}
-- 
cgit v1.2.3