auriemma 00/11/27 12:05:25
Modified: c/samples/XPathWrapper DLL.dsp TestDriver.dsp
XPathWrapper.cpp
Log:
Update sample for latest changes.
Revision Changes Path
1.5 +3 -3 xml-xalan/c/samples/XPathWrapper/DLL.dsp
Index: DLL.dsp
===================================================================
RCS file: /home/cvs/xml-xalan/c/samples/XPathWrapper/DLL.dsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DLL.dsp 2000/09/28 19:51:02 1.4
+++ DLL.dsp 2000/11/27 20:05:03 1.5
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 ..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release\xerces-c_1.lib
..\..\Build\Win32\VC6\Release\PlatformSupport.lib
..\..\Build\Win32\VC6\Release\XPath.lib
..\..\Build\Win32\VC6\Release\DOMSupport.lib
..\..\Build\Win32\VC6\Release\XercesParserLiaison.lib /nologo /dll
/machine:I386 /out:"..\..\Build\Win32\VC6\Release/XPathWrapper.dll"
+# ADD LINK32 ..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release\xerces-c_1.lib
..\..\Build\Win32\VC6\Release\XPath.lib
..\..\Build\Win32\VC6\Release\DOMSupport.lib
..\..\Build\Win32\VC6\Release\XercesParserLiaison.lib
..\..\Build\Win32\VC6\Release\XalanDOM.lib
..\..\Build\Win32\VC6\Release\PlatformSupport.lib /nologo /dll /machine:I386
/out:"..\..\Build\Win32\VC6\Release/XPathWrapper.dll"
!ELSEIF "$(CFG)" == "DLL - Win32 Debug"
@@ -69,7 +69,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DLL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /ZI /I "..\..\..\..\xml-xerces\c\src"
/I "..\..\src" /D "_WINDOWS" /D "_USRDLL" /D "DLL_EXPORTS" /D "_XPathWrapper"
/D "WIN32" /D "_DEBUG" /D "_MBCS" /D "XML_DEBUG" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /ZI /I "..\..\..\..\xml-xerces\c\src"
/I "..\..\src" /D "_WINDOWS" /D "_USRDLL" /D "DLL_EXPORTS" /D "_XPathWrapper"
/D "WIN32" /D "_DEBUG" /D "_MBCS" /D "XML_DEBUG" /FR /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -79,7 +79,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 ..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug\xerces-c_1D.lib
..\..\Build\Win32\VC6\Debug\PlatformSupport.lib
..\..\Build\Win32\VC6\Debug\XPath.lib
..\..\Build\Win32\VC6\Debug\DOMSupport.lib
..\..\Build\Win32\VC6\Debug\XercesParserLiaison.lib /nologo /dll /debug
/machine:I386 /out:"..\..\Build\Win32\VC6\Debug/XPathWrapper.dll" /pdbtype:sept
+# ADD LINK32 ..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug\xerces-c_1D.lib
..\..\Build\Win32\VC6\Debug\XPath.lib
..\..\Build\Win32\VC6\Debug\DOMSupport.lib
..\..\Build\Win32\VC6\Debug\XercesParserLiaison.lib
..\..\Build\Win32\VC6\Debug\XalanDOM.lib
..\..\Build\Win32\VC6\Debug\PlatformSupport.lib /nologo /dll /map /debug
/machine:I386 /out:"..\..\Build\Win32\VC6\Debug/XPathWrapper.dll" /pdbtype:sept
!ENDIF
1.5 +2 -2 xml-xalan/c/samples/XPathWrapper/TestDriver.dsp
Index: TestDriver.dsp
===================================================================
RCS file: /home/cvs/xml-xalan/c/samples/XPathWrapper/TestDriver.dsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestDriver.dsp 2000/09/22 17:54:38 1.4
+++ TestDriver.dsp 2000/11/27 20:05:06 1.5
@@ -50,7 +50,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 ..\..\Build\Win32\VC6\Release\PlatformSupport.lib kernel32.lib
user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib
ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib
gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib
oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console
/machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib ..\..\Build\Win32\VC6\Release\XalanDOM.lib
..\..\Build\Win32\VC6\Release\PlatformSupport.lib /nologo /subsystem:console
/machine:I386
!ELSEIF "$(CFG)" == "TestDriver - Win32 Debug"
@@ -74,7 +74,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
/pdbtype:sept
-# ADD LINK32 ..\..\Build\Win32\VC6\Debug\PlatformSupport.lib /nologo
/subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 ..\..\Build\Win32\VC6\Debug\XalanDOM.lib
..\..\Build\Win32\VC6\Debug\PlatformSupport.lib /nologo /subsystem:console /map
/debug /machine:I386 /pdbtype:sept
!ENDIF
1.9 +8 -6 xml-xalan/c/samples/XPathWrapper/XPathWrapper.cpp
Index: XPathWrapper.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/samples/XPathWrapper/XPathWrapper.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XPathWrapper.cpp 2000/09/22 17:54:39 1.8
+++ XPathWrapper.cpp 2000/11/27 20:05:12 1.9
@@ -43,6 +43,7 @@
#include <XercesParserLiaison/XercesParserLiaison.hpp>
+#include <XercesParserLiaison/XercesDOMSupport.hpp>
@@ -86,7 +87,7 @@
XPathInit
theInit;
// parse the XML file
- DOMSupportDefault
theDOMSupport;
+ XercesDOMSupport
theDOMSupport;
XercesParserLiaison
theLiaison(theDOMSupport);
XalanElement* rootElem = 0;
@@ -121,12 +122,13 @@
{
// first get the context nodeset
XPath* const contextXPath =
theXPathFactory.create();
- theXPathProcessor.initXPath(*contextXPath,
-
c_str(context),
+
+ theXPathProcessor.initXPath(*contextXPath,
+
TranscodeFromLocalCodePage(context),
ElementPrefixResolverProxy(rootElem, theEnvSupport, theSupport),
theEnvSupport);
- const XObject* xObj =
+ XObjectPtr xObj =
contextXPath->execute(rootElem,
ElementPrefixResolverProxy(rootElem, theEnvSupport, theSupport),
theExecutionContext);
@@ -162,7 +164,7 @@
// and now get the result of the
primary xpath expression
XPath* const xpath =
theXPathFactory.create();
theXPathProcessor.initXPath(*xpath,
-
c_str(expr),
+
TranscodeFromLocalCodePage(expr),
ElementPrefixResolverProxy(rootElem, theEnvSupport, theSupport),
theEnvSupport);
@@ -192,7 +194,7 @@
else if
(theType == XalanNode::ELEMENT_NODE)
str =
node->getNodeName();
else
- str =
theSupport.getNodeData(*node);
+
theSupport.getNodeData(*node, str);
theResultList.push_back(TranscodeToLocalCodePage(str));
}
