epp-rtk-name-commits

[Asbjorn M. <ste...@us...>]

Update of /cvsroot/epp-rtk/name-rtk-addon/c++/src
In directory usw-pr-cvs1:/tmp/cvs-serv9927

Modified Files:
	GNRclient-contact.cc 
Log Message:
-In <update>, not always sending the "<contact:addr>" anymore...
-Added <transfer> handling


Index: GNRclient-contact.cc
===================================================================
RCS file: /cvsroot/epp-rtk/name-rtk-addon/c++/src/GNRclient-contact.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GNRclient-contact.cc	22 May 2002 14:00:19 -0000	1.1
--- GNRclient-contact.cc	14 Jun 2002 16:19:27 -0000	1.2
***************
*** 575,599 ****
  	       chg->m_auth_info->m_value.ref(new epp_string(testDataMap[8]));
  	    }
- 
- 	    epp_ContactNameAddress_ref addr(new epp_ContactNameAddress());	    
- 	    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") {
--- 575,613 ----
  	       chg->m_auth_info->m_value.ref(new epp_string(testDataMap[8]));
  	    }
  	    
! 	    if(testDataMap[9] != "-1" || testDataMap[10] != "-1" || testDataMap[11] != "-1"
! 	       || testDataMap[12] != "-1" || testDataMap[13] != "-1" || testDataMap[14] != "-1"
! 	       || testDataMap[15] != "-1" || testDataMap[16] != "-1" || testDataMap[17] != "-1")
! 	      {
! 		 
! 		 epp_ContactNameAddress_ref addr(new epp_ContactNameAddress());	    
! 		 
! 		 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" || testDataMap[12] != "-1" || testDataMap[13] != "-1" || testDataMap[14] != "-1"
! 		    || testDataMap[15] != "-1" || testDataMap[16] != "-1" || testDataMap[17] != "-1")
! 		   {
! 		      addr->m_address.ref(new epp_ContactAddress());
! 		      
! 		      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]));
! 		   }
! 		 
! 		 chg->m_ascii_address = addr;
! 		 
! 	      }
  	    
  	    if(testDataMap[18] != "-1" || testDataMap[19] != "-1") {
***************
*** 611,615 ****
  	    }	    
  	    
- 	    chg->m_ascii_address = addr;
  	    l_req->m_change = chg;
  	 }
--- 625,628 ----
***************
*** 625,629 ****
        epp_ContactUpdateRsp_ref l_rsp = l_obj->getResponseData();
        
-       
  #ifndef TEST_IO_REQUEST2CERR
        contactupdate_printRsp(l_rsp);
--- 638,641 ----
***************
*** 799,800 ****
--- 811,952 ----
     
  } // contactcreate_main
+ 
+ 
+ void contacttransfer_printRsp(const eppobject::contact::epp_ContactTransferRsp_ref req)
+ {
+    cout << "Printing Response:\n_______________________________\n";
+    
+    if(req != NULL) {
+       
+       printResponsePart1(req->m_rsp);
+       printResDataHeaders("contact", "trnData");
+       
+       if(req->m_trn_data != NULL) {
+ 	 if(req->m_trn_data->m_id != NULL)
+ 	   cerr << "<contact:id>" << *req->m_trn_data->m_id << "</contact:id>" << endl;
+ 	 
+ 	 if(req->m_trn_data->m_transfer_status != NULL) {
+ 	    string trStatus = returnTransferStatusType(*req->m_trn_data->m_transfer_status);
+ 	    cerr << "<contact:trStatus>" << trStatus << "</contact:trStatus>" << endl;
+ 	 }
+ 	 
+ 	 if(req->m_trn_data->m_request_client_id != NULL)
+ 	   cerr << "<contact:reID>" << *req->m_trn_data->m_request_client_id << "</contact:reID>" << endl;
+ 	 
+ 	 if(req->m_trn_data->m_request_date != NULL)
+ 	   cerr << "<contact:reDate>" << *req->m_trn_data->m_request_date << "</contact:reDate>" << endl;
+ 	 
+ 	 if(req->m_trn_data->m_action_client_id != NULL)
+ 	   cerr << "<contact:acID>" << *req->m_trn_data->m_action_client_id << "</contact:acID>" << endl;
+ 	 
+ 	 if(req->m_trn_data->m_action_date != NULL)
+ 	   cerr << "<contact:acDate>" << *req->m_trn_data->m_action_date << "</contact:acDate>" << endl;
+       }
+       
+       printResDataFooter("contact", "trnData");
+       printResponsePart2(req->m_rsp);
+    }
+    
+    
+    cout << "_______________________________\n";
+    
+ } // contacttransfer_printRsp
+ 
+ 
+ int contacttransfer_main(eppobject::epp::epp_Session test, const string line) {
+    
+    map<int,string> testDataMap;
+    
+    testDataMap = getTestDataMap(line);
+    
+    try {
+       
+       epp_ContactTransferReq_ref l_req(new epp_ContactTransferReq());
+       
+       string trID;
+       if(testDataMap.empty()) trID = "ABC-12345";
+       else trID = testDataMap[1];
+       
+       l_req->m_cmd.ref(new epp_Command(NULL,
+ 				       NULL,
+ 				       epp_trid(trID)));
+       
+       epp_ContactTransfer_ref l_obj(new epp_ContactTransfer());
+       epp_ContactTransferRsp_ref l_rsp;
+       
+       if(testDataMap.empty()) {
+ 	 
+ 	 // REQ-test:
+ 	 l_req->m_id.ref(new epp_string("sh8013"));
+ 	 l_req->m_trans.ref(new epp_TransferRequest());
+ 	 l_req->m_trans->m_op.ref(new epp_TransferOpType(REQUEST));
+ 	 l_req->m_trans->m_auth_info.ref(new epp_AuthInfo());
+ 	 l_req->m_trans->m_auth_info->m_type.ref(new epp_AuthInfoType(PW));
+ 	 l_req->m_trans->m_auth_info->m_value.ref(new epp_string("2fooBAR"));
+ 	 
+ 	 
+ 	 l_obj->setRequestData(*l_req);
+ 	 
+ 	 test.processAction(l_obj);
+ 	 
+ 	 l_rsp = l_obj->getResponseData();
+ 	 
+ #ifndef TEST_IO_REQUEST2CERR
+ 	 contacttransfer_printRsp(l_rsp);
+ #endif
+ 	 
+ 	 cout << "\n----------------------------------\n";
+ 	 
+ 	 // QUERY-test:
+ 	 *l_req->m_trans->m_op = QUERY;
+ 	 l_req->m_trans->m_auth_info.ref(NULL);
+ 	 
+       }
+       else {
+ 	 if(testDataMap[2] != "-1") l_req->m_id.ref(new epp_string(testDataMap[2]));
+ 	 
+ 	 if(testDataMap[3] != "-1") {
+ 	    l_req->m_trans.ref(new epp_TransferRequest());
+ 	    l_req->m_trans->m_op.ref(new epp_TransferOpType(returnTransferType(testDataMap[3])));
+ 	 }
+ 	 
+ 	 if(testDataMap[4] != "-1") {
+ 	    l_req->m_trans->m_auth_info.ref(new epp_AuthInfo());
+ 	    l_req->m_trans->m_auth_info->m_type.ref(new epp_AuthInfoType(PW));
+ 	    l_req->m_trans->m_auth_info->m_value.ref(new epp_string(testDataMap[4]));
+ 	 }
+       }
+       
+       l_obj->setRequestData(*l_req);
+       
+       test.processAction(l_obj);
+       
+       l_rsp = l_obj->getResponseData();
+       
+ #ifndef TEST_IO_REQUEST2CERR
+       contacttransfer_printRsp(l_rsp);
+ #endif      
+       return 0;
+       
+    }
+    catch(epp_XMLException ex) {
+       cout << "Exception: " << ex.getString() << endl;
+    }
+    catch(epp_Exception ex) {
+       cout << "Exception: " << endl;
+ #ifndef TEST_IO_REQUEST2CERR
+       cerr << "<response>" << endl;
+       printResultsSeq(ex.m_details);
+       printTransID(ex.m_trans_id);
+       cerr << "</response>" << endl;
+ #endif
+    }
+    catch(epptransport::epp_TrException ex) {
+       cout << "Exception: " << ex.getString() << endl;
+    }
+    catch(...) {
+       cout << "Something else went wrong...\n";
+    }
+    
+    
+ } // contacttransfer_main