From: Daniel M. <tub...@us...> - 2003-05-30 21:56:32
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src In directory sc8-pr-cvs1:/tmp/cvs-serv14937 Modified Files: epp_ContactCreate.cc epp_ContactUpdate.cc main_contactupdate.cc Log Message: got contact update working. also made the m_addresses def's in the classes consistent and added cvs header lines Index: epp_ContactCreate.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_ContactCreate.cc,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** epp_ContactCreate.cc 30 May 2003 15:50:25 -0000 1.14 --- epp_ContactCreate.cc 30 May 2003 21:56:27 -0000 1.15 *************** *** 26,29 **** --- 26,31 ---- ************************************************************************/ + /* $Header$ */ + #include "config.h" #include "epp_ContactCreate.h" Index: epp_ContactUpdate.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_ContactUpdate.cc,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** epp_ContactUpdate.cc 13 May 2003 22:55:50 -0000 1.13 --- epp_ContactUpdate.cc 30 May 2003 21:56:28 -0000 1.14 *************** *** 26,29 **** --- 26,31 ---- ************************************************************************/ + /* $Header$ */ + #include "config.h" #include "epp_ContactUpdate.h" *************** *** 151,156 **** outputobject.beginTag("contact:chg"); ! addAddressElement(outputobject, element->m_ascii_address, "contact:ascii", true); ! addAddressElement(outputobject, element->m_i15d_address, "contact:i15d", true); if(element->m_voice != NULL) { --- 153,171 ---- outputobject.beginTag("contact:chg"); ! if( element->m_ascii_address != NULL || ! element->m_i15d_address != NULL ) { ! addAddressElement(outputobject, element->m_ascii_address, "contact:postalInfo", true); ! addAddressElement(outputobject, element->m_i15d_address, "contact:postalInfo", true); ! } else if ( element->m_addresses != NULL && ! element->m_addresses->size() > 0 ) { ! for(epp_ContactNameAddress_seq::iterator i = element->m_addresses->begin(); ! i != element->m_addresses->end(); i++) ! { ! epp_ContactNameAddress_ref cnar; ! cnar.ref(new epp_ContactNameAddress(*i)); ! addAddressElement(outputobject, cnar, "contact:postalInfo", true); ! } ! ! } if(element->m_voice != NULL) { Index: main_contactupdate.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_contactupdate.cc,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** main_contactupdate.cc 13 May 2003 22:55:50 -0000 1.15 --- main_contactupdate.cc 30 May 2003 21:56:28 -0000 1.16 *************** *** 26,29 **** --- 26,31 ---- ************************************************************************/ + /* $Header$ */ + #include <vector> #include <iostream> *************** *** 61,75 **** string username, password; ! if(!handleArgs(test, argc, argv, username, password)) return 1; ! map<unsigned int,string> testDataMap; if(argc > 1) { for(int parm = 1; parm < argc; parm++) { ! if (!strncmp(argv[parm], "-testdata=", 10)) { ! string td = &argv[parm][10]; ! testDataMap = getTestDataMap(td); } } --- 63,100 ---- string username, password; ! string extra_usage = "[-extradata=trid=xxx:id=abc -add=status1=aaa:status2=bbb -remove=status1=ccc:status2=ddd -change=name=John Doe:org=ACME]"; ! if(!handleArgs(test, argc, argv, username, password, extra_usage)) return 1; ! map<string,string> extraDataMap; ! map<string,string> addDataMap; ! map<string,string> changeDataMap; ! map<string,string> removeDataMap; if(argc > 1) { for(int parm = 1; parm < argc; parm++) { ! if (!strncmp(argv[parm], "-extradata=", 11)) { ! cout << "Found extra data param..." << endl; ! string td = &argv[parm][11]; ! extraDataMap = getExtraDataMap(td); ! } ! ! if (!strncmp(argv[parm], "-add=", 5)) { ! cout << "Found 'add' data param..." << endl; ! string td = &argv[parm][5]; ! addDataMap = getExtraDataMap(td); ! } ! ! if (!strncmp(argv[parm], "-change=", 9)) { ! cout << "Found 'change' data param..." << endl; ! string td = &argv[parm][9]; ! changeDataMap = getExtraDataMap(td); ! } ! ! if (!strncmp(argv[parm], "-remove=", 8)) { ! cout << "Found 'remove' data param..." << endl; ! string td = &argv[parm][8]; ! removeDataMap = getExtraDataMap(td); } } *************** *** 83,95 **** string trID; ! if(testDataMap.empty()) trID = "ABC-12345"; ! else trID = testDataMap[1]; l_req->m_cmd.ref(new epp_Command(NULL, epp_trid(trID))); ! if(testDataMap.empty()) { epp_ContactNameAddress_ref addr(new epp_ContactNameAddress()); addr->m_org.ref(new epp_string("")); addr->m_address.ref(new epp_ContactAddress()); --- 108,123 ---- string trID; ! if(extraDataMap["trid"] == "") trID = "ABC-12345"; ! else trID = extraDataMap["trid"]; l_req->m_cmd.ref(new epp_Command(NULL, epp_trid(trID))); ! if( addDataMap.empty() && ! removeDataMap.empty() && ! changeDataMap.empty() ) { epp_ContactNameAddress_ref addr(new epp_ContactNameAddress()); + addr->m_type.ref(new epp_ContactPostalInfoType(INT)); addr->m_org.ref(new epp_string("")); addr->m_address.ref(new epp_ContactAddress()); *************** *** 114,117 **** --- 142,146 ---- epp_ContactStatus status; status.m_type.ref(new epp_ContactStatusType(CLIENT_DELETE_PROHIBITED)); + status.m_value.ref(new epp_string("don't ever leave me")); l_req->m_id.ref(new epp_string("sh8013")); *************** *** 122,163 **** } else { ! if(testDataMap[2] != "-1") l_req->m_id.ref(new epp_string(testDataMap[2])); ! if(testDataMap[3] == "add") { l_req->m_add.ref(new epp_ContactUpdateAddRemove()); ! if(testDataMap[4] != "-1") { ! string statuses = testDataMap[4]; l_req->m_add->m_status.ref(new epp_contact_status_seq()); ! int begin = 0; ! int end = 0; ! ! while(end != string::npos) { ! end = statuses.find(' ', begin); ! string tmp = statuses.substr(begin,end-begin); epp_ContactStatus status; status.m_type.ref(new epp_ContactStatusType(returnStatusEnumType(tmp))); l_req->m_add->m_status->push_back(status); ! ! begin = end+1; } } } ! if(testDataMap[5] == "rem") { l_req->m_remove.ref(new epp_ContactUpdateAddRemove()); ! if(testDataMap[6] != "-1") { ! string statuses = testDataMap[6]; l_req->m_remove->m_status.ref(new epp_contact_status_seq()); ! int begin = 0; ! int end = 0; ! ! while(end != string::npos) { ! end = statuses.find(' ', begin); ! string tmp = statuses.substr(begin,end-begin); epp_ContactStatus status; --- 151,195 ---- } else { ! if ( extraDataMap["id"].empty() ) { ! l_req->m_id.ref(new epp_string("sh8013")); ! } else { ! l_req->m_id.ref(new epp_string(extraDataMap["id"])); ! } ! if( ! addDataMap.empty() ) { l_req->m_add.ref(new epp_ContactUpdateAddRemove()); ! if( ! addDataMap["status1"].empty() ) { ! char status_name[10]; ! int status_number = 1; ! sprintf(status_name, "status%d", status_number); ! l_req->m_add->m_status.ref(new epp_contact_status_seq()); ! while( ! addDataMap[status_name].empty() ) { ! string tmp = addDataMap[status_name]; epp_ContactStatus status; status.m_type.ref(new epp_ContactStatusType(returnStatusEnumType(tmp))); l_req->m_add->m_status->push_back(status); ! ! status_number++; ! sprintf(status_name, "status%d", status_number); } } } ! if( ! removeDataMap.empty() ) { l_req->m_remove.ref(new epp_ContactUpdateAddRemove()); ! if( ! removeDataMap["status1"].empty() ) { ! char status_name[10]; ! int status_number = 1; ! sprintf(status_name, "status%d", status_number); ! l_req->m_remove->m_status.ref(new epp_contact_status_seq()); ! while( ! removeDataMap[status_name].empty() ) { ! string tmp = removeDataMap[status_name]; epp_ContactStatus status; *************** *** 165,181 **** l_req->m_remove->m_status->push_back(status); ! begin = end+1; } } } ! if(testDataMap[7] == "chg") { epp_ContactUpdateChange_ref chg(new epp_ContactUpdateChange()); ! if(testDataMap[8] != "-1") { chg->m_auth_info.ref(new epp_AuthInfo()); chg->m_auth_info->m_type.ref(new epp_AuthInfoType(PW)); ! chg->m_auth_info->m_value.ref(new epp_string(testDataMap[8])); } --- 197,214 ---- l_req->m_remove->m_status->push_back(status); ! status_number++; ! sprintf(status_name, "status%d", status_number); } } } ! if( ! changeDataMap.empty() ) { epp_ContactUpdateChange_ref chg(new epp_ContactUpdateChange()); ! if(changeDataMap.find("authinfo") != changeDataMap.end()) { chg->m_auth_info.ref(new epp_AuthInfo()); chg->m_auth_info->m_type.ref(new epp_AuthInfoType(PW)); ! chg->m_auth_info->m_value.ref(new epp_string(changeDataMap["authinfo"])); } *************** *** 183,219 **** addr->m_address.ref(new epp_ContactAddress()); ! if(testDataMap[9] != "-1") addr->m_name.ref(new epp_string(testDataMap[9])); ! if(testDataMap[10] != "-1") addr->m_org.ref(new epp_string(testDataMap[10])); ! if(testDataMap[11] != "-1") addr->m_address->m_street1.ref(new epp_string(testDataMap[11])); ! if(testDataMap[12] != "-1") addr->m_address->m_street2.ref(new epp_string(testDataMap[12])); ! if(testDataMap[13] != "-1") addr->m_address->m_street3.ref(new epp_string(testDataMap[13])); ! if(testDataMap[14] != "-1") addr->m_address->m_city.ref(new epp_string(testDataMap[14])); ! if(testDataMap[15] != "-1") addr->m_address->m_state_province.ref(new epp_string(testDataMap[15])); ! if(testDataMap[16] != "-1") addr->m_address->m_country_code.ref(new epp_string(testDataMap[16])); ! if(testDataMap[17] != "-1") addr->m_address->m_postal_code.ref(new epp_string(testDataMap[17])); ! if(testDataMap[18] != "-1" || testDataMap[19] != "-1") { chg->m_voice.ref(new epp_ContactPhone()); ! if(testDataMap[18] != "-1") chg->m_voice->m_value.ref(new epp_string(testDataMap[18])); ! if(testDataMap[19] != "-1") chg->m_voice->m_extension.ref(new epp_string(testDataMap[19])); } ! if(testDataMap[20] != "-1") chg->m_email.ref(new epp_string(testDataMap[20])); ! if(testDataMap[21] != "-1" || testDataMap[22] != "-1") { chg->m_fax.ref(new epp_ContactPhone()); ! if(testDataMap[21] != "-1") chg->m_fax->m_value.ref(new epp_string(testDataMap[21])); ! if(testDataMap[22] != "-1") chg->m_fax->m_extension.ref(new epp_string(testDataMap[22])); } ! chg->m_ascii_address = addr; l_req->m_change = chg; } --- 216,267 ---- addr->m_address.ref(new epp_ContactAddress()); ! if(changeDataMap.find("name") != changeDataMap.end()) addr->m_name.ref(new epp_string(changeDataMap["name"])); ! if(changeDataMap.find("org") != changeDataMap.end()) addr->m_org.ref(new epp_string(changeDataMap["org"])); ! if(changeDataMap.find("street1") != changeDataMap.end()) addr->m_address->m_street1.ref(new epp_string(changeDataMap["street1"])); ! if(changeDataMap.find("street2") != changeDataMap.end()) addr->m_address->m_street2.ref(new epp_string(changeDataMap["street2"])); ! if(changeDataMap.find("street3") != changeDataMap.end()) addr->m_address->m_street3.ref(new epp_string(changeDataMap["street3"])); ! if(changeDataMap.find("city") != changeDataMap.end()) addr->m_address->m_city.ref(new epp_string(changeDataMap["city"])); ! if(changeDataMap.find("state") != changeDataMap.end()) addr->m_address->m_state_province.ref(new epp_string(changeDataMap["state"])); ! if(changeDataMap.find("country") != changeDataMap.end()) addr->m_address->m_country_code.ref(new epp_string(changeDataMap["country"])); ! if(changeDataMap.find("postal") != changeDataMap.end()) addr->m_address->m_postal_code.ref(new epp_string(changeDataMap["postal"])); ! if( changeDataMap.find("phone") != changeDataMap.end() ) { chg->m_voice.ref(new epp_ContactPhone()); ! string phone = changeDataMap["phone"]; ! string extension = ""; ! unsigned int x_location = phone.find("x"); ! if ( x_location != string::npos ) { ! extension = phone.substr(x_location+1); ! phone = phone.substr(0,x_location); ! chg->m_voice->m_extension.ref(new epp_string(extension)); ! } ! chg->m_voice->m_value.ref(new epp_string(phone)); } ! if(changeDataMap.find("email") != changeDataMap.end()) chg->m_email.ref(new epp_string(changeDataMap["email"])); ! if( changeDataMap.find("fax") != changeDataMap.end() ) { chg->m_fax.ref(new epp_ContactPhone()); ! string phone = changeDataMap["phone"]; ! string extension = ""; ! unsigned int x_location = phone.find("x"); ! if ( x_location != string::npos ) { ! extension = phone.substr(x_location+1); ! phone = phone.substr(0,x_location); ! chg->m_fax->m_extension.ref(new epp_string(extension)); ! } ! chg->m_fax->m_value.ref(new epp_string(phone)); } ! chg->m_addresses.ref(new epp_ContactNameAddress_seq()); ! chg->m_addresses->push_back(*addr); l_req->m_change = chg; } |