tng 2002/09/24 13:00:32
Modified: c/src/xercesc/parsers AbstractDOMParser.cpp
SAX2XMLReaderImpl.cpp
Log:
Performance: use XMLString::equals instead of XMLString::compareString
Revision Changes Path
1.25 +10 -32 xml-xerces/c/src/xercesc/parsers/AbstractDOMParser.cpp
Index: AbstractDOMParser.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/parsers/AbstractDOMParser.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- AbstractDOMParser.cpp 23 Sep 2002 19:38:15 -0000 1.24
+++ AbstractDOMParser.cpp 24 Sep 2002 20:00:32 -0000 1.25
@@ -568,7 +568,7 @@
// retrive the baseURI from the entity decl
const XMLCh* baseURI = erImpl->getBaseURI();
- if (baseURI != 0 &&
XMLString::compareString(baseURI,fDocument->getDocumentURI())) {
+ if (baseURI != 0 &&
!XMLString::equals(baseURI,fDocument->getDocumentURI())) {
if (fScanner -> getDoNamespaces()) {
((DOMElement*)fCurrentNode)->setAttributeNS(DOMNodeImpl::getXmlURIString(),
baseString, baseURI);
} else {
@@ -656,15 +656,7 @@
fCurrentNode = fDocument;
// set DOM error checking off
fDocument->setErrorChecking(false);
-
- const XMLCh* systemId = fScanner->getLocator()->getSystemId();
- if (systemId) {
- XMLBufBid bbURI(&fBufMgr);
- XMLBuffer& bufURI = bbURI.getBuffer();
- XMLString::fixURI(systemId, bufURI);
-
- fDocument->setDocumentURI(bufURI.getRawBuffer());
- }
+ fDocument->setDocumentURI(fScanner->getLocator()->getSystemId());
fDocument->setActualEncoding(fScanner->getReaderMgr()->getCurrentEncodingStr());
}
@@ -719,7 +711,7 @@
const XMLAttr* oneAttrib = attrList.elementAt(index);
unsigned int attrURIId = oneAttrib -> getURIId();
namespaceURI = 0;
- if (!XMLString::compareString(oneAttrib -> getName(), XMLNS)) //for
xmlns=...
+ if (XMLString::equals(oneAttrib -> getName(), XMLNS)) //for xmlns=...
attrURIId = fScanner->getXMLNSNamespaceId();
if (attrURIId != fScanner->getEmptyNamespaceId()) { //TagName has a
prefix
fScanner->getURIText(attrURIId, bufURI); //get namespaceURI
@@ -810,7 +802,7 @@
unsigned int uriId = fScanner->resolveQName(qualifiedName,
nameBuf, prefixBuf, ElemStack::Mode_Attribute);
const XMLCh* namespaceURI = 0;
- if (!XMLString::compareString(qualifiedName, XMLNS))
//for xmlns=...
+ if (XMLString::equals(qualifiedName, XMLNS)) //for
xmlns=...
uriId = fScanner->getXMLNSNamespaceId();
if (uriId != fScanner->getEmptyNamespaceId()) { //TagName
has a prefix
namespaceURI = fScanner->getURIText(uriId);
@@ -892,7 +884,7 @@
, const XMLCh* const standalone
, const XMLCh* const actualEncStr)
{
- fDocument->setStandalone(!XMLString::compareString(XMLUni::fgYesString,
standalone));
+ fDocument->setStandalone(XMLString::equals(XMLUni::fgYesString, standalone));
fDocument->setVersion(version);
fDocument->setEncoding(encoding);
@@ -1180,7 +1172,7 @@
XMLString::subString(prefix ,qualifiedName, 0, index);
- if (!XMLString::compareString(prefix,XMLNS))
+ if (XMLString::equals(prefix,XMLNS))
buf.append(XMLUni::fgXMLNSURIName);
else
buf.append(XMLUni::fgXMLURIName);
@@ -1190,7 +1182,7 @@
}
else {
// No prefix
- if (!XMLString::compareString(qualifiedName,XMLNS))
+ if (XMLString::equals(qualifiedName,XMLNS))
buf.append(XMLUni::fgXMLNSURIName);
}
@@ -1245,14 +1237,7 @@
entity->setPublicId(entityDecl.getPublicId());
entity->setSystemId(entityDecl.getSystemId());
entity->setNotationName(entityDecl.getNotationName());
- if (entityDecl.getBaseURI())
- {
- XMLBufBid bbURI(&fBufMgr);
- XMLBuffer& bufURI = bbURI.getBuffer();
- XMLString::fixURI(entityDecl.getBaseURI(), bufURI);
-
- entity->setBaseURI(bufURI.getRawBuffer());
- }
+ entity->setBaseURI(entityDecl.getBaseURI());
DOMEntityImpl *previousDef = (DOMEntityImpl *)
fDocumentType->getEntities()->setNamedItem( entity );
@@ -1323,14 +1308,7 @@
DOMNotationImpl* notation = (DOMNotationImpl
*)fDocument->createNotation(notDecl.getName());
notation->setPublicId(notDecl.getPublicId());
notation->setSystemId(notDecl.getSystemId());
- if (notDecl.getBaseURI())
- {
- XMLBufBid bbURI(&fBufMgr);
- XMLBuffer& bufURI = bbURI.getBuffer();
- XMLString::fixURI(notDecl.getBaseURI(), bufURI);
-
- notation->setBaseURI(bufURI.getRawBuffer());
- }
+ notation->setBaseURI(notDecl.getBaseURI());
DOMNode* rem = fDocumentType->getNotations()->setNamedItem( notation );
if (rem)
1.11 +5 -2 xml-xerces/c/src/xercesc/parsers/SAX2XMLReaderImpl.cpp
Index: SAX2XMLReaderImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/parsers/SAX2XMLReaderImpl.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SAX2XMLReaderImpl.cpp 14 Aug 2002 15:20:38 -0000 1.10
+++ SAX2XMLReaderImpl.cpp 24 Sep 2002 20:00:32 -0000 1.11
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.11 2002/09/24 20:00:32 tng
+ * Performance: use XMLString::equals instead of XMLString::compareString
+ *
* Revision 1.10 2002/08/14 15:20:38 knoaman
* [Bug 3111] Problem with LexicalHandler::startDTD() and LexicalHandler::endDTD().
*
@@ -816,9 +819,9 @@
for (unsigned int i = 0; i < attrCount; i++)
{
tempAttr = attrList.elementAt(i);
- if (XMLString::compareString(tempAttr->getQName(), nsString) == 0)
+ if (XMLString::equals(tempAttr->getQName(), nsString))
nsURI = tempAttr->getValue();
- if (XMLString::compareString(tempAttr->getPrefix(), nsString) == 0)
+ if (XMLString::equals(tempAttr->getPrefix(), nsString))
{
nsPrefix = tempAttr->getName();
nsURI = tempAttr->getValue();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
