Changeset 16688 for greenstone3/trunk/src/java/org/greenstone/gsdl3/comms

Timestamp:

2008-08-08T13:23:59+12:00 (16 years ago)

Author:

davidb

Message:

Changed 'Element process(Element)' in ModuleInterface to 'Node process(Node)'. After some deliberation is was decided this is a more useful (generic) layer of the DOM to pass information around in. Helps with the DocType problem when producing XSL Transformed pages, for example. When this was an Element, it would loose track of its DocType. Supporting method provided in XMLConverter 'Element nodeToElement(Node)' which checks a nodes docType and casts to Element if appropriate, or if a Document, typecasts to that and then extracts the top-level Element. With this fundamental change in ModuleInterface, around 20 files needed to be updated (Actions, Services, etc) that build on top of 'process()' to reflect this change, and use nodeToElement where necessary.

Location:

greenstone3/trunk/src/java/org/greenstone/gsdl3/comms

Files:

• Communicator.java (modified) (1 diff)
• SOAPCommunicator.java (modified) (3 diffs)

greenstone3/trunk/src/java/org/greenstone/gsdl3/comms/Communicator.java

@@ -61 +61 @@
 
     public String process(String xml_in) {
-    Element e = converter_.getDOM(xml_in).getDocumentElement();
-    Node result = process(e);
+    Node n = converter_.getDOM(xml_in);
+    Node result = process(n);
     return converter_.getString(result);    
     }
 
-    abstract public Element process(Element xml_in);
+    abstract public Node process(Node xml_in_node);
 }

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

@@ -56 +56 @@
     private Call call_ = null;
 
-  /** The no-args constructor */
-    public SOAPCommunicator() {
-    
+    protected XMLConverter converter_ = null;
+
+    /** The no-args constructor */
+    public SOAPCommunicator() { 
+    converter_ = new XMLConverter();
     }
         
@@ -94 +96 @@
     }
 
-    public Element process(Element message) {
+    public Node process(Node message_node) {
     
+    Element message = converter_.nodeToElement(message_node);
+
     NodeList requests = message.getElementsByTagName(GSXML.REQUEST_ELEM);
     if (requests.getLength()==0) {
@@ -159 +163 @@
     message = "<message><request type=\"describe\" to=\"\" lang=\"en\"/></message>";
     Element request_elem = converter.getDOM(message).getDocumentElement();
-    Element response = comm.process(request_elem);
+    Node response = comm.process(request_elem);
     
     logger.error("response was "+converter.getPrettyString(response));