[sword-cvs] sword/src/utilfuns utilxml.cpp,1.9,1.10

sword@www.crosswire.org sword@www.crosswire.org
Fri, 4 Jul 2003 21:58:44 -0700


Update of /usr/local/cvsroot/sword/src/utilfuns
In directory www:/tmp/cvs-serv7690/src/utilfuns

Modified Files:
	utilxml.cpp 
Log Message:
Added SWOptionFilter


Index: utilxml.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/utilfuns/utilxml.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** utilxml.cpp	5 Jul 2003 01:16:46 -0000	1.9
--- utilxml.cpp	5 Jul 2003 04:58:42 -0000	1.10
***************
*** 104,114 ****
  }
  
! const ListString XMLTag::getAttributeNames() const {
! 	ListString retVal;
  
  	if (!parsed)
  		parse();
  
! 	for (MapStringPair::iterator it = attributes.begin(); it != attributes.end(); it++)
  		retVal.push_back(it->first.c_str());
  
--- 104,114 ----
  }
  
! const StringList XMLTag::getAttributeNames() const {
! 	StringList retVal;
  
  	if (!parsed)
  		parse();
  
! 	for (StringPairMap::iterator it = attributes.begin(); it != attributes.end(); it++)
  		retVal.push_back(it->first.c_str());
  
***************
*** 150,154 ****
  		parse();
  
! 	MapStringPair::iterator it = attributes.find(attribName);
  	const char *retVal = (it == attributes.end()) ? 0 : it->second.c_str();
  	if ((retVal) && (partNum > -1))
--- 150,154 ----
  		parse();
  
! 	StringPairMap::iterator it = attributes.find(attribName);
  	const char *retVal = (it == attributes.end()) ? 0 : it->second.c_str();
  	if ((retVal) && (partNum > -1))
***************
*** 177,181 ****
  
  	tag += getName();
! 	for (MapStringPair::iterator it = attributes.begin(); it != attributes.end(); it++) {
  		tag.appendFormatted(" %s=\"%s\"", it->first.c_str(), it->second.c_str());
  	}
--- 177,181 ----
  
  	tag += getName();
! 	for (StringPairMap::iterator it = attributes.begin(); it != attributes.end(); it++) {
  		tag.appendFormatted(" %s=\"%s\"", it->first.c_str(), it->second.c_str());
  	}