aboutsummaryrefslogtreecommitdiff
path: root/src/function/read_file.cc
diff options
context:
space:
mode:
authorAdrian Kummerlaender2014-08-20 22:28:15 +0200
committerAdrian Kummerlaender2014-08-20 22:28:15 +0200
commit2c89112141530617b51af8c41211c2507ec8c738 (patch)
treec467e07340c55cf81090315e79e85af05b542647 /src/function/read_file.cc
parentb31f9170c2bc2330442070968d3cb334cadb5faa (diff)
downloadInputXSLT-2c89112141530617b51af8c41211c2507ec8c738.tar
InputXSLT-2c89112141530617b51af8c41211c2507ec8c738.tar.gz
InputXSLT-2c89112141530617b51af8c41211c2507ec8c738.tar.bz2
InputXSLT-2c89112141530617b51af8c41211c2507ec8c738.tar.lz
InputXSLT-2c89112141530617b51af8c41211c2507ec8c738.tar.xz
InputXSLT-2c89112141530617b51af8c41211c2507ec8c738.tar.zst
InputXSLT-2c89112141530617b51af8c41211c2507ec8c738.zip
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
Diffstat (limited to 'src/function/read_file.cc')
-rw-r--r--src/function/read_file.cc4
1 files changed, 3 insertions, 1 deletions
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<std::string> 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")
);