Added include path resolution to external file access functions

* if a given file can not be located relative to the transformation's location both "read-file" and "read-xml-file" will now try to resolve the path using the IncludeEntityResolver
* all external functions based on the FunctionBase template are now provided with a pointer to a IncludeEntityResolver instance
* it is determined by the external function implementation whether include path resolution will be used

1 files changed, 12 insertions, 1 deletions

diff --git a/src/function/read_file.cc b/src/function/read_file.cc
index 5ded1ac..85f834d 100644
--- a/src/function/read_file.cc
+++ b/src/function/read_file.cc
@@ -28,10 +28,21 @@ xercesc::DOMDocument* FunctionReadFile::constructDocument(
 	const FilesystemContext& fsContext,
 	const FunctionBase::parameter_tuple& parameters
 ) {
-	const boost::filesystem::path filePath(
+	boost::filesystem::path filePath(
 		fsContext.resolve(std::get<0>(parameters))
 	);
 
+	if ( !(boost::filesystem::exists(filePath) &&
+	       boost::filesystem::is_regular_file(filePath)) ) {
+		auto resolvedPath = this->include_resolver_->resolve(
+			std::get<0>(parameters)
+		);
+
+		if ( resolvedPath.first ) {
+			filePath = resolvedPath.second;
+		}
+	}
+
 	xercesc::DOMDocument* const domDocument(
 		xercesc::DOMImplementation::getImplementation()->createDocument(
 			nullptr,