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, 7 insertions, 9 deletions

diff --git a/src/plattform_guard.cc b/src/plattform_guard.cc
index 820346e..8ffbbb9 100644
--- a/src/plattform_guard.cc
+++ b/src/plattform_guard.cc
@@ -10,11 +10,11 @@
 #include "function/read_xml_file.h"
 #include "function/read_directory.h"
 #include "function/transform.h"
-#include "function/resolve_include.h"
 
 namespace InputXSLT {
 
-PlattformGuard::PlattformGuard(const std::vector<std::string>& path) {
+PlattformGuard::PlattformGuard(const std::vector<std::string>& path):
+	include_resolver_(path) {
 	xercesc::XMLPlatformUtils::Initialize();
 	xalan::XalanTransformer::initialize();
 
@@ -43,13 +43,7 @@ PlattformGuard::PlattformGuard(const std::vector<std::string>& path) {
 	xalan::XalanTransformer::installExternalFunctionGlobal(
 		customNamespace,
 		xalan::XalanDOMString("transform"),
-		InputXSLT::FunctionTransform()
-	);
-
-	xalan::XalanTransformer::installExternalFunctionGlobal(
-		customNamespace,
-		xalan::XalanDOMString("resolve-include"),
-		InputXSLT::FunctionResolveInclude(path)
+		InputXSLT::FunctionTransform(&this->include_resolver_)
 	);
 }
 
@@ -57,4 +51,8 @@ PlattformGuard::~PlattformGuard() {
 	xalan::XalanTransformer::terminate();
 }
 
+IncludeEntityResolver* PlattformGuard::getEntityResolver() {
+	return &this->include_resolver_;
+}
+
 }