Changeset 16515

Timestamp:

2008-07-23T12:19:52+12:00 (16 years ago)

Author:

davidb

Message:

encodeURL altered to take Node rather than Element.

Location:

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

Files:

• LibraryServlet.java (modified) (2 diffs)
• core/Receptionist.java (modified) (1 diff)

greenstone3/trunk/src/java/org/greenstone/gsdl3/LibraryServlet.java

@@ -499 +499 @@
     
     Node xml_result = this.recept.processToPage (xml_message);
-    // encodeURLs (xml_result, response);
+    encodeURLs (xml_result, response);
     out.println (this.converter.getPrettyString (xml_result));
     
@@ -536 +536 @@
    * also escapes things if needed
    */
-  protected void encodeURLs(Element data, HttpServletResponse response) {
-    
-    if (data == null) {
+  protected void encodeURLs(Node dataNode, HttpServletResponse response) {
+    
+    if (dataNode == null) {
       return;
     }
+
+    Element data =null;
+
+    short nodeType = dataNode.getNodeType();
+    if (nodeType == Node.DOCUMENT_NODE) {
+    Document docNode = (Document)dataNode;
+    data = docNode.getDocumentElement() ;
+    }
+    else {
+    data = (Element)dataNode;
+    }
+
     // get all the <a> elements
     NodeList hrefs = data.getElementsByTagName("a");

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

@@ -147 +147 @@
     }
     else {
+        System.err.println("Receptionist.process was not returned a document node");
         return null;
     }