4 files changed, 33 insertions, 13 deletions

diff --git a/src/function/read_file.cc b/src/function/read_file.cc
index efc1f61..dcbff25 100644
--- a/src/function/read_file.cc
+++ b/src/function/read_file.cc
@@ -1,7 +1,12 @@
 #include "read_file.h"
 
+#include "utility.h"
+
 namespace InputXSLT {
 
+FunctionReadFile::FunctionReadFile(const std::string& path):
+	path_(path) { }
+
 xalan::XObjectPtr FunctionReadFile::execute(
 	xalan::XPathExecutionContext&                executionContext,
 	xalan::XalanNode*                            context,
@@ -16,20 +21,21 @@ xalan::XObjectPtr FunctionReadFile::execute(
 		generalError(executionContext, context, locator);
 	}
 
-	xalan::CharVectorType fileNameVector;
-	std::string fileNameString;
+	xalan::CharVectorType castHelper;
+	arguments[0]->str().transcode(castHelper);
 
-	arguments[0]->str().transcode(fileNameVector);
+	std::string fileName(this->path_);
+	fileName.reserve(fileName.size() + castHelper.size());
 
 	std::move(
-		fileNameVector.begin(),
-		fileNameVector.end(),
-		fileNameString.begin()
+		castHelper.begin(),
+		castHelper.end(),
+		fileName.end()
 	);
 
 	return executionContext.getXObjectFactory().createString(
 		xalan::XalanDOMString(
-			InputXSLT::readFile(fileNameString).data()
+			InputXSLT::readFile(fileName).data()
 		)
 	);
 }
diff --git a/src/function/read_file.h b/src/function/read_file.h
index dbcf3d6..f800c37 100644
--- a/src/function/read_file.h
+++ b/src/function/read_file.h
@@ -8,12 +8,16 @@
 #include <xalanc/XPath/Function.hpp>
 #include <xalanc/XPath/XObject.hpp>
 
-#include "utility.h"
+#include <string>
+
+#include "common.h"
 
 namespace InputXSLT {
 
 class FunctionReadFile : public xalan::Function {
 	public:
+		FunctionReadFile(const std::string&);
+
 		virtual xalan::XObjectPtr execute(
 			xalan::XPathExecutionContext&,
 			xalan::XalanNode*,
@@ -27,6 +31,8 @@ class FunctionReadFile : public xalan::Function {
 		bool operator==(const FunctionReadFile&) const       = delete;
 
 	private:
+		const std::string path_;
+
 		const xalan::XalanDOMString& getError(xalan::XalanDOMString&) const;
 
 };
diff --git a/src/function/read_xml_file.cc b/src/function/read_xml_file.cc
index 616d189..be091a0 100644
--- a/src/function/read_xml_file.cc
+++ b/src/function/read_xml_file.cc
@@ -2,10 +2,12 @@
 
 namespace InputXSLT {
 
-FunctionReadXmlFile::FunctionReadXmlFile():
+FunctionReadXmlFile::FunctionReadXmlFile(const std::string& path):
+	path_(path),
 	parser_() { }
 
-FunctionReadXmlFile::FunctionReadXmlFile(const FunctionReadXmlFile&):
+FunctionReadXmlFile::FunctionReadXmlFile(const FunctionReadXmlFile& src):
+	path_(src.path_),
 	parser_() { }
 
 xalan::XObjectPtr FunctionReadXmlFile::execute(
@@ -22,9 +24,12 @@ xalan::XObjectPtr FunctionReadXmlFile::execute(
 		generalError(executionContext, context, locator);
 	}
 
+	xalan::XalanDOMString fileName(this->path_.data());
+	fileName.append(arguments[0]->str());
+
 	return executionContext.getXObjectFactory().createNodeSet(
 		this->parser_.parseXMLStream(
-			xalan::XSLTInputSource(arguments[0]->str())
+			xalan::XSLTInputSource(fileName)
 		)
 	);
 }
diff --git a/src/function/read_xml_file.h b/src/function/read_xml_file.h
index 1556764..c755852 100644
--- a/src/function/read_xml_file.h
+++ b/src/function/read_xml_file.h
@@ -9,13 +9,15 @@
 #include <xalanc/XPath/XObject.hpp>
 #include <xalanc/XercesParserLiaison/XercesParserLiaison.hpp>
 
-#include "utility.h"
+#include <string>
+
+#include "common.h"
 
 namespace InputXSLT {
 
 class FunctionReadXmlFile : public xalan::Function {
 	public:
-		FunctionReadXmlFile();
+		FunctionReadXmlFile(const std::string&);
 		FunctionReadXmlFile(const FunctionReadXmlFile&);
 
 		virtual xalan::XObjectPtr execute(
@@ -31,6 +33,7 @@ class FunctionReadXmlFile : public xalan::Function {
 		bool operator==(const FunctionReadXmlFile&) const          = delete;
 
 	private:
+		const std::string path_;
 		mutable xalan::XercesParserLiaison parser_;
 
 		const xalan::XalanDOMString& getError(xalan::XalanDOMString& result) const;