From 0d670478b51c55e44f57995fe3ca8a4585723a6c Mon Sep 17 00:00:00 2001 From: Adrian Kummerlaender Date: Tue, 17 Jun 2014 21:28:04 +0200 Subject: Added context awareness to XObjectValue casting logic * added support for defining boost::filesystem::path as a external function parameter ** boost::filesystem::path parameters are resolved against the appropriate FilesystemContext and IncludeEntityResolver instances * xalan::XSLTInputSource parameter source paths are also resolved * removed need for passing a reference FilesystemContext to "constructDocument" methods ** they now only accept the parameters of the external function implemented by them ** all path resolution logic is wrapped by the newly created XObjectValue class * converted XObjectValue namespace into class ** the "get" template method is now a template member method ** this was needed to enable value casting logic to access the appropriate FilesystemContext and IncludeEntityResolver instances * this commit marks the next step towards the goals defined in 741a70f --- src/function/read_directory.cc | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/function/read_directory.cc') diff --git a/src/function/read_directory.cc b/src/function/read_directory.cc index cfbe302..884963e 100644 --- a/src/function/read_directory.cc +++ b/src/function/read_directory.cc @@ -10,13 +10,7 @@ namespace InputXSLT { xercesc::DOMDocument* FunctionReadDirectory::constructDocument( - const InputXSLT::FilesystemContext& fsContext, - std::string path -) { - const boost::filesystem::path directoryPath( - fsContext.resolve(path) - ); - + boost::filesystem::path directoryPath) { xercesc::DOMDocument* const domDocument( xercesc::DOMImplementation::getImplementation()->createDocument( nullptr, @@ -37,7 +31,7 @@ xercesc::DOMDocument* FunctionReadDirectory::constructDocument( xercesc::DOMNode* const resultNode = result.getNode(); - fsContext.iterate( + FilesystemContext::iterate( directoryPath, [&domDocument, &resultNode](const boost::filesystem::path& p) { ResultNodeFacade result(domDocument, resultNode, "entry"); -- cgit v1.2.3