peiyongz 2004/03/09 13:00:46
Modified: c/src/xercesc/validators/datatype DatatypeValidator.cpp
DatatypeValidator.hpp
Log:
recognize builtIn dv
Revision Changes Path
1.25 +24 -20
xml-xerces/c/src/xercesc/validators/datatype/DatatypeValidator.cpp
Index: DatatypeValidator.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/datatype/DatatypeValidator.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- DatatypeValidator.cpp 3 Mar 2004 23:08:28 -0000 1.24
+++ DatatypeValidator.cpp 9 Mar 2004 21:00:46 -0000 1.25
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.25 2004/03/09 21:00:46 peiyongz
+ * recognize builtIn dv
+ *
* Revision 1.24 2004/03/03 23:08:28 peiyongz
* Move the logic to check for BuiltIn Dv to storeDV/loadDV therefore dv which
* refers to BuiltIn DV will NOT be actually saved/loaded, as opposed to previously
@@ -197,9 +200,13 @@
XERCES_CPP_NAMESPACE_BEGIN
-static const int DV_BUILTIN = 0;
-static const int DV_NORMAL = 1;
-static const int DV_ZERO = 2;
+static const int DV_BUILTIN = -1;
+static const int DV_NORMAL = -2;
+static const int DV_ZERO = -3;
+
+static const int TYPENAME_ZERO = -1;
+static const int TYPENAME_S4S = -2;
+static const int TYPENAME_NORMAL = -3;
// ---------------------------------------------------------------------------
// DatatypeValidator: Constructors and Destructor
@@ -333,7 +340,6 @@
fMemoryManager->deallocate(fPattern);//delete [] fPattern;
if (fTypeName)
fMemoryManager->deallocate(fTypeName);
-
}
/***
@@ -370,16 +376,16 @@
if (fTypeUri==XMLUni::fgZeroLenString)
{
- serEng<<(unsigned int)1;
+ serEng<<TYPENAME_ZERO;
}
else if (fTypeUri == SchemaSymbols::fgURI_SCHEMAFORSCHEMA)
{
- serEng<<(unsigned int)2;
+ serEng<<TYPENAME_S4S;
serEng.writeString(fTypeLocalName);
}
else
- {
- serEng<<(unsigned int)3;
+ {
+ serEng<<TYPENAME_NORMAL;
serEng.writeString(fTypeLocalName);
serEng.writeString(fTypeUri);
}
@@ -422,14 +428,14 @@
* fTypeName
***/
- unsigned int flag;
+ int flag;
serEng>>flag;
- if ( 1 == flag )
+ if ( TYPENAME_ZERO == flag )
{
setTypeName(0);
}
- else if ( 2 == flag )
+ else if ( TYPENAME_S4S == flag )
{
XMLCh* typeLocalName;
serEng.readString(typeLocalName);
@@ -437,7 +443,7 @@
setTypeName(typeLocalName);
}
- else //3
+ else // TYPENAME_NORMAL
{
XMLCh* typeLocalName;
serEng.readString(typeLocalName);
@@ -479,7 +485,8 @@
{
if (dv)
{
- if
(DatatypeValidatorFactory::getBuiltInRegistry()->containsKey(dv->getTypeLocalName()))
+ //builtIndv
+ if (dv ==
DatatypeValidatorFactory::getBuiltInRegistry()->get(dv->getTypeLocalName()))
{
serEng<<DV_BUILTIN;
serEng.writeString(dv->getTypeLocalName());
@@ -500,6 +507,7 @@
DatatypeValidator* DatatypeValidator::loadDV(XSerializeEngine& serEng)
{
+
int flag;
serEng>>flag;
@@ -637,13 +645,6 @@
}
-inline bool
-DatatypeValidator::isBuiltInDV(DatatypeValidator* const dv)
-{
- return dv?
DatatypeValidatorFactory::getBuiltInRegistry()->containsKey(dv->getTypeLocalName())
- : false;
-}
-
/**
* Canonical Representation
*
@@ -670,6 +671,7 @@
return XMLString::replicate(rawData, toUse);
}
+
XERCES_CPP_NAMESPACE_END
1.25 +1 -3
xml-xerces/c/src/xercesc/validators/datatype/DatatypeValidator.hpp
Index: DatatypeValidator.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/datatype/DatatypeValidator.hpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- DatatypeValidator.hpp 29 Jan 2004 11:51:22 -0000 1.24
+++ DatatypeValidator.hpp 9 Mar 2004 21:00:46 -0000 1.25
@@ -514,8 +514,6 @@
// -----------------------------------------------------------------------
void cleanUp();
- inline bool isBuiltInDV(DatatypeValidator* const);
-
// -----------------------------------------------------------------------
// Unimplemented constructors and operators
// -----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
