Changeset 3504

Timestamp:

2002-10-29T15:44:09+13:00 (22 years ago)

Author:

kjdon

Message:

the SOAP communication now uses literal XML rather than Strings - much nicer as dont have to escape all the angle brackets etc.

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/comms/SOAPCommunicator.java (modified) (3 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/comms/SOAPCommunicator.java

@@ -56 +56 @@
     call_ = new Call();
     // Set Encoding Style to standard SOAP encoding
-    call_.setEncodingStyleURI(Constants.NS_URI_SOAP_ENC);
+    //call_.setEncodingStyleURI(Constants.NS_URI_SOAP_ENC);
+    // set Encoding Style to use literal XML
+    call_.setEncodingStyleURI(Constants.NS_URI_LITERAL_XML);
     }
     
@@ -95 +97 @@
         e.setAttribute("from", from);
         }
+        
+        // Set Method Parameters
 
-        String converted_request = converter_.getString(top);
-        System.out.println("converted request = "+converted_request);
-        //  Set Method Parameters
-        Parameter param = new Parameter("xml_in", String.class,
-                        converted_request, Constants.NS_URI_SOAP_ENC);
+        // dont use Strings anymore
+        //String converted_request = converter_.getString(top);
+        //System.out.println("converted request = "+converted_request);
+        //  
+        //Parameter param = new Parameter("xml_in", String.class,
+        //converted_request, Constants.NS_URI_SOAP_ENC);
+
+        
+        // use  straight xml
+        Parameter param = new Parameter("xml_in", 
+                        org.w3c.dom.Element.class,
+                        top, 
+                        Constants.NS_URI_LITERAL_XML);
+                        
         Vector param_list = new Vector ();
         param_list.addElement (param);
@@ -115 +128 @@
         // Extract Return value
         Parameter result = resp.getReturnValue ();
-        String res = (String) result.getValue();
+        //String res = (String) result.getValue();
+        //Element result_node = converter_.getDOM(res).getDocumentElement();
+        Element result_node = (Element) result.getValue();
 
         // have to modify the from field
-        Element result_node = converter_.getDOM(res).getDocumentElement();
+
         NodeList responses = result_node.getElementsByTagName("response");
         for (int i=0;i<responses.getLength(); i++) {