knoaman 2003/11/20 09:06:05
Modified: c/src/xercesc/validators/schema XercesGroupInfo.hpp
XercesGroupInfo.cpp XercesAttGroupInfo.hpp
XercesAttGroupInfo.cpp
Log:
PSVI: store name and namespace information
Revision Changes Path
1.8 +24 -4 xml-xerces/c/src/xercesc/validators/schema/XercesGroupInfo.hpp
Index: XercesGroupInfo.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/XercesGroupInfo.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XercesGroupInfo.hpp 14 Oct 2003 15:22:28 -0000 1.7
+++ XercesGroupInfo.hpp 20 Nov 2003 17:06:05 -0000 1.8
@@ -91,10 +91,15 @@
// -----------------------------------------------------------------------
// Public Constructors/Destructor
// -----------------------------------------------------------------------
- XercesGroupInfo(MemoryManager* const manager =
XMLPlatformUtils::fgMemoryManager);
- ~XercesGroupInfo();
+ XercesGroupInfo
+ (
+ unsigned int groupNameId
+ , unsigned int groupNamespaceId
+ , MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
+ );
+ ~XercesGroupInfo();
- // -----------------------------------------------------------------------
+ // -----------------------------------------------------------------------
// Getter methods
// -----------------------------------------------------------------------
bool getCheckElementConsistency() const;
@@ -105,6 +110,8 @@
const SchemaElementDecl* elementAt(const unsigned int index) const;
XSDLocator* getLocator() const;
XercesGroupInfo* getBaseGroup() const;
+ unsigned int getNameId() const;
+ unsigned int getNamespaceId() const;
// -----------------------------------------------------------------------
// Setter methods
@@ -120,6 +127,7 @@
* Support for Serialization/De-serialization
***/
DECL_XSERIALIZABLE(XercesGroupInfo)
+ XercesGroupInfo(MemoryManager* const manager =
XMLPlatformUtils::fgMemoryManager);
private:
// -----------------------------------------------------------------------
@@ -133,6 +141,8 @@
// -----------------------------------------------------------------------
bool fCheckElementConsistency;
int fScope;
+ unsigned int fNameId;
+ unsigned int fNamespaceId;
ContentSpecNode* fContentSpec;
RefVectorOf<SchemaElementDecl>* fElements;
XercesGroupInfo* fBaseGroup; // redefine by restriction
@@ -182,6 +192,16 @@
inline bool XercesGroupInfo::getCheckElementConsistency() const {
return fCheckElementConsistency;
+}
+
+inline unsigned int XercesGroupInfo::getNameId() const
+{
+ return fNameId;
+}
+
+inline unsigned int XercesGroupInfo::getNamespaceId() const
+{
+ return fNamespaceId;
}
// ---------------------------------------------------------------------------
1.11 +24 -1 xml-xerces/c/src/xercesc/validators/schema/XercesGroupInfo.cpp
Index: XercesGroupInfo.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/XercesGroupInfo.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XercesGroupInfo.cpp 13 Nov 2003 23:20:47 -0000 1.10
+++ XercesGroupInfo.cpp 20 Nov 2003 17:06:05 -0000 1.11
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.11 2003/11/20 17:06:05 knoaman
+ * PSVI: store name and namespace information
+ *
* Revision 1.10 2003/11/13 23:20:47 peiyongz
* initSize
*
@@ -111,6 +114,23 @@
XercesGroupInfo::XercesGroupInfo(MemoryManager* const manager)
: fCheckElementConsistency(true)
, fScope(-1)
+ , fNameId(0)
+ , fNamespaceId(0)
+ , fContentSpec(0)
+ , fElements(0)
+ , fBaseGroup(0)
+ , fLocator(0)
+{
+ fElements = new (manager) RefVectorOf<SchemaElementDecl>(4, false, manager);
+}
+
+XercesGroupInfo::XercesGroupInfo(unsigned int groupNameId,
+ unsigned int groupNamespaceId,
+ MemoryManager* const manager)
+ : fCheckElementConsistency(true)
+ , fScope(-1)
+ , fNameId(groupNameId)
+ , fNamespaceId(groupNamespaceId)
, fContentSpec(0)
, fElements(0)
, fBaseGroup(0)
@@ -147,11 +167,12 @@
void XercesGroupInfo::serialize(XSerializeEngine& serEng)
{
-
if (serEng.isStoring())
{
serEng<<fCheckElementConsistency;
serEng<<fScope;
+ serEng<<fNameId;
+ serEng<<fNamespaceId;
serEng<<fContentSpec;
/***
@@ -170,6 +191,8 @@
{
serEng>>fCheckElementConsistency;
serEng>>fScope;
+ serEng>>fNameId;
+ serEng>>fNamespaceId;
serEng>>fContentSpec;
/***
1.7 +24 -4
xml-xerces/c/src/xercesc/validators/schema/XercesAttGroupInfo.hpp
Index: XercesAttGroupInfo.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/XercesAttGroupInfo.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XercesAttGroupInfo.hpp 14 Oct 2003 15:22:28 -0000 1.6
+++ XercesAttGroupInfo.hpp 20 Nov 2003 17:06:05 -0000 1.7
@@ -84,15 +84,22 @@
// -----------------------------------------------------------------------
// Public Constructors/Destructor
// -----------------------------------------------------------------------
- XercesAttGroupInfo(MemoryManager* const manager =
XMLPlatformUtils::fgMemoryManager);
- ~XercesAttGroupInfo();
+ XercesAttGroupInfo
+ (
+ unsigned int attGroupNameId
+ , unsigned int attGroupNamespaceId
+ , MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
+ );
+ ~XercesAttGroupInfo();
- // -----------------------------------------------------------------------
+ // -----------------------------------------------------------------------
// Getter methods
// -----------------------------------------------------------------------
bool containsTypeWithId() const;
unsigned int attributeCount() const;
unsigned int anyAttributeCount() const;
+ unsigned int getNameId() const;
+ unsigned int getNamespaceId() const;
SchemaAttDef* attributeAt(const unsigned int index);
const SchemaAttDef* attributeAt(const unsigned int index) const;
SchemaAttDef* anyAttributeAt(const unsigned int index);
@@ -118,6 +125,7 @@
* Support for Serialization/De-serialization
***/
DECL_XSERIALIZABLE(XercesAttGroupInfo)
+ XercesAttGroupInfo(MemoryManager* const manager =
XMLPlatformUtils::fgMemoryManager);
private:
// -----------------------------------------------------------------------
@@ -130,6 +138,8 @@
// Private data members
// -----------------------------------------------------------------------
bool fTypeWithId;
+ unsigned int fNameId;
+ unsigned int fNamespaceId;
RefVectorOf<SchemaAttDef>* fAttributes;
RefVectorOf<SchemaAttDef>* fAnyAttributes;
SchemaAttDef* fCompleteWildCard;
@@ -160,6 +170,16 @@
}
return 0;
+}
+
+inline unsigned int XercesAttGroupInfo::getNameId() const
+{
+ return fNameId;
+}
+
+inline unsigned int XercesAttGroupInfo::getNamespaceId() const
+{
+ return fNamespaceId;
}
inline SchemaAttDef*
1.8 +22 -0
xml-xerces/c/src/xercesc/validators/schema/XercesAttGroupInfo.cpp
Index: XercesAttGroupInfo.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/XercesAttGroupInfo.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XercesAttGroupInfo.cpp 13 Nov 2003 23:20:47 -0000 1.7
+++ XercesAttGroupInfo.cpp 20 Nov 2003 17:06:05 -0000 1.8
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.8 2003/11/20 17:06:05 knoaman
+ * PSVI: store name and namespace information
+ *
* Revision 1.7 2003/11/13 23:20:47 peiyongz
* initSize
*
@@ -106,6 +109,8 @@
// ---------------------------------------------------------------------------
XercesAttGroupInfo::XercesAttGroupInfo(MemoryManager* const manager)
: fTypeWithId(false)
+ , fNameId(0)
+ , fNamespaceId(0)
, fAttributes(0)
, fAnyAttributes(0)
, fCompleteWildCard(0)
@@ -114,6 +119,19 @@
}
+XercesAttGroupInfo::XercesAttGroupInfo(unsigned int attGroupNameId,
+ unsigned int attGroupNamespaceId,
+ MemoryManager* const manager)
+ : fTypeWithId(false)
+ , fNameId(attGroupNameId)
+ , fNamespaceId(attGroupNamespaceId)
+ , fAttributes(0)
+ , fAnyAttributes(0)
+ , fCompleteWildCard(0)
+ , fMemoryManager(manager)
+{
+
+}
XercesAttGroupInfo::~XercesAttGroupInfo()
{
@@ -185,6 +203,8 @@
if (serEng.isStoring())
{
serEng<<fTypeWithId;
+ serEng<<fNameId;
+ serEng<<fNamespaceId;
/***
*
@@ -205,6 +225,8 @@
else
{
serEng>>fTypeWithId;
+ serEng>>fNameId;
+ serEng>>fNamespaceId;
/***
*
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
