Changeset 3462 for trunk/gsdl3

Timestamp:

2002-10-14T16:01:36+13:00 (22 years ago)

Author:

kjdon

Message:

prepend site name to from field in response

File:

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

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

@@ -73 +73 @@
 
     // put this into Communicator??
-    public String process(String in) {
+    public Node process(Node xml_in) {
     // needs to catch SOAPException, MalformedURLException
     try {
         // add the message encloser back on, and edit the to field
-        Document doc = converter_.getDOM(in);
         Document newdoc = converter_.newDOM();
         Element top = newdoc.createElement("message");
-        top.appendChild(newdoc.importNode(doc.getDocumentElement(), true));
+        top.appendChild(newdoc.importNode(xml_in, true));
         //newdoc.appendChild(top);
         NodeList requests = top.getElementsByTagName("request");
         if (requests.getLength()==0) {
         // no requests
-        return "";
+        return null;
         }
         for (int i=0;i<requests.getLength(); i++) {
@@ -117 +116 @@
         Parameter result = resp.getReturnValue ();
         String res = (String) result.getValue();
-        return res;
+
+        // 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++) {
+            Element e = (Element)responses.item(i);
+            String from = e.getAttribute("from");
+            from = GSPath.prependLink(from, connection_name_);
+            e.setAttribute("from", from);
+        }
+
+        return result_node;
         }
         else {
@@ -127 +137 @@
         System.err.println("Fault Code:  "+faultCode);
         System.err.println("Fault String:  "+faultString);
-        return new String ("<message>Fault Occurred.  No greeting for you!</message>");
+        return converter_.getDOM("<message>Fault Occurred.  No greeting for you!</message>").getDocumentElement();
         }
     } catch (SOAPException e) {
         System.out.println("SOAP error:"+e.getMessage());
-        return "";
+        return null;
     } catch (MalformedURLException e) {
         System.out.println("URL error:"+e.getMessage());
-        return "";
+        return null;
     }
     }
     
-    public Node process(Node xml_in) {
-    String request = converter_.getString(xml_in);
-    String result = process(request);
-    return converter_.getDOM(result).getDocumentElement();
-    
+    public String process(String xml_in) {
+    Node n = converter_.getDOM(xml_in).getDocumentElement();
+    Node result = process(n);
+    if (result == null) {
+        return "";
+    }
+    return converter_.getString(result);    
     }
 }