You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by am...@apache.org on 2007/01/30 18:10:24 UTC
svn commit: r501475 - in /xerces/c/trunk/src/xercesc/parsers:
DOMLSParserImpl.cpp DOMLSParserImpl.hpp
Author: amassari
Date: Tue Jan 30 09:10:21 2007
New Revision: 501475
URL: http://svn.apache.org/viewvc?view=rev&rev=501475
Log:
DOML3 parser was storing validation flags instead of relying on the status of the underlying scanner
Modified:
xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp
xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.hpp
Modified: xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp?view=diff&rev=501475&r1=501474&r2=501475
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp Tue Jan 30 09:10:21 2007
@@ -76,8 +76,6 @@
, XMLGrammarPool* const gramPool) :
AbstractDOMParser(valToAdopt, manager, gramPool)
-, fAutoValidation(false)
-, fValidation(false)
, fEntityResolver(0)
, fXMLEntityResolver(0)
, fErrorHandler(0)
@@ -257,9 +255,7 @@
}
else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMValidate) == 0)
{
- fValidation = state;
-
- if (fValidation) {
+ if (state) {
if (getValidationScheme() == AbstractDOMParser::Val_Never)
setValidationScheme(AbstractDOMParser::Val_Always);
}
@@ -269,9 +265,7 @@
}
else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMValidateIfSchema) == 0)
{
- fAutoValidation = state;
-
- if (fAutoValidation) {
+ if (state) {
setValidationScheme(AbstractDOMParser::Val_Auto);
}
else {
@@ -442,11 +436,11 @@
}
else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMValidate) == 0)
{
- return (void*)fValidation;
+ return (void*)(getValidationScheme() != AbstractDOMParser::Val_Never);
}
else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMValidateIfSchema) == 0)
{
- return (void*)fAutoValidation;
+ return (void*)(getValidationScheme() == AbstractDOMParser::Val_Auto);
}
else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMWellFormed) == 0)
{
Modified: xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.hpp?view=diff&rev=501475&r1=501474&r2=501475
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.hpp Tue Jan 30 09:10:21 2007
@@ -584,13 +584,6 @@
// -----------------------------------------------------------------------
// Private data members
//
- // fAutoValidation
- // Whether validation will be enabled in case a schema reference is found
- //
- // fValidation
- // Whether validation will be enabled (if fAutoValidation has been set,
- // setting it is a no-op)
- //
// fEntityResolver
// The installed DOM entity resolver, if any. Null if none.
//
@@ -615,8 +608,6 @@
// A list of the parameters that can be set, including the ones
// specific of Xerces
//-----------------------------------------------------------------------
- bool fAutoValidation;
- bool fValidation;
DOMLSResourceResolver* fEntityResolver;
XMLEntityResolver* fXMLEntityResolver;
DOMErrorHandler* fErrorHandler;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org