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 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/function/base.h')

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...>
-- 
cgit v1.2.3