pauldick 01/07/20 09:36:37
Modified: c/Tests/Extensions extensions.cpp
Log:
Fixed 3rd param to installExternalFunction. I was always using
FunctionNodeSet.
Also changed usi toxml.apache.org/xalan. Other minor changes.
External functions now work!
Revision Changes Path
1.3 +10 -12 xml-xalan/c/Tests/Extensions/extensions.cpp
Index: extensions.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Extensions/extensions.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- extensions.cpp 2001/07/18 22:14:29 1.2
+++ extensions.cpp 2001/07/20 16:36:36 1.3
@@ -207,7 +207,7 @@
void installExtensions(XalanTransformer &transformer)
{
// The namespace for our functions...
- const XalanDOMString theNamespace("http://xml.apache.org/xslt");
+ const XalanDOMString theNamespace("http://xml.apache.org/xalan");
// Install the functions in the local space. They will only
// be installed in this instance, so no other instances
@@ -216,32 +216,30 @@
transformer.installExternalFunction(
theNamespace,
XalanDOMString("difference"),
- FunctionNodeSet());
+ FunctionDifference());
transformer.installExternalFunction(
theNamespace,
XalanDOMString("distinct"),
- FunctionNodeSet());
+ FunctionDistinct());
transformer.installExternalFunction(
theNamespace,
XalanDOMString("evaluate"),
- FunctionNodeSet());
+ FunctionEvaluate());
transformer.installExternalFunction(
theNamespace,
- XalanDOMString("hassamenodes"),
- FunctionNodeSet());
+ XalanDOMString("hasSameNodes"),
+ FunctionHasSameNodes());
transformer.installExternalFunction(
theNamespace,
XalanDOMString("intersection"),
- FunctionNodeSet());
-
- const XalanDOMString
theNamespace2("http://ExternalFunction.xalan-c.xml.apache.org");
+ FunctionIntersection());
transformer.installExternalFunction(
- theNamespace2,
+ theNamespace,
XalanDOMString("nodeset"),
FunctionNodeSet());
@@ -315,8 +313,8 @@
const XalanDOMString theOutputDir = outputRoot
+ xDir;
futil.checkAndCreateDir(theOutputDir);
- // Get the files found in the "simpletests"
directory
- const FileNameVectorType files =
futil.getTestFileNames(baseDir, xDir, false);
+ // Get the files found in the "cextension"
directory
+ const FileNameVectorType files =
futil.getTestFileNames(baseDir, xDir, true);
for(FileNameVectorType::size_type i = 0; i <
files.size(); ++i)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]