You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by du...@apache.org on 2005/05/13 06:55:18 UTC
cvs commit: ws-axis/c/src/xml/xerces XMLParserXerces.cpp XercesHandler.cpp
dushshantha 2005/05/12 21:55:18
Modified: c/src/xml/xerces XMLParserXerces.cpp XercesHandler.cpp
Log:
made some modifications to the peek mechanism.
Revision Changes Path
1.12 +11 -1 ws-axis/c/src/xml/xerces/XMLParserXerces.cpp
Index: XMLParserXerces.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/xml/xerces/XMLParserXerces.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XMLParserXerces.cpp 4 May 2005 10:36:59 -0000 1.11
+++ XMLParserXerces.cpp 13 May 2005 04:55:18 -0000 1.12
@@ -137,8 +137,18 @@
}
bool bCanParseMore = true;
-
+
+ m_Xhandler.freeElement();
bCanParseMore = m_pParser->parseNext(m_ScanToken);
+ AnyElement* elem = m_Xhandler.getAnyElement();
+ while (CHARACTER_ELEMENT == elem->m_type) // we never peek for char data
+ //hence this is a white space
+ { /* ignorable white space */
+ m_Xhandler.freeElement();
+ bCanParseMore = m_pParser->parseNext(m_ScanToken);
+ elem = m_Xhandler.getAnyElement();
+ }
+
const char* name = m_Xhandler.peekNextElementName();
m_bPeeked = true;
return name;
1.11 +5 -2 ws-axis/c/src/xml/xerces/XercesHandler.cpp
Index: XercesHandler.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/xml/xerces/XercesHandler.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XercesHandler.cpp 4 May 2005 10:36:59 -0000 1.10
+++ XercesHandler.cpp 13 May 2005 04:55:18 -0000 1.11
@@ -269,8 +269,11 @@
}
//Chinthana:This is the method will use by the XercesPaser to peek head the next element
const char* XercesHandler::peekNextElementName()
-{
- return m_pCurrElement->m_pchNameOrValue;
+{
+ if (m_pCurrElement)
+ return m_pCurrElement->m_pchNameOrValue;
+ else
+ return NULL;
}
//28/04/2005