Changeset 16783 for greenstone3/trunk/resources/java/SOAPServer.java.in

Timestamp:

2008-08-14T12:06:30+12:00 (16 years ago)

Author:

ak19

Message:

Since XMLConverter method nodeToElement() has now been made static, need not create an instance of it (complete with DOMParser and all) merely to call this method.

File:

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

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

@@ -24 +24 @@
 import org.greenstone.gsdl3.util.GSFile;
 import org.greenstone.gsdl3.util.GSXML;
+import org.greenstone.gsdl3.util.XMLConverter;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
-import org.w3c.dom.Document;
 import java.io.File;
 
@@ -76 +76 @@
         }
         Element new_req = GSXML.duplicateWithNewName(req.getOwnerDocument(), req, tag_name, true);
-        Element r = nodeToElement(mr.process(new_req));
+        Node n = mr.process(new_req);
+        Element r = XMLConverter.nodeToElement(n);
         // add the namespace back on
         //Element new_res = r;
@@ -86 +87 @@
     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;
-    }
-    }
 }