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

Timestamp:

2008-07-14T12:10:15+12:00 (16 years ago)

Author:

davidb

Message:

Change to Skin code (returning Node note Element) so XSLT encodes its DocType -- important information for IE to render resultant HTML correctly. This also required Skin.java to be changed from using DomResult to StreamResult. The former is known to have a problem with loosing its DocType info, and as it's then read-only, has no elegant way to put back this info.

File:

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

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

@@ -129 +129 @@
     return true;
     }
+
+    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 {
+        return null;
+    }
+    }
+
+
+
+
     /** process using strings - just calls process using Elements */
-    public String process(String xml_in) {
+    public String processToPage(String xml_in) {
 
     Element message = this.converter.getDOM(xml_in).getDocumentElement();
-    Element page = process(message);
+    Node page = processToPage(message);
     return this.converter.getString(page);
     }
+
 
     /** process - produce a page of data in response to a request 
      * if something goes wrong, it returns null - 
      * TODO:  return a suitable message to the user */
-    public Element process(Element message) {
+    public Node processToPage(Element message) {
 
     // get the request out of the message - assume that there is only one
@@ -221 +247 @@
     //logger.info(" raw page="+this.converter.getString(page));
     // transform the result in some way
-    Element resulting_page = postProcessPage(page);
-    logger.debug("receptionist returned response");
-    logger.debug(this.converter.getString(resulting_page));
+    //Element resulting_page = postProcessPage(page);
+
+    Node resulting_page = postProcessPage(page);
+
+    logger.debug("receptionist returned response");
+    logger.debug(this.converter.getString(resulting_page));
 //    logger.info("receptionist returned response");
 //    logger.info(this.converter.getString(resulting_page));
@@ -285 +314 @@
     }
 
-    protected Element postProcessPage(Element page) {
+    protected Node postProcessPage(Element page) {
     return page;
     }