peiyongz 2003/06/25 15:36:46
Modified: c/src/xercesc/parsers DOMBuilderImpl.cpp
SAX2XMLReaderImpl.cpp SAXParser.cpp
XercesDOMParser.cpp
Log:
to use new GrammarResolver::getGrammar()
Revision Changes Path
1.26 +7 -2 xml-xerces/c/src/xercesc/parsers/DOMBuilderImpl.cpp
Index: DOMBuilderImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/parsers/DOMBuilderImpl.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- DOMBuilderImpl.cpp 20 Jun 2003 18:55:54 -0000 1.25
+++ DOMBuilderImpl.cpp 25 Jun 2003 22:36:46 -0000 1.26
@@ -78,6 +78,9 @@
#include <xercesc/sax/SAXParseException.hpp>
#include <xercesc/internal/XMLScanner.hpp>
#include <xercesc/framework/Wrapper4DOMInputSource.hpp>
+#include <xercesc/framework/XMLGrammarPool.hpp>
+#include <xercesc/framework/XMLSchemaDescription.hpp>
+#include <xercesc/util/Janitor.hpp>
#include <xercesc/validators/common/GrammarResolver.hpp>
XERCES_CPP_NAMESPACE_BEGIN
@@ -632,7 +635,9 @@
Grammar* DOMBuilderImpl::getGrammar(const XMLCh* const nameSpaceKey) const
{
- return getGrammarResolver()->getGrammar(nameSpaceKey);
+ XMLSchemaDescription* gramDesc =
getGrammarResolver()->getGrammarPool()->createSchemaDescription(nameSpaceKey);
+ Janitor<XMLSchemaDescription> janName(gramDesc);
+ return getGrammarResolver()->getGrammar(gramDesc);
}
Grammar* DOMBuilderImpl::getRootGrammar() const
1.23 +9 -1 xml-xerces/c/src/xercesc/parsers/SAX2XMLReaderImpl.cpp
Index: SAX2XMLReaderImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/parsers/SAX2XMLReaderImpl.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- SAX2XMLReaderImpl.cpp 20 Jun 2003 18:55:54 -0000 1.22
+++ SAX2XMLReaderImpl.cpp 25 Jun 2003 22:36:46 -0000 1.23
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.23 2003/06/25 22:36:46 peiyongz
+ * to use new GrammarResolver::getGrammar()
+ *
* Revision 1.22 2003/06/20 18:55:54 peiyongz
* Stateless Grammar Pool :: Part I
*
@@ -285,6 +288,9 @@
#include <xercesc/internal/XMLScannerResolver.hpp>
#include <xercesc/parsers/SAX2XMLReaderImpl.hpp>
#include <xercesc/validators/common/GrammarResolver.hpp>
+#include <xercesc/framework/XMLGrammarPool.hpp>
+#include <xercesc/framework/XMLSchemaDescription.hpp>
+
#include <string.h>
XERCES_CPP_NAMESPACE_BEGIN
@@ -1707,7 +1713,9 @@
Grammar* SAX2XMLReaderImpl::getGrammar(const XMLCh* const nameSpaceKey)
{
- return fGrammarResolver->getGrammar(nameSpaceKey);
+ XMLSchemaDescription* gramDesc =
fGrammarResolver->getGrammarPool()->createSchemaDescription(nameSpaceKey);
+ Janitor<XMLSchemaDescription> janName(gramDesc);
+ return fGrammarResolver->getGrammar(gramDesc);
}
1.21 +9 -1 xml-xerces/c/src/xercesc/parsers/SAXParser.cpp
Index: SAXParser.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/parsers/SAXParser.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- SAXParser.cpp 20 Jun 2003 18:55:54 -0000 1.20
+++ SAXParser.cpp 25 Jun 2003 22:36:46 -0000 1.21
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.21 2003/06/25 22:36:46 peiyongz
+ * to use new GrammarResolver::getGrammar()
+ *
* Revision 1.20 2003/06/20 18:55:54 peiyongz
* Stateless Grammar Pool :: Part I
*
@@ -246,6 +249,9 @@
#include <xercesc/sax/EntityResolver.hpp>
#include <xercesc/sax/SAXParseException.hpp>
#include <xercesc/validators/common/GrammarResolver.hpp>
+#include <xercesc/framework/XMLGrammarPool.hpp>
+#include <xercesc/framework/XMLSchemaDescription.hpp>
+#include <xercesc/util/Janitor.hpp>
#include <string.h>
XERCES_CPP_NAMESPACE_BEGIN
@@ -513,7 +519,9 @@
Grammar* SAXParser::getGrammar(const XMLCh* const nameSpaceKey)
{
- return fGrammarResolver->getGrammar(nameSpaceKey);
+ XMLSchemaDescription* gramDesc =
fGrammarResolver->getGrammarPool()->createSchemaDescription(nameSpaceKey);
+ Janitor<XMLSchemaDescription> janName(gramDesc);
+ return fGrammarResolver->getGrammar(gramDesc);
}
Grammar* SAXParser::getRootGrammar()
1.14 +7 -2 xml-xerces/c/src/xercesc/parsers/XercesDOMParser.cpp
Index: XercesDOMParser.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/parsers/XercesDOMParser.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- XercesDOMParser.cpp 20 Jun 2003 18:55:54 -0000 1.13
+++ XercesDOMParser.cpp 25 Jun 2003 22:36:46 -0000 1.14
@@ -75,6 +75,9 @@
#include <xercesc/internal/XMLScanner.hpp>
#include <xercesc/parsers/XercesDOMParser.hpp>
#include <xercesc/validators/common/GrammarResolver.hpp>
+#include <xercesc/framework/XMLGrammarPool.hpp>
+#include <xercesc/framework/XMLSchemaDescription.hpp>
+#include <xercesc/util/Janitor.hpp>
XERCES_CPP_NAMESPACE_BEGIN
@@ -114,7 +117,9 @@
Grammar* XercesDOMParser::getGrammar(const XMLCh* const nameSpaceKey)
{
- return getGrammarResolver()->getGrammar(nameSpaceKey);
+ XMLSchemaDescription* gramDesc =
getGrammarResolver()->getGrammarPool()->createSchemaDescription(nameSpaceKey);
+ Janitor<XMLSchemaDescription> janName(gramDesc);
+ return getGrammarResolver()->getGrammar(gramDesc);
}
Grammar* XercesDOMParser::getRootGrammar()
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
