Author: amassari
Date: Thu Dec 8 06:35:17 2005
New Revision: 355100
URL: http://svn.apache.org/viewcvs?rev=355100&view=rev
Log:
Properties schema-location and schema-type have string values, not booleans
Modified:
xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp
Modified: xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp
URL:
http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp?rev=355100&r1=355099&r2=355100&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp Thu Dec 8 06:35:17
2005
@@ -187,6 +187,14 @@
getScanner()->setErrorReporter(0);
}
}
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMSchemaLocation)
== 0)
+ {
+ // TODO
+ }
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMSchemaType) ==
0)
+ {
+ // TODO
+ }
else if (XMLString::compareIStringASCII(name,
XMLUni::fgXercesEntityResolver) == 0)
{
fXMLEntityResolver = (XMLEntityResolver*)value;
@@ -311,14 +319,6 @@
{
// TODO
}
- else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMSchemaLocation)
== 0)
- {
- // TODO
- }
- else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMSchemaType) ==
0)
- {
- // TODO
- }
else if (XMLString::compareIStringASCII(name,
XMLUni::fgDOMSplitCDATASections) == 0)
{
// TODO
@@ -613,33 +613,23 @@
XMLString::compareIStringASCII(name, XMLUni::fgXercesScannerName) == 0
||
XMLString::compareIStringASCII(name,
XMLUni::fgXercesParserUseDocumentFromImplementation) == 0)
return true;
+ else if(XMLString::compareIStringASCII(name, XMLUni::fgDOMSchemaLocation)
== 0 ||
+ XMLString::compareIStringASCII(name, XMLUni::fgDOMSchemaType) == 0)
+ return false;
return false;
}
-bool DOMLSParserImpl::canSetParameter(const XMLCh* name, bool /*value*/) const
+bool DOMLSParserImpl::canSetParameter(const XMLCh* name, bool value) const
{
if (XMLString::compareIStringASCII(name,
XMLUni::fgDOMCharsetOverridesXMLEncoding) == 0 ||
- XMLString::compareIStringASCII(name, XMLUni::fgDOMDisallowDoctype) ==
0 ||
- XMLString::compareIStringASCII(name,
XMLUni::fgDOMIgnoreUnknownCharacterDenormalization) == 0 ||
XMLString::compareIStringASCII(name, XMLUni::fgDOMNamespaces) == 0 ||
- XMLString::compareIStringASCII(name,
XMLUni::fgDOMSupportedMediatypesOnly) == 0 ||
XMLString::compareIStringASCII(name, XMLUni::fgDOMValidate) == 0 ||
XMLString::compareIStringASCII(name, XMLUni::fgDOMValidateIfSchema) ==
0 ||
- XMLString::compareIStringASCII(name, XMLUni::fgDOMWellFormed) == 0 ||
- XMLString::compareIStringASCII(name, XMLUni::fgDOMCanonicalForm) == 0
||
- XMLString::compareIStringASCII(name, XMLUni::fgDOMCDATASections) == 0
||
- XMLString::compareIStringASCII(name,
XMLUni::fgDOMCheckCharacterNormalization) == 0 ||
XMLString::compareIStringASCII(name, XMLUni::fgDOMComments) == 0 ||
XMLString::compareIStringASCII(name,
XMLUni::fgDOMDatatypeNormalization) == 0 ||
XMLString::compareIStringASCII(name,
XMLUni::fgDOMElementContentWhitespace) == 0 ||
XMLString::compareIStringASCII(name, XMLUni::fgDOMEntities) == 0 ||
- XMLString::compareIStringASCII(name,
XMLUni::fgDOMNamespaceDeclarations) == 0 ||
- XMLString::compareIStringASCII(name, XMLUni::fgDOMNormalizeCharacters)
== 0 ||
- XMLString::compareIStringASCII(name, XMLUni::fgDOMSchemaLocation) == 0
||
- XMLString::compareIStringASCII(name, XMLUni::fgDOMSchemaType) == 0 ||
- XMLString::compareIStringASCII(name, XMLUni::fgDOMSplitCDATASections)
== 0 ||
- XMLString::compareIStringASCII(name, XMLUni::fgDOMInfoset) == 0 ||
XMLString::compareIStringASCII(name, XMLUni::fgXercesSchema) == 0 ||
XMLString::compareIStringASCII(name,
XMLUni::fgXercesSchemaFullChecking) == 0 ||
XMLString::compareIStringASCII(name,
XMLUni::fgXercesIdentityConstraintChecking) == 0 ||
@@ -658,8 +648,21 @@
XMLString::compareIStringASCII(name,
XMLUni::fgXercesIgnoreAnnotations) == 0 ||
XMLString::compareIStringASCII(name,
XMLUni::fgXercesDisableDefaultEntityResolution) == 0 ||
XMLString::compareIStringASCII(name,
XMLUni::fgXercesSkipDTDValidation) == 0)
-
return true;
+ else if(XMLString::compareIStringASCII(name, XMLUni::fgDOMDisallowDoctype)
== 0 ||
+ XMLString::compareIStringASCII(name,
XMLUni::fgDOMIgnoreUnknownCharacterDenormalization) == 0 ||
+ XMLString::compareIStringASCII(name, XMLUni::fgDOMCanonicalForm)
== 0 ||
+ XMLString::compareIStringASCII(name, XMLUni::fgDOMCDATASections)
== 0 ||
+ XMLString::compareIStringASCII(name,
XMLUni::fgDOMCheckCharacterNormalization) == 0 ||
+ XMLString::compareIStringASCII(name,
XMLUni::fgDOMNormalizeCharacters) == 0 ||
+ XMLString::compareIStringASCII(name,
XMLUni::fgDOMSplitCDATASections) == 0)
+ return false;
+ else if(XMLString::compareIStringASCII(name,
XMLUni::fgDOMSupportedMediatypesOnly) == 0)
+ return value?false:true;
+ else if(XMLString::compareIStringASCII(name, XMLUni::fgDOMWellFormed) == 0
||
+ XMLString::compareIStringASCII(name,
XMLUni::fgDOMNamespaceDeclarations) == 0 ||
+ XMLString::compareIStringASCII(name, XMLUni::fgDOMInfoset) == 0)
+ return value?true:false;
return false;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
