knoaman 2003/12/17 13:39:58
Modified: c/src/xercesc/internal SGXMLScanner.cpp IGXMLScanner.cpp
Log:
PSVI: Use complex type info if present, otherwise use datatype validator
Revision Changes Path
1.68 +6 -6 xml-xerces/c/src/xercesc/internal/SGXMLScanner.cpp
Index: SGXMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/SGXMLScanner.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- SGXMLScanner.cpp 17 Dec 2003 05:16:59 -0000 1.67
+++ SGXMLScanner.cpp 17 Dec 2003 21:39:57 -0000 1.68
@@ -4886,11 +4886,11 @@
? PSVIElement::VALIDITY_INVALID : PSVIElement::VALIDITY_VALID;
}
- XSTypeDefinition* typeDef = (fPSVIElemContext.fCurrentDV)
- ? (XSTypeDefinition*) fModel->getXSObject(fPSVIElemContext.fCurrentDV)
- : (fPSVIElemContext.fCurrentTypeInfo)
- ? (XSTypeDefinition*)
fModel->getXSObject(fPSVIElemContext.fCurrentTypeInfo)
- : 0;
+ XSTypeDefinition* typeDef = 0;
+ if (fPSVIElemContext.fCurrentTypeInfo)
+ typeDef = (XSTypeDefinition*)
fModel->getXSObject(fPSVIElemContext.fCurrentTypeInfo);
+ else if (fPSVIElemContext.fCurrentDV)
+ typeDef = (XSTypeDefinition*)
fModel->getXSObject(fPSVIElemContext.fCurrentDV);
XMLCh* canonicalValue = 0;
if (fPSVIElemContext.fNormalizedValue)
1.51 +6 -6 xml-xerces/c/src/xercesc/internal/IGXMLScanner.cpp
Index: IGXMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/IGXMLScanner.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- IGXMLScanner.cpp 17 Dec 2003 19:58:05 -0000 1.50
+++ IGXMLScanner.cpp 17 Dec 2003 21:39:57 -0000 1.51
@@ -3476,11 +3476,11 @@
? PSVIElement::VALIDITY_INVALID : PSVIElement::VALIDITY_VALID;
}
- XSTypeDefinition* typeDef = (fPSVIElemContext.fCurrentDV)
- ? (XSTypeDefinition*) fModel->getXSObject(fPSVIElemContext.fCurrentDV)
- : (fPSVIElemContext.fCurrentTypeInfo)
- ? (XSTypeDefinition*)
fModel->getXSObject(fPSVIElemContext.fCurrentTypeInfo)
- : 0;
+ XSTypeDefinition* typeDef = 0;
+ if (fPSVIElemContext.fCurrentTypeInfo)
+ typeDef = (XSTypeDefinition*)
fModel->getXSObject(fPSVIElemContext.fCurrentTypeInfo);
+ else if (fPSVIElemContext.fCurrentDV)
+ typeDef = (XSTypeDefinition*)
fModel->getXSObject(fPSVIElemContext.fCurrentDV);
XMLCh* canonicalValue = 0;
if (fPSVIElemContext.fNormalizedValue )
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
