[Epp-rtk-cpp-commits] CVS: epp-rtk/c++/src/data epp_eppXMLbase.cc,1.8.2.1,1.8.2.2

[Daniel M. <tub...@us...>]

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

Modified Files:
      Tag: epp-0402
	epp_eppXMLbase.cc 
Log Message:
committing unspec parse and rendering fixes and improvements 
from GNR


Index: epp_eppXMLbase.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_eppXMLbase.cc,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -C2 -d -r1.8.2.1 -r1.8.2.2
*** epp_eppXMLbase.cc	23 Feb 2002 04:36:05 -0000	1.8.2.1
--- epp_eppXMLbase.cc	8 May 2002 16:29:24 -0000	1.8.2.2
***************
*** 72,78 ****
  	outputobject.putTag("unspec", "");
       }
     else
       {
! 	dom_ptr unspecDoc = createDOMDocument("<unspec>" + unspecXML + "</unspec>");
  	DomPrint dp(outputobject);
  	dp.putDOMTree(unspecDoc);
--- 72,101 ----
  	outputobject.putTag("unspec", "");
       }
+    else if(unspecXML.find("<") == string::npos)
+      {
+ 	outputobject.putTag("unspec", unspecXML);
+      }
     else
       {
! 	dom_ptr unspecDoc = createDOMDocument("<parseme xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"><unspec>"
! 					      + unspecXML + "</unspec></parseme>");
! 	
! 	if(!unspecDoc->isNull()) {
! 	   unspecDoc = dom_ptr(unspecDoc->getFirstChildElement());
! 	   
! 	   if(unspecDoc->getNodeName() == "parseme") {
! 	      unspecDoc = dom_ptr(unspecDoc->getFirstChildElement());
! 	      
! 	   }
! 	   else {
! 	      return;
! 	      
! 	   }
! 	   
! 	}
! 	else {
! 	   return;
! 	}
! 	
  	DomPrint dp(outputobject);
  	dp.putDOMTree(unspecDoc);
***************
*** 266,277 ****
  	if(nodeName == "unspec")
  	  {
! 	     dom_ptr unspecNode = dom_ptr(resChildNode->getFirstChildElement());
  	     EPP_output outObject;
  	     DomPrint dp(outObject);
! 	     
  	     while(!unspecNode->isNull())
  	       {
  		  dp.putDOMTree(unspecNode);
! 		  unspecNode = dom_ptr(unspecNode->getNextSiblingElement());
  	       }
  	     
--- 289,300 ----
  	if(nodeName == "unspec")
  	  {
! 	     dom_ptr unspecNode = dom_ptr(resChildNode->getFirstChild());
  	     EPP_output outObject;
  	     DomPrint dp(outObject);
! 	    
  	     while(!unspecNode->isNull())
  	       {
  		  dp.putDOMTree(unspecNode);
! 		  unspecNode = dom_ptr(unspecNode->getNextSibling());
  	       }