From: Asbjorn M. <ste...@us...> - 2002-02-21 18:08:09
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src/data In directory usw-pr-cvs1:/tmp/cvs-serv21482 Modified Files: epp_contactXMLbase.cc epp_eppXMLbase.cc Log Message: Cut down on the heavy usage of getNodeName... Index: epp_contactXMLbase.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_contactXMLbase.cc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** epp_contactXMLbase.cc 20 Feb 2002 17:26:02 -0000 1.7 --- epp_contactXMLbase.cc 21 Feb 2002 17:20:22 -0000 1.8 *************** *** 122,126 **** while(!CNAChildNode->isNull()) { ! if(CNAChildNode->getNodeName() == string(elemPrefix + ":name")) { string name = CNAChildNode->getNodeData(); --- 122,128 ---- while(!CNAChildNode->isNull()) { ! string nodeName = CNAChildNode->getNodeName(); ! ! if(nodeName == string(elemPrefix + ":name")) { string name = CNAChildNode->getNodeData(); *************** *** 130,134 **** } // if "name" ! else if(CNAChildNode->getNodeName() == string(elemPrefix + ":org")) { string org = CNAChildNode->getNodeData(); --- 132,136 ---- } // if "name" ! else if(nodeName == string(elemPrefix + ":org")) { string org = CNAChildNode->getNodeData(); *************** *** 137,141 **** } // if "org" ! else if(CNAChildNode->getNodeName() == string(elemPrefix + ":addr")) { adrStruct.m_address.ref(new epp_ContactAddress()); --- 139,143 ---- } // if "org" ! else if(nodeName == string(elemPrefix + ":addr")) { adrStruct.m_address.ref(new epp_ContactAddress()); *************** *** 149,153 **** while(!addrChildNode->isNull()) { ! if(addrChildNode->getNodeName() == string(elemPrefix + ":street")) { string street = addrChildNode->getNodeData(); --- 151,157 ---- while(!addrChildNode->isNull()) { ! string addrNodeName = addrChildNode->getNodeName(); ! ! if(addrNodeName == string(elemPrefix + ":street")) { string street = addrChildNode->getNodeData(); *************** *** 166,170 **** } // if "street" ! else if(addrChildNode->getNodeName() == string(elemPrefix + ":city")) { string city = addrChildNode->getNodeData(); --- 170,174 ---- } // if "street" ! else if(addrNodeName == string(elemPrefix + ":city")) { string city = addrChildNode->getNodeData(); *************** *** 173,177 **** } // if "city" ! else if(addrChildNode->getNodeName() == string(elemPrefix + ":sp")) { string sp = addrChildNode->getNodeData(); --- 177,181 ---- } // if "city" ! else if(addrNodeName == string(elemPrefix + ":sp")) { string sp = addrChildNode->getNodeData(); *************** *** 180,184 **** } // if "sp" ! else if(addrChildNode->getNodeName() == string(elemPrefix + ":pc")) { string pc = addrChildNode->getNodeData(); --- 184,188 ---- } // if "sp" ! else if(addrNodeName == string(elemPrefix + ":pc")) { string pc = addrChildNode->getNodeData(); *************** *** 187,191 **** } // if "pc" ! else if(addrChildNode->getNodeName() == string(elemPrefix + ":cc")) { string cc = addrChildNode->getNodeData(); --- 191,195 ---- } // if "pc" ! else if(addrNodeName == string(elemPrefix + ":cc")) { string cc = addrChildNode->getNodeData(); Index: epp_eppXMLbase.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_eppXMLbase.cc,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** epp_eppXMLbase.cc 20 Feb 2002 17:26:02 -0000 1.10 --- epp_eppXMLbase.cc 21 Feb 2002 17:20:22 -0000 1.11 *************** *** 262,266 **** while(!resChildNode->isNull()) { ! if(resChildNode->getNodeName() == "unspec") { dom_ptr unspecNode = dom_ptr(resChildNode->getFirstChildElement()); --- 262,268 ---- while(!resChildNode->isNull()) { ! string nodeName = resChildNode->getNodeName(); ! ! if(nodeName == "unspec") { dom_ptr unspecNode = dom_ptr(resChildNode->getFirstChildElement()); *************** *** 278,282 **** } // if "unspec" ! else if(resChildNode->getNodeName() == "trID") { res->m_trans_id.ref(new epp_TransID()); --- 280,284 ---- } // if "unspec" ! else if(nodeName == "trID") { res->m_trans_id.ref(new epp_TransID()); *************** *** 286,290 **** while(!trIDChildNode->isNull()) { ! if(trIDChildNode->getNodeName() == "svTRID") { string svTRID = trIDChildNode->getNodeData(); --- 288,294 ---- while(!trIDChildNode->isNull()) { ! string trIDNodeName = trIDChildNode->getNodeName(); ! ! if(trIDNodeName == "svTRID") { string svTRID = trIDChildNode->getNodeData(); *************** *** 292,296 **** // cout << "svTRID: " << *res->m_trans_id->m_server_trid << endl; } ! else if(trIDChildNode->getNodeName() == "clTRID") { string clTRID = trIDChildNode->getNodeData(); --- 296,300 ---- // cout << "svTRID: " << *res->m_trans_id->m_server_trid << endl; } ! else if(trIDNodeName == "clTRID") { string clTRID = trIDChildNode->getNodeData(); *************** *** 303,307 **** } // if "trID" ! else if(resChildNode->getNodeName() == "msgQ") { res->m_message_queue.ref(new epp_MessageQueue()); --- 307,311 ---- } // if "trID" ! else if(nodeName == "msgQ") { res->m_message_queue.ref(new epp_MessageQueue()); *************** *** 321,325 **** } // if "msqQ" ! else if(resChildNode->getNodeName() == "result") { if(res->m_results == NULL) --- 325,329 ---- } // if "msqQ" ! else if(nodeName == "result") { if(res->m_results == NULL) *************** *** 340,344 **** while(!resultChildNode->isNull()) { ! if(resultChildNode->getNodeName() == "msg") { string msg = resultChildNode->getNodeData(); --- 344,350 ---- while(!resultChildNode->isNull()) { ! string nodeName = resultChildNode->getNodeName(); ! ! if(nodeName == "msg") { string msg = resultChildNode->getNodeData(); *************** *** 361,365 **** } // if "msg" ! else if(resultChildNode->getNodeName() == "value") { if(result.m_values == NULL) --- 367,371 ---- } // if "msg" ! else if(nodeName == "value") { if(result.m_values == NULL) *************** *** 452,456 **** while(!elNode->isNull()) { ! if(elNode->getNodeName() == "version") { if(gr->m_versions == NULL) gr->m_versions.ref(new epp_string_seq); --- 458,464 ---- while(!elNode->isNull()) { ! string nodeName = elNode->getNodeName(); ! ! if(nodeName == "version") { if(gr->m_versions == NULL) gr->m_versions.ref(new epp_string_seq); *************** *** 461,465 **** // cout << "version: " << value << endl; } ! else if(elNode->getNodeName() == "lang") { if(gr->m_langs == NULL) gr->m_langs.ref(new epp_string_seq); --- 469,473 ---- // cout << "version: " << value << endl; } ! else if(nodeName == "lang") { if(gr->m_langs == NULL) gr->m_langs.ref(new epp_string_seq); *************** *** 470,474 **** // cout << "lang: " << value << endl; } ! else if(elNode->getNodeName().find(":svc") != string::npos) { if(gr->m_services == NULL) { gr->m_services.ref(new epp_service_seq); --- 478,482 ---- // cout << "lang: " << value << endl; } ! else if(nodeName.find(":svc") != string::npos) { if(gr->m_services == NULL) { gr->m_services.ref(new epp_service_seq); *************** *** 481,485 **** } } ! else if(elNode->getNodeName() == "unspec") { gr->m_unspec_services.ref(new epp_service_seq); --- 489,493 ---- } } ! else if(nodeName == "unspec") { gr->m_unspec_services.ref(new epp_service_seq); |