Changeset 16756

Timestamp:

2008-08-13T14:24:59+12:00 (16 years ago)

Author:

ak19

Message:

Since greenstone3 core ModuleInterface.process() now takes a Node and RETURNS a Node, have copied the XMLConverter.nodeToElement() into here to convert the Node back into the Element version of the response.

File:

• greenstone3/trunk/resources/java/SOAPServer.java.in (modified) (3 diffs)

greenstone3/trunk/resources/java/SOAPServer.java.in

@@ -25 +25 @@
 import org.greenstone.gsdl3.util.GSXML;
 import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.Document;
 import java.io.File;
 
@@ -74 +76 @@
         }
         Element new_req = GSXML.duplicateWithNewName(req.getOwnerDocument(), req, tag_name, true);
-        Element r = mr.process(new_req);
+        Element r = nodeToElement(mr.process(new_req));
         // add the namespace back on
         //Element new_res = r;
@@ -83 +85 @@
     }
     return result;
-    }   
+    }
+
+    protected Element nodeToElement(Node node)
+    {
+    short nodeType = node.getNodeType();
+
+    if (nodeType == Node.DOCUMENT_NODE) {
+        Document docNode = (Document)node;
+        return docNode.getDocumentElement() ;
+    }
+    else if (nodeType == Node.ELEMENT_NODE) {
+        return (Element)node;
+    }
+    else {
+        System.err.println("Expecting Document or Element node type but got " + node.getNodeName());
+        System.err.println("Returning null");
+        return null;
+    }
+    }
 }