You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by bo...@apache.org on 2010/03/19 15:29:48 UTC
svn commit: r925236 - in /xerces/c/branches/xerces-3.1/src/xercesc:
internal/IGXMLScanner2.cpp internal/SGXMLScanner.cpp
validators/schema/SchemaInfo.cpp validators/schema/SchemaInfo.hpp
validators/schema/TraverseSchema.cpp
Author: borisk
Date: Fri Mar 19 14:29:47 2010
New Revision: 925236
URL: http://svn.apache.org/viewvc?rev=925236&view=rev
Log:
Set scanner object on validation context. Needed during QName validation.
Don't re-validate default/fixed values in preContentValidation when called
from loadGrammar. This values are already validated in TraverseSchema.
Modified:
xerces/c/branches/xerces-3.1/src/xercesc/internal/IGXMLScanner2.cpp
xerces/c/branches/xerces-3.1/src/xercesc/internal/SGXMLScanner.cpp
xerces/c/branches/xerces-3.1/src/xercesc/validators/schema/SchemaInfo.cpp
xerces/c/branches/xerces-3.1/src/xercesc/validators/schema/SchemaInfo.hpp
xerces/c/branches/xerces-3.1/src/xercesc/validators/schema/TraverseSchema.cpp
Modified: xerces/c/branches/xerces-3.1/src/xercesc/internal/IGXMLScanner2.cpp
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-3.1/src/xercesc/internal/IGXMLScanner2.cpp?rev=925236&r1=925235&r2=925236&view=diff
==============================================================================
--- xerces/c/branches/xerces-3.1/src/xercesc/internal/IGXMLScanner2.cpp (original)
+++ xerces/c/branches/xerces-3.1/src/xercesc/internal/IGXMLScanner2.cpp Fri Mar 19 14:29:47 2010
@@ -2204,7 +2204,7 @@ Grammar* IGXMLScanner::loadXMLSchemaGram
if (fValidate) {
// validate the Schema scan so far
fValidator->setGrammar(grammar);
- fValidator->preContentValidation(false, true);
+ fValidator->preContentValidation(false);
}
if (toCache) {
Modified: xerces/c/branches/xerces-3.1/src/xercesc/internal/SGXMLScanner.cpp
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-3.1/src/xercesc/internal/SGXMLScanner.cpp?rev=925236&r1=925235&r2=925236&view=diff
==============================================================================
--- xerces/c/branches/xerces-3.1/src/xercesc/internal/SGXMLScanner.cpp (original)
+++ xerces/c/branches/xerces-3.1/src/xercesc/internal/SGXMLScanner.cpp Fri Mar 19 14:29:47 2010
@@ -3996,7 +3996,7 @@ Grammar* SGXMLScanner::loadXMLSchemaGram
if (fValidate) {
// validate the Schema scan so far
fValidator->setGrammar(grammar);
- fValidator->preContentValidation(false, true);
+ fValidator->preContentValidation(false);
}
if (toCache) {
Modified: xerces/c/branches/xerces-3.1/src/xercesc/validators/schema/SchemaInfo.cpp
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-3.1/src/xercesc/validators/schema/SchemaInfo.cpp?rev=925236&r1=925235&r2=925236&view=diff
==============================================================================
--- xerces/c/branches/xerces-3.1/src/xercesc/validators/schema/SchemaInfo.cpp (original)
+++ xerces/c/branches/xerces-3.1/src/xercesc/validators/schema/SchemaInfo.cpp Fri Mar 19 14:29:47 2010
@@ -42,6 +42,7 @@ SchemaInfo::SchemaInfo(const unsigned sh
const XMLCh* const schemaURL,
const XMLCh* const targetNSURIString,
const DOMElement* const root,
+ XMLScanner* xmlScanner,
MemoryManager* const manager)
: fAdoptInclude(false)
, fProcessed(false)
@@ -78,6 +79,7 @@ SchemaInfo::SchemaInfo(const unsigned sh
fCurrentSchemaURL = XMLString::replicate(schemaURL, fMemoryManager);
fTargetNSURIString = XMLString::replicate(targetNSURIString, fMemoryManager);
+ fValidationContext->setScanner (xmlScanner);
fValidationContext->setNamespaceScope(fNamespaceScope);
}
Modified: xerces/c/branches/xerces-3.1/src/xercesc/validators/schema/SchemaInfo.hpp
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-3.1/src/xercesc/validators/schema/SchemaInfo.hpp?rev=925236&r1=925235&r2=925236&view=diff
==============================================================================
--- xerces/c/branches/xerces-3.1/src/xercesc/validators/schema/SchemaInfo.hpp (original)
+++ xerces/c/branches/xerces-3.1/src/xercesc/validators/schema/SchemaInfo.hpp Fri Mar 19 14:29:47 2010
@@ -48,6 +48,7 @@ XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Forward Declarations
// ---------------------------------------------------------------------------
+class XMLScanner;
class ValidationContext;
class NamespaceScope;
@@ -84,6 +85,7 @@ public:
const XMLCh* const schemaURL,
const XMLCh* const targetNSURIString,
const DOMElement* const root,
+ XMLScanner* xmlScanner,
MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
~SchemaInfo();
Modified: xerces/c/branches/xerces-3.1/src/xercesc/validators/schema/TraverseSchema.cpp
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-3.1/src/xercesc/validators/schema/TraverseSchema.cpp?rev=925236&r1=925235&r2=925236&view=diff
==============================================================================
--- xerces/c/branches/xerces-3.1/src/xercesc/validators/schema/TraverseSchema.cpp (original)
+++ xerces/c/branches/xerces-3.1/src/xercesc/validators/schema/TraverseSchema.cpp Fri Mar 19 14:29:47 2010
@@ -379,6 +379,7 @@ void TraverseSchema::preprocessSchema(DO
fSchemaInfo?fSchemaInfo->getNamespaceScope():NULL,
schemaURL,
fTargetNSURIString, schemaRoot,
+ fScanner,
fGrammarPoolMemoryManager);
if (fSchemaInfo)
@@ -688,6 +689,7 @@ void TraverseSchema::preprocessInclude(c
fSchemaInfo->getNamespaceScope(),
includeURL,
fTargetNSURIString, root,
+ fScanner,
fGrammarPoolMemoryManager);
fSchemaInfoList->put((void*) fSchemaInfo->getCurrentSchemaURL(),
@@ -8240,6 +8242,7 @@ bool TraverseSchema::openRedefinedSchema
fSchemaInfo->getNamespaceScope(),
includeURL,
fTargetNSURIString, root,
+ fScanner,
fGrammarPoolMemoryManager));
fSchemaInfo = newSchemaInfo.get();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org