Changeset 16374 for greenstone3/trunk/src/java/org/greenstone/gsdl3/core/SkinnedReceptionist.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/SkinnedReceptionist.java (modified) (5 diffs)

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

@@ -7 +7 @@
 import org.w3c.dom.Document; 
 import org.w3c.dom.Element; 
+import org.w3c.dom.Node; 
 
 import org.greenstone.gsdl3.util.*;
@@ -24 +25 @@
     }
     
-    protected Element postProcessPage(Element p) {
+    protected Node postProcessPage(Element p) {
         try {
             //Avoid the duplicate attribute in the namespaces declaration of the generated html file
@@ -76 +77 @@
             
             
+            Node np = null;
             try {
                 if (skin != null && !output.equals("xml")) {
-                    //System.out.println("Skin exists") ;
-                    p = skin.transformPage(page);
-                    //System.out.println("done skinning") ;
-                    
-                    //System.out.println("SkinnedPage = " + this.converter.getPrettyString(p)) ;
+                    np = skin.transformPage(page);
                 } 
+                else {
+                    np = p;
+                }
             } catch (Exception e) {
                 e.printStackTrace() ;
@@ -90 +91 @@
             
             
-            return p ;
+            return np ;
         } catch (Exception e) {
             e.printStackTrace() ;
@@ -340 +341 @@
     }
     
-    protected Element transformPage(Element page) {
+    protected Node transformPage(Element page) {
         return super.transformPage(page) ;
     }