aboutsummaryrefslogtreecommitdiff
path: root/src/support/filesystem_context.cc
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/support/filesystem_context.cc
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/support/filesystem_context.cc')
-rw-r--r--src/support/filesystem_context.cc6
1 files changed, 2 insertions, 4 deletions
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<char>(locator->getSystemId()) + 7
- ).parent_path().string()
+ path.parent_path()
)) { }
FilesystemContext::FilesystemContext(const std::string& path):