You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by jp...@locus.apache.org on 2000/08/10 00:40:16 UTC
cvs commit: xml-xerces/c/samples/SAX2Count SAX2Count.cpp SAX2Count.hpp SAX2CountHandlers.cpp SAX2CountHandlers.hpp
jpolast 00/08/09 15:40:16
Modified: c/samples/SAX2Count SAX2Count.cpp SAX2Count.hpp
SAX2CountHandlers.cpp SAX2CountHandlers.hpp
Log:
updates for changes to sax2 core functionality.
Revision Changes Path
1.2 +13 -10 xml-xerces/c/samples/SAX2Count/SAX2Count.cpp
Index: SAX2Count.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/SAX2Count/SAX2Count.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SAX2Count.cpp 2000/08/08 17:17:20 1.1
+++ SAX2Count.cpp 2000/08/09 22:40:15 1.2
@@ -56,6 +56,9 @@
/*
* $Log: SAX2Count.cpp,v $
+* Revision 1.2 2000/08/09 22:40:15 jpolast
+* updates for changes to sax2 core functionality.
+*
* Revision 1.1 2000/08/08 17:17:20 jpolast
* initial checkin of SAX2Count
*
@@ -115,9 +118,9 @@
return 1;
}
- const char* xmlFile = 0;
- SAXParser::ValSchemes valScheme = SAXParser::Val_Auto;
- bool doNamespaces = true;
+ const char* xmlFile = 0;
+ SAX2XMLReader::ValSchemes valScheme = SAX2XMLReader::Val_Auto;
+ bool doNamespaces = true;
// See if non validating dom parser configuration is requested.
if ((argC == 2) && !strcmp(argV[1], "-?"))
@@ -140,11 +143,11 @@
const char* const parm = &argV[argInd][3];
if (!strcmp(parm, "never"))
- valScheme = SAXParser::Val_Never;
+ valScheme = SAX2XMLReader::Val_Never;
else if (!strcmp(parm, "auto"))
- valScheme = SAXParser::Val_Auto;
+ valScheme = SAX2XMLReader::Val_Auto;
else if (!strcmp(parm, "always"))
- valScheme = SAXParser::Val_Always;
+ valScheme = SAX2XMLReader::Val_Always;
else
{
cerr << "Unknown -v= value: " << parm << endl;
@@ -181,16 +184,16 @@
//
SAX2XMLReader* parser = XMLReaderFactory::createXMLReader();
parser->setFeature(XMLString::transcode("http://xml.org/sax/features/namespaces"), doNamespaces);
- if (valScheme == SAXParser::Val_Auto)
+ if (valScheme == SAX2XMLReader::Val_Auto)
{
parser->setFeature(XMLString::transcode("http://xml.org/sax/features/validation"), true);
parser->setFeature(XMLString::transcode("http://apache.org/xml/features/validation/dynamic"), true);
}
- if (valScheme == SAXParser::Val_Never)
+ if (valScheme == SAX2XMLReader::Val_Never)
{
parser->setFeature(XMLString::transcode("http://xml.org/sax/features/validation"), false);
}
- if (valScheme == SAXParser::Val_Always)
+ if (valScheme == SAX2XMLReader::Val_Always)
{
parser->setFeature(XMLString::transcode("http://xml.org/sax/features/validation"), true);
parser->setFeature(XMLString::transcode("http://apache.org/xml/features/validation/dynamic"), false);
1.2 +4 -2 xml-xerces/c/samples/SAX2Count/SAX2Count.hpp
Index: SAX2Count.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/SAX2Count/SAX2Count.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SAX2Count.hpp 2000/08/08 17:17:20 1.1
+++ SAX2Count.hpp 2000/08/09 22:40:15 1.2
@@ -56,6 +56,9 @@
/*
* $Log: SAX2Count.hpp,v $
+ * Revision 1.2 2000/08/09 22:40:15 jpolast
+ * updates for changes to sax2 core functionality.
+ *
* Revision 1.1 2000/08/08 17:17:20 jpolast
* initial checkin of SAX2Count
*
@@ -70,7 +73,6 @@
#include <string.h>
#include <iostream.h>
#include <util/PlatformUtils.hpp>
-#include <parsers/SAXParser.hpp>
#include "SAX2CountHandlers.hpp"
#include <sax2/XMLReaderFactory.hpp>
#include <sax2/SAX2XMLReader.hpp>
1.2 +5 -2 xml-xerces/c/samples/SAX2Count/SAX2CountHandlers.cpp
Index: SAX2CountHandlers.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/SAX2Count/SAX2CountHandlers.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SAX2CountHandlers.cpp 2000/08/08 17:17:20 1.1
+++ SAX2CountHandlers.cpp 2000/08/09 22:40:15 1.2
@@ -56,6 +56,9 @@
/*
* $Log: SAX2CountHandlers.cpp,v $
+ * Revision 1.2 2000/08/09 22:40:15 jpolast
+ * updates for changes to sax2 core functionality.
+ *
* Revision 1.1 2000/08/08 17:17:20 jpolast
* initial checkin of SAX2Count
*
@@ -95,7 +98,7 @@
void SAX2CountHandlers::startElement(const XMLCh* const uri
, const XMLCh* const localname
, const XMLCh* const qname
- , Attributes& attrs)
+ , const Attributes& attrs)
{
fElementCount++;
fAttrCount += attrs.getLength();
1.2 +5 -2 xml-xerces/c/samples/SAX2Count/SAX2CountHandlers.hpp
Index: SAX2CountHandlers.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/SAX2Count/SAX2CountHandlers.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SAX2CountHandlers.hpp 2000/08/08 17:17:21 1.1
+++ SAX2CountHandlers.hpp 2000/08/09 22:40:15 1.2
@@ -56,6 +56,9 @@
/*
* $Log: SAX2CountHandlers.hpp,v $
+ * Revision 1.2 2000/08/09 22:40:15 jpolast
+ * updates for changes to sax2 core functionality.
+ *
* Revision 1.1 2000/08/08 17:17:21 jpolast
* initial checkin of SAX2Count
*
@@ -111,7 +114,7 @@
// -----------------------------------------------------------------------
// Handlers for the SAX ContentHandler interface
// -----------------------------------------------------------------------
- void startElement(const XMLCh* const uri, const XMLCh* const localname, const XMLCh* const qname, Attributes& attrs);
+ void startElement(const XMLCh* const uri, const XMLCh* const localname, const XMLCh* const qname, const Attributes& attrs);
void characters(const XMLCh* const chars, const unsigned int length);
void ignorableWhitespace(const XMLCh* const chars, const unsigned int length);
void resetDocument();