[Epp-rtk-cpp-commits] CVS: epp-rtk/c++/src/data epp_dcpStatement.h,1.3,1.4 epp_eppXMLbase.cc,1.13,1.14 epp_eppdata.h,1.8,1.9

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

Update of /cvsroot/epp-rtk/epp-rtk/c++/src/data
In directory usw-pr-cvs1:/tmp/cvs-serv1723/data

Modified Files:
	epp_dcpStatement.h epp_eppXMLbase.cc epp_eppdata.h 
Log Message:
There can only be one retention element in the statement element, and this
has changed in the the IDL-files.


Index: epp_dcpStatement.h
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_dcpStatement.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** epp_dcpStatement.h	14 Mar 2002 16:45:17 -0000	1.3
--- epp_dcpStatement.h	19 Mar 2002 10:47:43 -0000	1.4
***************
*** 45,50 ****
        epp_dcpPurpose_seq_ref m_purposes; /**< Data collection purpose */
        epp_dcpRecipient_seq_ref m_recipients; /**< Data recipient */
!       epp_dcpRetention_seq_ref m_retentions; /**< Data retention */
!       
        
        /// Null constructor
--- 45,49 ----
        epp_dcpPurpose_seq_ref m_purposes; /**< Data collection purpose */
        epp_dcpRecipient_seq_ref m_recipients; /**< Data recipient */
!       epp_dcpRetentionType_ref m_retention; /**< Data retention */
        
        /// Null constructor
***************
*** 57,65 ****
        epp_dcpStatement(epp_dcpPurpose_seq_ref _m_purposes,
  		       epp_dcpRecipient_seq_ref _m_recipients,
! 		       epp_dcpRetention_seq_ref _m_retentions)
  	{
  	   m_purposes = _m_purposes;
  	   m_recipients = _m_recipients;
! 	   m_retentions = _m_retentions;
  	};
     };
--- 56,64 ----
        epp_dcpStatement(epp_dcpPurpose_seq_ref _m_purposes,
  		       epp_dcpRecipient_seq_ref _m_recipients,
! 		       epp_dcpRetentionType_ref _m_retention)
  	{
  	   m_purposes = _m_purposes;
  	   m_recipients = _m_recipients;
! 	   m_retention = _m_retention;
  	};
     };

Index: epp_eppXMLbase.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_eppXMLbase.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** epp_eppXMLbase.cc	8 Mar 2002 11:41:27 -0000	1.13
--- epp_eppXMLbase.cc	19 Mar 2002 10:47:43 -0000	1.14
***************
*** 672,693 ****
  	    
  	    else if(statementName == "retention") {
! 	       if(dcpS.m_retentions == NULL) {
! 		  dcpS.m_retentions.ref(new epp_dcpRetention_seq);
! 	       }
! 	       
  	       dom_ptr retentionNode = dom_ptr(statementNode->getFirstChildElement());
  	       
! 	       while(!retentionNode->isNull()) {
  		  string retention = retentionNode->getNodeName();
  		  
! 		  if(retention == "business") dcpS.m_retentions->push_back(BUSINESS);
! 		  else if(retention =="functional") dcpS.m_retentions->push_back(FUNCTIONAL);
! 		  else if(retention =="indefinite") dcpS.m_retentions->push_back(INDEFINITE);
! 		  else if(retention =="legal") dcpS.m_retentions->push_back(LEGAL);
! 		  else if(retention =="none") dcpS.m_retentions->push_back(NONE);
  		  else throw epp_XMLException(__FILE__, __LINE__, "Unknown retention-type in greeting");
  		  
! 		  retentionNode = dom_ptr(retentionNode->getNextSiblingElement());
! 	       } // while "retentionNode"
  	    } // if "retention"
  	    
--- 672,690 ----
  	    
  	    else if(statementName == "retention") {
! 
  	       dom_ptr retentionNode = dom_ptr(statementNode->getFirstChildElement());
  	       
! 	       if(!retentionNode->isNull()) {
! 		  
  		  string retention = retentionNode->getNodeName();
  		  
! 		  if(retention == "business") dcpS.m_retention.ref(new epp_dcpRetentionType(BUSINESS));
! 		  else if(retention == "functional") dcpS.m_retention.ref(new epp_dcpRetentionType(FUNCTIONAL));
! 		  else if(retention == "indefinite") dcpS.m_retention.ref(new epp_dcpRetentionType(INDEFINITE));
! 		  else if(retention == "legal") dcpS.m_retention.ref(new epp_dcpRetentionType(LEGAL));
! 		  else if(retention == "none") dcpS.m_retention.ref(new epp_dcpRetentionType(NONE));
  		  else throw epp_XMLException(__FILE__, __LINE__, "Unknown retention-type in greeting");
  		  
! 	       } // if "retentionNode"
  	    } // if "retention"
  	    

Index: epp_eppdata.h
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_eppdata.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** epp_eppdata.h	14 Mar 2002 16:45:17 -0000	1.8
--- epp_eppdata.h	19 Mar 2002 10:47:43 -0000	1.9
***************
*** 179,189 ****
     /// Typedef for the ref to the #epp_dcpRecipient_seq element
     typedef refcnt_ptr<epp_dcpRecipient_seq> epp_dcpRecipient_seq_ref;
! 
!    /// Typedef for a sequence of #epp_dcpRetentionType elements
!    typedef vector<epp_dcpRetentionType> epp_dcpRetention_seq;
! 
!    /// Typedef for the ref to the #epp_dcpRetention_seq element
!    typedef refcnt_ptr<epp_dcpRetention_seq> epp_dcpRetention_seq_ref;
! 
     
     /******************************************
--- 179,183 ----
     /// Typedef for the ref to the #epp_dcpRecipient_seq element
     typedef refcnt_ptr<epp_dcpRecipient_seq> epp_dcpRecipient_seq_ref;
!    
     
     /******************************************