Replaced FunctionResolveInclude with IncludeEntityResolver

* xalan / xerces offers the possibility of implementing custom entity resolvers which are called upon by "<xsl:include..."
** such a custom resolver was implemented to resolve include path entities
* this is a much better way to support include paths than offering a custom external "resolve-include" function
* as entity paths are expanded before they are passed to the entity resolver, a special "[path]" syntax simmilar to "#include <path>" had to be implemented

1 files changed, 0 insertions, 62 deletions

diff --git a/src/function/resolve_include.cc b/src/function/resolve_include.cc
deleted file mode 100644
index ac4adf5..0000000
--- a/src/function/resolve_include.cc
+++ /dev/null
@@ -1,62 +0,0 @@
-#include "resolve_include.h"
-
-#include <algorithm>
-
-#include "support/xalan_string.h"
-
-namespace InputXSLT {
-
-FunctionResolveInclude::FunctionResolveInclude(
-	const std::vector<std::string>& path):
-	path_(new std::vector<FilesystemContext>()) {
-	this->path_->reserve(path.size());
-
-	std::transform(
-		path.begin(),
-		path.end(),
-		std::back_inserter(*this->path_),
-		[](const std::string& path) -> FilesystemContext {
-			return FilesystemContext(path);
-		}
-	);
-}
-
-xalan::XObjectPtr FunctionResolveInclude::execute(
-	xalan::XPathExecutionContext& executionContext,
-	xalan::XalanNode*,
-	const xalan::XObjectPtr parameter,
-	const xalan::Locator*
-) const {
-	const std::string filePath(toString(parameter->str()));
-
-	for ( auto&& context : *this->path_ ) {
-		const boost::filesystem::path resolvedPath(
-			context.resolve(filePath)
-		);
-
-		if ( boost::filesystem::exists(resolvedPath) &&
-		     boost::filesystem::is_regular_file(resolvedPath) ) {
-			return executionContext.getXObjectFactory().createString(
-				toString(resolvedPath.string())
-			);
-		}
-	}
-
-	return executionContext.getXObjectFactory().createString(
-		toString("error")
-	);
-}
-
-FunctionResolveInclude* FunctionResolveInclude::clone(
-	xalan::MemoryManager& manager) const {
-	return xalan::XalanCopyConstruct(manager, *this);
-}
-
-const xalan::XalanDOMString& FunctionResolveInclude::getError(
-	xalan::XalanDOMString& result) const {
-	result.assign("The function expects one parameter of type string.");
-
-	return result;
-}
-
-}