Changeset 16374

Timestamp:

2008-07-14 12:10:15 (3 months 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.

Files:

• greenstone3/trunk/src/java/org/greenstone/gsdl3/LibraryServlet.java (modified) (2 diffs)
• greenstone3/trunk/src/java/org/greenstone/gsdl3/core/Receptionist.java (modified) (3 diffs)
• greenstone3/trunk/src/java/org/greenstone/gsdl3/core/Skin.java (modified) (5 diffs)
• greenstone3/trunk/src/java/org/greenstone/gsdl3/core/SkinnedReceptionist.java (modified) (5 diffs)
• greenstone3/trunk/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java (modified) (4 diffs)
• greenstone3/trunk/src/java/org/greenstone/gsdl3/util/XMLConverter.java (modified) (2 diffs)

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

@@ -7 +7 @@
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
+import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import java.io.*;
@@ -497 +498 @@
-    //GSXML.printXMLNode(xml_message);
-    
-Element xml_result = this.recept.process
-
+Node xml_result = this.recept.processToPage
+// 
-    out.println (this.converter.getPrettyString (xml_result));
-    

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 */
-
+ToPage
-
-        Element message = this.converter.getDOM(xml_in).getDocumentElement();
-Element page = process
+Node page = processToPage
-        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 */
-Element process
+Node processToPage
-
-        // 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
-
-
-
+
+
+
+
+
+
-//    logger.info("receptionist returned response");
-//    logger.info(this.converter.getString(resulting_page));
@@ -285 +314 @@
-    }
-
-Element
+Node
-        return page;
-    }

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

@@ -175 +175 @@
-        
-        
-Element
+Node
-                
-                Element p = page.getPage() ;
@@ -209 +209 @@
-                } catch (Exception e) {
-                        System.out.println("error loading preprocessing xslt") ;
-       
+
-                        return constructErrorPage(e) ;
-                }
@@ -259 +259 @@
-                //return sourceXml.getDocumentElement() ;
-                
-
+
+
+
-                //transform source doc
-                try {
-                
-
+
+
-                        TransformerFactory tf = TransformerFactory.newInstance();
-                        Transformer trans = tf.newTransformer();
-                        StringWriter sw = new StringWriter();
-                        trans.transform(new DOMSource(processedXsl), new StreamResult(sw));
-
-
-
-
-
-
+
+
+
+
-                        TransformerFactory tf2 = TransformerFactory.newInstance();
-                        Transformer trans2 = tf2.newTransformer();
-                        StringWriter sw2 = new StringWriter();
-                        trans2.transform(new DOMSource(sourceXml), new StreamResult(sw2));
-
-
-
-
-
+
+
+
-                        Transformer transformer = transformerFactory.newTransformer(new DOMSource(processedXsl));
-
-
-
-
+
+
+
-                        
-                        //transformer.transform(new DOMSource(sourceXml), result2);
-                        StringWriter result2 = new StringWriter();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-                        
-                } catch (TransformerException e) {
@@ -326 +305 @@
-                }
-                        
-.getDocumentElement() 
+Parsed
-        }
-        
@@ -438 +417 @@
-        }
-        
-        private void writefile(String filename, String contents){
-        
-        File testFile = new File(filename);
-                
-
-    //use buffering
-    
-        
-    try {
-        Writer output = new BufferedWriter(new FileWriter(testFile));
-      //FileWriter always assumes default encoding is OK!
-      output.write( contents );
-           output.close();
-    }
-        
-        catch (Exception e) {
-        e.printStackTrace();
-        }
-        
-        
-   
-  }
-
-}       

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 @@
-        }
-        
-Element
+Node
-                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")) {
-
-
-
-
-
+
-                                } 
+                                else {
+                                    np = p;
+                                }
-                        } catch (Exception e) {
-                                e.printStackTrace() ;
@@ -90 +91 @@
-                        
-                        
-
+n
-                } catch (Exception e) {
-                        e.printStackTrace() ;
@@ -340 +341 @@
-        }
-        
-Element
+Node
-                return super.transformPage(page) ;
-        }

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

@@ -116 +116 @@
-
-
-Element
+Node
-        
-        // might need to add some data to the page
-        addExtraInfo(page);
-        // transform the page using xslt
-Element
+Node
-        
-        return transformed_page;
@@ -132 +132 @@
-     * we need to get any format element out of the page and add it to the xslt
-     * before transforming */
-Element
+Node
-
-        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);
-    
+       
-            
-    
+       
-                GSXSLT.mergeStylesheets(style_doc, new_format);
-            } else {
@@ -196 +196 @@
-        }
-        
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        Document doc = this.converter.newDOM();
-        doc.appendChild(doc.importNode(page, true));

greenstone3/trunk/src/java/org/greenstone/gsdl3/util/XMLConverter.java

@@ -21 +21 @@
-// XML classes
-import org.w3c.dom.Document; 
+import org.w3c.dom.DocumentType; 
-import org.w3c.dom.Node; 
-import org.w3c.dom.NodeList;
@@ -173 +174 @@
-
-        if (nodeType == Node.DOCUMENT_NODE) {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            return;
-        }