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

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

@@ -116 +116 @@
 
 
-    protected Element postProcessPage(Element page) {
+    protected Node postProcessPage(Element page) {
     
     // might need to add some data to the page
     addExtraInfo(page);
     // transform the page using xslt
-    Element transformed_page = transformPage(page);
+    Node transformed_page = transformPage(page);
     
     return transformed_page;
@@ -132 +132 @@
      * we need to get any format element out of the page and add it to the xslt
      * before transforming */
-    protected Element transformPage(Element page) {
+    protected Node transformPage(Element page) {
 
     logger.debug("page before transfomring:");
@@ -184 +184 @@
         format_doc.appendChild(format_doc.importNode(format_elem, true));
         Element new_format = (Element)this.transformer.transform(stylesheet_doc, format_doc);
-        logger.debug("new format elem="+this.converter.getPrettyString(new_format));
+        logger.debug("new format elem="+this.converter.getPrettyString(new_format));
         
-        // add it in to the main stylesheet
+        // add it in to the main stylesheet
         GSXSLT.mergeStylesheets(style_doc, new_format);
         } else {
@@ -196 +196 @@
     }
     
-    // there is a thing called a URIResolver which you can set for a transformer or transformer factory. may be able to use this instead of this absoluteIncludepaths hack
-    GSXSLT.absoluteIncludePaths(style_doc, GlobalProperties.getGSDL3Home(), (String)this.config_params.get(GSConstants.SITE_NAME), collection, (String)this.config_params.get(GSConstants.INTERFACE_NAME), base_interfaces);
-    // put the page into a document - this is necessary for xslt to get the paths right if you have paths relative to the document root eg /page.
+    // there is a thing called a URIResolver which you can set for a
+    // transformer or transformer factory. may be able to use this
+    // instead of this absoluteIncludepaths hack
+
+    GSXSLT.absoluteIncludePaths(style_doc, GlobalProperties.getGSDL3Home(), 
+                    (String)this.config_params.get(GSConstants.SITE_NAME), 
+                    collection, (String)this.config_params.get(GSConstants.INTERFACE_NAME), 
+                    base_interfaces);
+
+    // put the page into a document - this is necessary for xslt to get
+    // the paths right if you have paths relative to the document root
+    // eg /page.
+
     Document doc = this.converter.newDOM();
     doc.appendChild(doc.importNode(page, true));