Changeset 16688 for greenstone3/trunk/src/java/org/greenstone/gsdl3/core/Receptionist.java

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.

File:

• greenstone3/trunk/src/java/org/greenstone/gsdl3/core/Receptionist.java (modified) (3 diffs)

greenstone3/trunk/src/java/org/greenstone/gsdl3/core/Receptionist.java

@@ -130 +130 @@
     }
 
+
+
     public String process(String xml_in) {
 
-    Element message = this.converter.getDOM(xml_in).getDocumentElement();
-    Node page = process(message);
-    return this.converter.getString(page);
-    }
-
-    public Element process(Element message) {
-    Node node = processToPage(message);
-
-    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("Receptionist.process was not returned a document node");
-        return null;
-    }
-    }
-
-
-
-
-    /** process using strings - just calls process using Elements */
-    public String processToPage(String xml_in) {
-
-    Element message = this.converter.getDOM(xml_in).getDocumentElement();
-    Node page = processToPage(message);
+    Node message_node = this.converter.getDOM(xml_in);
+    Node page = process(message_node);
     return this.converter.getString(page);
     }
@@ -170 +143 @@
      * if something goes wrong, it returns null - 
      * TODO:  return a suitable message to the user */
-    public Node processToPage(Element message) {
+    public Node process(Node message_node) {
+
+    Element message = this.converter.nodeToElement(message_node);
 
     // get the request out of the message - assume that there is only one
@@ -225 +200 @@
     //logger.info(a+" mesa=" + this.converter.getPrettyString(message));
     // get the page data from the action
-    Element action_response = a.process(message);
+    Node action_response = a.process(message);
 
     boolean response_only=false;