Author: knoaman
Date: Mon Jan 30 11:49:53 2006
New Revision: 373574
URL: http://svn.apache.org/viewcvs?rev=373574&view=rev
Log:
Do not generate error message if switchGrammar fails when laxly validating.
Modified:
xerces/c/trunk/src/xercesc/internal/IGXMLScanner.cpp
Modified: xerces/c/trunk/src/xercesc/internal/IGXMLScanner.cpp
URL:
http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/internal/IGXMLScanner.cpp?rev=373574&r1=373573&r2=373574&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/IGXMLScanner.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/IGXMLScanner.cpp Mon Jan 30 11:49:53
2006
@@ -36,7 +36,6 @@
#include <xercesc/framework/XMLDTDDescription.hpp>
#include <xercesc/framework/psvi/PSVIHandler.hpp>
#include <xercesc/framework/psvi/PSVIAttributeList.hpp>
-#include <xercesc/framework/psvi/XSAnnotation.hpp>
#include <xercesc/validators/common/GrammarResolver.hpp>
#include <xercesc/validators/DTD/DocTypeHandler.hpp>
#include <xercesc/validators/DTD/DTDScanner.hpp>
@@ -44,7 +43,6 @@
#include <xercesc/validators/schema/SchemaValidator.hpp>
#include <xercesc/validators/schema/identity/IdentityConstraintHandler.hpp>
#include <xercesc/validators/schema/identity/IC_Selector.hpp>
-#include <xercesc/validators/schema/identity/ValueStore.hpp>
#include <xercesc/util/OutOfMemoryException.hpp>
XERCES_CPP_NAMESPACE_BEGIN
@@ -2305,9 +2303,11 @@
checkTopLevel = true;
}
else {
- fValidator->emitError(
- XMLValid::GrammarNotFound, getURIText(uriId)
- );
+ if (!laxThisOne) {
+ fValidator->emitError(
+ XMLValid::GrammarNotFound, getURIText(uriId)
+ );
+ }
checkTopLevel = false;
}
}
@@ -2350,7 +2350,7 @@
);
}
}
- else {
+ else if (!laxThisOne) {
fValidator->emitError(
XMLValid::GrammarNotFound,original_uriStr
);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
