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/support/filesystem_context.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/support/filesystem_context.cc') diff --git a/src/support/filesystem_context.cc b/src/support/filesystem_context.cc index eba7e45..a18ec43 100644 --- a/src/support/filesystem_context.cc +++ b/src/support/filesystem_context.cc @@ -8,11 +8,9 @@ namespace InputXSLT { -FilesystemContext::FilesystemContext(const xalan::Locator* locator): +FilesystemContext::FilesystemContext(const boost::filesystem::path& path): path_(boost::filesystem::canonical( - boost::filesystem::path( - *XercesStringGuard(locator->getSystemId()) + 7 - ).parent_path().string() + path.parent_path() )) { } FilesystemContext::FilesystemContext(const std::string& path): -- cgit v1.2.3