aboutsummaryrefslogtreecommitdiff
path: root/src/function/base.h
diff options
context:
space:
mode:
authorAdrian Kummerländer2014-06-09 14:24:26 +0200
committerAdrian Kummerländer2014-06-09 14:24:26 +0200
commit516ff636f760458c33676458fc88892faab9d376 (patch)
tree8c0bc2790fa8025fed9173d9e0abba22408ac303 /src/function/base.h
parentf13e1fa9a41006d80e6923489414cfdc2fcadd08 (diff)
downloadInputXSLT-516ff636f760458c33676458fc88892faab9d376.tar
InputXSLT-516ff636f760458c33676458fc88892faab9d376.tar.gz
InputXSLT-516ff636f760458c33676458fc88892faab9d376.tar.bz2
InputXSLT-516ff636f760458c33676458fc88892faab9d376.tar.lz
InputXSLT-516ff636f760458c33676458fc88892faab9d376.tar.xz
InputXSLT-516ff636f760458c33676458fc88892faab9d376.tar.zst
InputXSLT-516ff636f760458c33676458fc88892faab9d376.zip
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
Diffstat (limited to 'src/function/base.h')
-rw-r--r--src/function/base.h6
1 files changed, 5 insertions, 1 deletions
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...>