tng 2002/12/06 10:24:46
Modified: c/src/xercesc/internal IGXMLScanner2.cpp SGXMLScanner.cpp
Log:
Do not print the curly braces if the namespace URL is null.
Revision Changes Path
1.2 +11 -9 xml-xerces/c/src/xercesc/internal/IGXMLScanner2.cpp
Index: IGXMLScanner2.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/IGXMLScanner2.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IGXMLScanner2.cpp 4 Dec 2002 02:05:52 -0000 1.1
+++ IGXMLScanner2.cpp 6 Dec 2002 18:24:45 -0000 1.2
@@ -285,16 +285,18 @@
// Its not valid for this element, so issue an error if we are
// validating.
//
- XMLBufBid bbURI(&fBufMgr);
- XMLBuffer& bufURI = bbURI.getBuffer();
-
- getURIText(uriId, bufURI);
-
XMLBufBid bbMsg(&fBufMgr);
XMLBuffer& bufMsg = bbMsg.getBuffer();
- bufMsg.append(chOpenCurly);
- bufMsg.append(bufURI.getRawBuffer());
- bufMsg.append(chCloseCurly);
+ if (uriId != fEmptyNamespaceId) {
+ XMLBufBid bbURI(&fBufMgr);
+ XMLBuffer& bufURI = bbURI.getBuffer();
+
+ getURIText(uriId, bufURI);
+
+ bufMsg.append(chOpenCurly);
+ bufMsg.append(bufURI.getRawBuffer());
+ bufMsg.append(chCloseCurly);
+ }
bufMsg.append(suffPtr);
fValidator->emitError
(
1.2 +12 -10 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SGXMLScanner.cpp 5 Dec 2002 16:19:27 -0000 1.1
+++ SGXMLScanner.cpp 6 Dec 2002 18:24:46 -0000 1.2
@@ -884,7 +884,7 @@
XMLElementDecl* tempElement = topElem->fThisElement;
const XMLCh* rawNameBuf = fQNameBuf.getRawBuffer();
- if ((topUri != uriId) ||
+ if ((topUri != uriId) ||
(!XMLString::equals(tempElement->getBaseName(), &rawNameBuf[prefixColonPos
+ 1])))
{
emitError
@@ -2041,16 +2041,18 @@
// Its not valid for this element, so issue an error if we are
// validating.
//
- XMLBufBid bbURI(&fBufMgr);
- XMLBuffer& bufURI = bbURI.getBuffer();
-
- getURIText(uriId, bufURI);
-
XMLBufBid bbMsg(&fBufMgr);
XMLBuffer& bufMsg = bbMsg.getBuffer();
- bufMsg.append(chOpenCurly);
- bufMsg.append(bufURI.getRawBuffer());
- bufMsg.append(chCloseCurly);
+ if (uriId != fEmptyNamespaceId) {
+ XMLBufBid bbURI(&fBufMgr);
+ XMLBuffer& bufURI = bbURI.getBuffer();
+
+ getURIText(uriId, bufURI);
+
+ bufMsg.append(chOpenCurly);
+ bufMsg.append(bufURI.getRawBuffer());
+ bufMsg.append(chCloseCurly);
+ }
bufMsg.append(suffPtr);
fValidator->emitError
(
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
