You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by tn...@apache.org on 2001/08/02 18:54:39 UTC
cvs commit: xml-xerces/c/src/validators/DTD DTDScanner.cpp
tng 01/08/02 09:54:39
Modified: c/src/internal XMLScanner.hpp XMLScanner2.cpp
c/src/validators/DTD DTDScanner.cpp
Log:
Reset some Scanner flags in scanReset().
Revision Changes Path
1.30 +11 -6 xml-xerces/c/src/internal/XMLScanner.hpp
Index: XMLScanner.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/internal/XMLScanner.hpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- XMLScanner.hpp 2001/08/01 19:11:01 1.29
+++ XMLScanner.hpp 2001/08/02 16:54:39 1.30
@@ -56,6 +56,9 @@
/*
* $Log: XMLScanner.hpp,v $
+ * Revision 1.30 2001/08/02 16:54:39 tng
+ * Reset some Scanner flags in scanReset().
+ *
* Revision 1.29 2001/08/01 19:11:01 tng
* Add full schema constraint checking flag to the samples and the parser.
*
@@ -451,7 +454,7 @@
// setValidationScheme() instead.
// -----------------------------------------------------------------------
bool getDoValidation() const;
- void setDoValidation(const bool validate);
+ void setDoValidation(const bool validate, const bool setValScheme = true);
// -----------------------------------------------------------------------
@@ -1153,13 +1156,15 @@
return fValidate;
}
-inline void XMLScanner::setDoValidation(const bool validate)
+inline void XMLScanner::setDoValidation(const bool validate, const bool setValScheme)
{
fValidate = validate;
- if (fValidate)
- fValScheme = Val_Always;
- else
- fValScheme = Val_Never;
+ if (setValScheme) {
+ if (fValidate)
+ fValScheme = Val_Always;
+ else
+ fValScheme = Val_Never;
+ }
}
#endif
1.51 +7 -1 xml-xerces/c/src/internal/XMLScanner2.cpp
Index: XMLScanner2.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/internal/XMLScanner2.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- XMLScanner2.cpp 2001/07/26 17:04:10 1.50
+++ XMLScanner2.cpp 2001/08/02 16:54:39 1.51
@@ -55,7 +55,7 @@
*/
/*
- * $Id: XMLScanner2.cpp,v 1.50 2001/07/26 17:04:10 tng Exp $
+ * $Id: XMLScanner2.cpp,v 1.51 2001/08/02 16:54:39 tng Exp $
*/
@@ -850,6 +850,10 @@
fGrammarResolver->putGrammar(XMLUni::fgZeroLenString, fGrammar);
fValidator->setGrammar(fGrammar);
+
+ if (fValScheme == Val_Auto) {
+ fValidate = false;
+ }
}
else {
// reusing grammar, thus the fGrammar must pre-exist already
@@ -904,6 +908,8 @@
fInException = false;
fStandalone = false;
fErrorCount = 0;
+ fHasNoDTD = true;
+ fSeeXsi = false;
//
// Handle the creation of the XML reader object for this input source.
1.19 +4 -1 xml-xerces/c/src/validators/DTD/DTDScanner.cpp
Index: DTDScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/DTD/DTDScanner.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- DTDScanner.cpp 2001/07/13 16:57:11 1.18
+++ DTDScanner.cpp 2001/08/02 16:54:39 1.19
@@ -56,6 +56,9 @@
/*
* $Log: DTDScanner.cpp,v $
+ * Revision 1.19 2001/08/02 16:54:39 tng
+ * Reset some Scanner flags in scanReset().
+ *
* Revision 1.18 2001/07/13 16:57:11 tng
* ScanId fix.
*
@@ -1655,7 +1658,7 @@
// either internal/external subset
if(!reuseGrammar) {
if (fScanner->getValidationScheme() == XMLScanner::Val_Auto)
- fScanner->setDoValidation(true);
+ fScanner->setDoValidation(true, false);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org