You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ed...@apache.org on 2006/05/09 13:41:22 UTC

svn commit: r405394 - in /incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom: sdo_axiom.cpp sdo_axiom.h

Author: edslattery
Date: Tue May  9 04:41:19 2006
New Revision: 405394

URL: http://svn.apache.org/viewcvs?rev=405394&view=rev
Log:
new toSdo override

Modified:
    incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom/sdo_axiom.cpp
    incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom/sdo_axiom.h

Modified: incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom/sdo_axiom.cpp
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom/sdo_axiom.cpp?rev=405394&r1=405393&r2=405394&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom/sdo_axiom.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom/sdo_axiom.cpp Tue May  9 04:41:19 2006
@@ -145,6 +145,22 @@
                 return 0;
             }
 
+            axis2_om_node_t* root_node = 
+                AXIS2_OM_DOCUMENT_GET_ROOT_ELEMENT(document, &the_env);
+
+            return toSdo(root_node,factory);
+        }
+ 
+        DataObjectPtr AxiomHelper::toSdo(axis2_om_node* root_node,
+                                DataFactoryPtr factory)
+        {
+        
+            if (!the_env)
+            {
+                cout << "No Axis Environment" << endl;
+                return 0;
+            }
+
             XMLHelperPtr helper = HelperProvider::getXMLHelper(factory);
 
             axis2_xml_writer_t* writer = axis2_xml_writer_create_for_memory(
@@ -152,9 +168,7 @@
     
             axis2_om_output_t* output = axis2_om_output_create(&the_env, writer);
     
-            axis2_om_node_t* root_node = 
-                AXIS2_OM_DOCUMENT_GET_ROOT_ELEMENT(document, &the_env);
- 
+
             if (!root_node)
             {
                 cout << "No Root Element in the document" << endl;
@@ -172,10 +186,11 @@
             {
                 return theXMLDocument->getRootDataObject();
             }
+            cout << "The XML document returned from load was zero" << endl;
             return 0;
         }
  
-       void AxiomHelper::output(axis2_om_document_t* document)
+        void AxiomHelper::output(axis2_om_document_t* document)
         {
         
             if (!the_env)

Modified: incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom/sdo_axiom.h
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom/sdo_axiom.h?rev=405394&r1=405393&r2=405394&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom/sdo_axiom.h (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/sdo_axiom/sdo_axiom.h Tue May  9 04:41:19 2006
@@ -55,6 +55,7 @@
             SDO_AXIOM_API axis2_om_document_t*  toAxiom(DataObjectPtr dob);
 
             SDO_AXIOM_API DataObjectPtr  toSdo(axis2_om_document_t* doc,DataFactoryPtr factory);
+            SDO_AXIOM_API DataObjectPtr  toSdo(axis2_om_node* root_node,DataFactoryPtr factory);
 
             SDO_AXIOM_API void output(axis2_om_document_t* document);