peiyongz 2003/01/24 15:18:35
Modified: c/src/xercesc/validators/datatype
Base64BinaryDatatypeValidator.hpp
Base64BinaryDatatypeValidator.cpp
AbstractStringValidator.hpp
AbstractStringValidator.cpp
Log:
normalizeEnumeration() added to remove optional ws in Base64 data.
Revision Changes Path
1.4 +6 -1
xml-xerces/c/src/xercesc/validators/datatype/Base64BinaryDatatypeValidator.hpp
Index: Base64BinaryDatatypeValidator.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/datatype/Base64BinaryDatatypeValidator.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Base64BinaryDatatypeValidator.hpp 18 Dec 2002 14:17:55 -0000 1.3
+++ Base64BinaryDatatypeValidator.hpp 24 Jan 2003 23:18:34 -0000 1.4
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.4 2003/01/24 23:18:34 peiyongz
+ * normalizeEnumeration() added to remove optional ws in Base64 data.
+ *
* Revision 1.3 2002/12/18 14:17:55 gareth
* Fix to bug #13438. When you eant a vector that calls delete[] on its members you
should use RefArrayVectorOf.
*
@@ -124,6 +127,8 @@
virtual void checkValueSpace(const XMLCh* const content);
virtual int getLength(const XMLCh* const content) const;
+
+ virtual void normalizeEnumeration();
private:
1.4 +14 -0
xml-xerces/c/src/xercesc/validators/datatype/Base64BinaryDatatypeValidator.cpp
Index: Base64BinaryDatatypeValidator.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/datatype/Base64BinaryDatatypeValidator.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Base64BinaryDatatypeValidator.cpp 18 Dec 2002 14:17:55 -0000 1.3
+++ Base64BinaryDatatypeValidator.cpp 24 Jan 2003 23:18:34 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2003/01/24 23:18:34 peiyongz
+ * normalizeEnumeration() added to remove optional ws in Base64 data.
+ *
* Revision 1.3 2002/12/18 14:17:55 gareth
* Fix to bug #13438. When you eant a vector that calls delete[] on its members you
should use RefArrayVectorOf.
*
@@ -175,6 +178,17 @@
int Base64BinaryDatatypeValidator::getLength(const XMLCh* const content) const
{
return Base64::getDataLength(content);
+}
+
+void Base64BinaryDatatypeValidator::normalizeEnumeration()
+{
+
+ int enumLength = getEnumeration()->size();
+ for ( int i=0; i < enumLength; i++)
+ {
+ XMLString::removeWS(getEnumeration()->elementAt(i));
+ }
+
}
XERCES_CPP_NAMESPACE_END
1.6 +9 -1
xml-xerces/c/src/xercesc/validators/datatype/AbstractStringValidator.hpp
Index: AbstractStringValidator.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/datatype/AbstractStringValidator.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractStringValidator.hpp 18 Dec 2002 14:17:55 -0000 1.5
+++ AbstractStringValidator.hpp 24 Jan 2003 23:18:34 -0000 1.6
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.6 2003/01/24 23:18:34 peiyongz
+ * normalizeEnumeration() added to remove optional ws in Base64 data.
+ *
* Revision 1.5 2002/12/18 14:17:55 gareth
* Fix to bug #13438. When you eant a vector that calls delete[] on its members you
should use RefArrayVectorOf.
*
@@ -195,6 +198,11 @@
virtual void inheritFacet();
virtual void checkContent(const XMLCh* const content, bool asBase);
+
+ /*
+ ** Base64BinaryDatatypeValidator to overwrite
+ */
+ virtual void normalizeEnumeration();
public:
// -----------------------------------------------------------------------
1.8 +12 -0
xml-xerces/c/src/xercesc/validators/datatype/AbstractStringValidator.cpp
Index: AbstractStringValidator.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/datatype/AbstractStringValidator.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractStringValidator.cpp 18 Dec 2002 14:17:55 -0000 1.7
+++ AbstractStringValidator.cpp 24 Jan 2003 23:18:34 -0000 1.8
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.8 2003/01/24 23:18:34 peiyongz
+ * normalizeEnumeration() added to remove optional ws in Base64 data.
+ *
* Revision 1.7 2002/12/18 14:17:55 gareth
* Fix to bug #13438. When you eant a vector that calls delete[] on its members you
should use RefArrayVectorOf.
*
@@ -175,7 +178,10 @@
{
if (enums)
+ {
setEnumeration(enums, false);
+ normalizeEnumeration();
+ }
assignFacet();
inspectFacet();
@@ -676,6 +682,12 @@
const RefArrayVectorOf<XMLCh>* AbstractStringValidator::getEnumString() const
{
return getEnumeration();
+}
+
+void AbstractStringValidator::normalizeEnumeration()
+{
+ // default implementation: do nothing
+ return;
}
XERCES_CPP_NAMESPACE_END
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
