dbertoni 02/04/26 00:33:49
Modified: c/src/TestXSLT process.cpp
Log:
New extensions installer integration.
Revision Changes Path
1.85 +2 -75 xml-xalan/c/src/TestXSLT/process.cpp
Index: process.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/TestXSLT/process.cpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- process.cpp 11 Apr 2002 06:38:31 -0000 1.84
+++ process.cpp 26 Apr 2002 07:33:49 -0000 1.85
@@ -245,9 +245,6 @@
<< endl
<< " [-DE (Disable built-in extension functions.)]"
<< endl
- << " [-EN (Specify the namespace URI for Xalan extension
functions. The default is 'http://xml.apache.org/xalan')]"
- << endl
- << endl
<< "The following options are valid only with -HTML or -XML."
<< endl
<< endl
@@ -302,7 +299,6 @@
const char* outFileName;
const char* xslFileName;
const char* inFileName;
- const char* extentionsNamespace;
CmdLineParams() :
params(),
@@ -326,8 +322,7 @@
outputType(-1),
outFileName(0),
xslFileName(0),
- inFileName(0),
- extentionsNamespace(0)
+ inFileName(0)
{
}
};
@@ -593,24 +588,6 @@
{
p.disableExtensions = true;
}
- else if (!compareNoCase("-EN", argv[i]))
- {
- ++i;
-
- if(i < argc)
- {
- p.extentionsNamespace = argv[i];
-
- if
(XalanDOMString::length(p.extentionsNamespace) == 0)
- {
- fSuccess = false;
- }
- }
- else
- {
- fSuccess = false;
- }
- }
else
{
cerr << endl << "Warning: Ignoring unknown option \""
<< argv[i] << "\"." << endl << endl;
@@ -846,56 +823,6 @@
-void
-installExtensions(
- const CmdLineParams& params,
- XSLTProcessorEnvSupportDefault&
theXSLProcessorSupport)
-{
- XalanDOMString theXalanNamespace;
-
- if (params.extentionsNamespace != 0)
- {
- theXalanNamespace = XalanDOMString(params.extentionsNamespace);
- assert(length(theXalanNamespace) > 0);
- }
- else
- {
- theXalanNamespace =
XALAN_STATIC_UCODE_STRING("http://xml.apache.org/xalan";);
- }
-
- theXSLProcessorSupport.installExternalFunctionLocal(
- theXalanNamespace,
-
StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("difference")),
- FunctionDifference());
-
- theXSLProcessorSupport.installExternalFunctionLocal(
- theXalanNamespace,
-
StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("distinct")),
- FunctionDistinct());
-
- theXSLProcessorSupport.installExternalFunctionLocal(
- theXalanNamespace,
-
StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("evaluate")),
- FunctionEvaluate());
-
- theXSLProcessorSupport.installExternalFunctionLocal(
- theXalanNamespace,
-
StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("hasSameNodes")),
- FunctionHasSameNodes());
-
- theXSLProcessorSupport.installExternalFunctionLocal(
- theXalanNamespace,
-
StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("intersection")),
- FunctionIntersection());
-
- theXSLProcessorSupport.installExternalFunctionLocal(
- theXalanNamespace,
-
StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("nodeset")),
- FunctionNodeSet());
-}
-
-
-
int
xsltMain(const CmdLineParams& params)
{
@@ -954,7 +881,7 @@
if (params.disableExtensions == false)
{
- installExtensions(params, theXSLProcessorSupport);
+ XalanExtensionsInstaller::installGlobal();
}
XObjectFactoryDefault theXObjectFactory;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
