From 5fbca0993146982ab1dbb0d352c1e15e40b3de22 Mon Sep 17 00:00:00 2001 From: Adrian Kummerländer Date: Wed, 14 May 2014 20:55:51 +0200 Subject: Moved responsibility for argument conversion to FunctionBase descendants * external functions may expect arguments with a type different from boost::filesystem::path so they are only provided raw string values * moved xalan string conversion logic into separate compilation unit --- src/function/read_file.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/function/read_file.cc') diff --git a/src/function/read_file.cc b/src/function/read_file.cc index da0e988..19ca296 100644 --- a/src/function/read_file.cc +++ b/src/function/read_file.cc @@ -25,10 +25,12 @@ inline std::string readFile(const boost::filesystem::path& filePath) { namespace InputXSLT { xercesc::DOMDocument* FunctionReadFile::constructDocument( - const FilesystemContext&, + const FilesystemContext& fsContext, const FunctionBase::argument_array& arguments ) { - const boost::filesystem::path& filePath = arguments[0]; + const boost::filesystem::path filePath( + fsContext.resolve(arguments[0]) + ); xercesc::DOMDocument* const domDocument( xercesc::DOMImplementation::getImplementation()->createDocument( -- cgit v1.2.3