From 2c89112141530617b51af8c41211c2507ec8c738 Mon Sep 17 00:00:00 2001 From: Adrian Kummerlaender Date: Wed, 20 Aug 2014 22:28:15 +0200 Subject: Setting the correct work directory in FunctionExternalCommand * changed the XObjectValue constructor to accept a pointer to FilesystemContext instead of instantiating the context by itself * the FilesystemContext is now instantiated in the "callConstructDocument" member method of "FunctionBase" ** a const reference to FilesystemContext is passed to all "constructDocument" member method implementations * the FilesystemContext is currently only used by FunctionExternal command to set the correct work directory in "boost::process::context" ** this is required so calling external commands from inside a stylesheet works as expected *** i.e. from inside the directory the stylesheet is located in * modified all remaining external function implementations accordingly --- src/function/read_file.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/function/read_file.cc') diff --git a/src/function/read_file.cc b/src/function/read_file.cc index 42cb4a4..3718f04 100644 --- a/src/function/read_file.cc +++ b/src/function/read_file.cc @@ -60,7 +60,9 @@ boost::optional readPlainFile( namespace InputXSLT { DomDocumentCache::document_ptr FunctionReadFile::constructDocument( - boost::filesystem::path filePath) const { + const FilesystemContext&, + boost::filesystem::path filePath +) const { DomDocumentCache::document_ptr domDocument( DomDocumentCache::createDocument("content") ); -- cgit v1.2.3