dbertoni 02/04/25 23:51:58
Modified: c/src/XalanTransformer XalanTransformer.cpp
Log:
Integrated EXSLT extensions. Make sure EntityResolver and ErrorHandler are
set for parsing.
Revision Changes Path
1.51 +22 -56 xml-xalan/c/src/XalanTransformer/XalanTransformer.cpp
Index: XalanTransformer.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanTransformer/XalanTransformer.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- XalanTransformer.cpp 11 Apr 2002 05:52:33 -0000 1.50
+++ XalanTransformer.cpp 26 Apr 2002 06:51:58 -0000 1.51
@@ -105,6 +105,13 @@
+#include <XalanEXSLT/XalanEXSLTCommon.hpp>
+#include <XalanEXSLT/XalanEXSLTMath.hpp>
+#include <XalanEXSLT/XalanEXSLTSet.hpp>
+#include <XalanEXSLT/XalanEXSLTString.hpp>
+
+
+
//#define XALAN_USE_ICU
#if defined(XALAN_USE_ICU)
#include <ICUBridge/FunctionICUFormatNumber.hpp>
@@ -188,37 +195,11 @@
// Initialize Xalan.
s_xsltInit = new XSLTInit;
- const XalanDOMString
theXalanNamespace(StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("http://xml.apache.org/xalan";)));
-
- XalanTransformer::installExternalFunctionGlobal(
- theXalanNamespace,
-
StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("difference")),
- FunctionDifference());
-
- XalanTransformer::installExternalFunctionGlobal(
- theXalanNamespace,
-
StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("distinct")),
- FunctionDistinct());
-
- XalanTransformer::installExternalFunctionGlobal(
- theXalanNamespace,
-
StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("evaluate")),
- FunctionEvaluate());
-
- XalanTransformer::installExternalFunctionGlobal(
- theXalanNamespace,
-
StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("hasSameNodes")),
- FunctionHasSameNodes());
-
- XalanTransformer::installExternalFunctionGlobal(
- theXalanNamespace,
-
StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("intersection")),
- FunctionIntersection());
-
- XalanTransformer::installExternalFunctionGlobal(
- theXalanNamespace,
-
StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("nodeset")),
- FunctionNodeSet());
+ XalanExtensionsInstaller::installGlobal();
+ XalanEXSLTCommonFunctionsInstaller::installGlobal();
+ XalanEXSLTMathFunctionsInstaller::installGlobal();
+ XalanEXSLTSetFunctionsInstaller::installGlobal();
+ XalanEXSLTStringFunctionsInstaller::installGlobal();
#if defined(XALAN_USE_ICU)
theICUFunctor = new ICUBridgeCollationCompareFunctor;
@@ -244,31 +225,11 @@
s_xsltInit = 0;
- const XalanDOMString
theXalanNamespace(StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("http://xml.apache.org/xalan";)));
-
- XalanTransformer::uninstallExternalFunctionGlobal(
- theXalanNamespace,
-
StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("difference")));
-
- XalanTransformer::uninstallExternalFunctionGlobal(
- theXalanNamespace,
-
StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("distinct")));
-
- XalanTransformer::uninstallExternalFunctionGlobal(
- theXalanNamespace,
-
StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("evaluate")));
-
- XalanTransformer::uninstallExternalFunctionGlobal(
- theXalanNamespace,
-
StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("hasSameNodes")));
-
- XalanTransformer::uninstallExternalFunctionGlobal(
- theXalanNamespace,
-
StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("intersection")));
-
- XalanTransformer::uninstallExternalFunctionGlobal(
- theXalanNamespace,
-
StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("nodeset")));
+ XalanExtensionsInstaller::uninstallGlobal();
+ XalanEXSLTCommonFunctionsInstaller::uninstallGlobal();
+ XalanEXSLTMathFunctionsInstaller::uninstallGlobal();
+ XalanEXSLTSetFunctionsInstaller::uninstallGlobal();
+ XalanEXSLTStringFunctionsInstaller::uninstallGlobal();
#if defined(XALAN_USE_ICU)
XPath::uninstallFunction(
@@ -480,6 +441,9 @@
XalanSourceTreeParserLiaison theParserLiaison(theDOMSupport);
+ theParserLiaison.setEntityResolver(m_entityResolver);
+ theParserLiaison.setErrorHandler(m_errorHandler);
+
// Hook the two together...
theDOMSupport.setParserLiaison(&theParserLiaison);
@@ -973,6 +937,8 @@
theParserLiaison.setExecutionContext(*m_stylesheetExecutionContext);
+ theParserLiaison.setEntityResolver(m_entityResolver);
+ theParserLiaison.setErrorHandler(m_errorHandler);
theParserLiaison.setUseValidation(m_useValidation);
// Create some more support objects...
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
