aboutsummaryrefslogtreecommitdiff
path: root/src/function
diff options
context:
space:
mode:
Diffstat (limited to 'src/function')
-rw-r--r--src/function/base.h17
-rw-r--r--src/function/read_directory.cc4
-rw-r--r--src/function/read_file.cc6
-rw-r--r--src/function/read_xml_file.cc6
-rw-r--r--src/function/transform.cc11
5 files changed, 26 insertions, 18 deletions
diff --git a/src/function/base.h b/src/function/base.h
index 5604186..7fbd818 100644
--- a/src/function/base.h
+++ b/src/function/base.h
@@ -11,6 +11,7 @@
#include <array>
#include "common.h"
+#include "support/xalan_string.h"
#include "support/dom/document_cache.h"
#include "support/filesystem_context.h"
@@ -22,10 +23,7 @@ template <
>
class FunctionBase : public xalan::Function {
public:
- typedef std::array<
- boost::filesystem::path,
- ArgumentCount
- > argument_array;
+ typedef std::array<std::string, ArgumentCount> argument_array;
FunctionBase():
document_cache_(std::make_shared<DomDocumentCache>()) { }
@@ -43,15 +41,14 @@ class FunctionBase : public xalan::Function {
locator
);
- const FilesystemContext fsContext(locator);
argument_array pathArguments;
std::transform(
rawArguments.begin(),
rawArguments.end(),
pathArguments.begin(),
- [&fsContext](const xalan::XObjectPtr& ptr) -> boost::filesystem::path {
- return fsContext.resolve(ptr->str());
+ [](const xalan::XObjectPtr& ptr) -> std::string {
+ return toString(ptr->str());
}
);
@@ -60,7 +57,7 @@ class FunctionBase : public xalan::Function {
static_cast<Implementation*>(
const_cast<FunctionBase*>(this)
)->constructDocument(
- fsContext,
+ FilesystemContext(locator),
pathArguments
)
)
@@ -108,7 +105,7 @@ class FunctionBase : public xalan::Function {
xalan::XalanNode* context,
const xalan::Locator* locator
) const {
- const bool notNull = std::none_of(
+ const bool anyNull = std::any_of(
rawArguments.begin(),
rawArguments.end(),
[](const xalan::XObjectPtr& ptr) -> bool {
@@ -116,7 +113,7 @@ class FunctionBase : public xalan::Function {
}
);
- if ( rawArguments.size() != ArgumentCount && notNull ) {
+ if ( rawArguments.size() != ArgumentCount || anyNull ) {
xalan::XPathExecutionContext::GetAndReleaseCachedString guard(
executionContext
);
diff --git a/src/function/read_directory.cc b/src/function/read_directory.cc
index e030e33..54d3d0d 100644
--- a/src/function/read_directory.cc
+++ b/src/function/read_directory.cc
@@ -13,7 +13,9 @@ xercesc::DOMDocument* FunctionReadDirectory::constructDocument(
const InputXSLT::FilesystemContext& fsContext,
const FunctionBase::argument_array& arguments
) {
- const boost::filesystem::path& directoryPath = arguments[0];
+ const boost::filesystem::path directoryPath(
+ fsContext.resolve(arguments[0])
+ );
xercesc::DOMDocument* const domDocument(
xercesc::DOMImplementation::getImplementation()->createDocument(
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(
diff --git a/src/function/read_xml_file.cc b/src/function/read_xml_file.cc
index b3bf3de..cf2cadd 100644
--- a/src/function/read_xml_file.cc
+++ b/src/function/read_xml_file.cc
@@ -33,10 +33,12 @@ inline xercesc::DOMNode* importDocumentElement(
namespace InputXSLT {
xercesc::DOMDocument* FunctionReadXmlFile::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(
diff --git a/src/function/transform.cc b/src/function/transform.cc
index 360b61d..5c53044 100644
--- a/src/function/transform.cc
+++ b/src/function/transform.cc
@@ -10,11 +10,16 @@
namespace InputXSLT {
xercesc::DOMDocument* FunctionTransform::constructDocument(
- const InputXSLT::FilesystemContext&,
+ const InputXSLT::FilesystemContext& fsContext,
const FunctionBase::argument_array& arguments
) {
- const boost::filesystem::path& transformationPath = arguments[0];
- const boost::filesystem::path& targetPath = arguments[1];
+ const boost::filesystem::path transformationPath(
+ fsContext.resolve(arguments[0])
+ );
+
+ const boost::filesystem::path targetPath(
+ fsContext.resolve(arguments[1])
+ );
xercesc::DOMDocument* const domDocument(
xercesc::DOMImplementation::getImplementation()->createDocument(