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

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

@@ -175 +175 @@
     
     
-    public Element transformPage(Page page) throws Exception{
+    public Node transformPage(Page page) throws Exception{
         
         Element p = page.getPage() ;
@@ -209 +209 @@
         } catch (Exception e) {
             System.out.println("error loading preprocessing xslt") ;
-            e.printStackTrace() ;
+        e.printStackTrace() ;
             return constructErrorPage(e) ;
         }
@@ -259 +259 @@
         //return sourceXml.getDocumentElement() ;
         
-        Document finalPage = receptionist.converter.newDOM();
+        // Document finalPage = receptionist.converter.newDOM(); // ****
+        Document finalPageParsed = null;
+
         //transform source doc
         try {
         
-        //Tranform XSL DOM to String    
+            /*
+            //Tranform XSL DOM to String    
             TransformerFactory tf = TransformerFactory.newInstance();
             Transformer trans = tf.newTransformer();
             StringWriter sw = new StringWriter();
             trans.transform(new DOMSource(processedXsl), new StreamResult(sw));
-            String theXSLAnswer = sw.toString();
-            
-            //writefile("c:\\mr49\\stylesheet.xsl", theXSLAnswer);
-            
-            
-        //Tranform XML DOM to String    
+            // String theXSLAnswer = sw.toString(); // ****
+            
+            
+            //Tranform XML DOM to String    
             TransformerFactory tf2 = TransformerFactory.newInstance();
             Transformer trans2 = tf2.newTransformer();
             StringWriter sw2 = new StringWriter();
             trans2.transform(new DOMSource(sourceXml), new StreamResult(sw2));
-            String theXMLAnswer = sw2.toString();
-            
-            //writefile("c:\\mr49\\xml.xml", theXMLAnswer);
-
-            
+            //String theXMLAnswer = sw2.toString();
+            */
+
             Transformer transformer = transformerFactory.newTransformer(new DOMSource(processedXsl));
-            //Transformer transformer = transformerFactory.newTransformer(new StreamSource("c:\\mr49\\stylesheet.xsl"));
-            transformer.setOutputProperty(OutputKeys.DOCTYPE_SYSTEM, "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd");
-            DOMResult result = new DOMResult();
-            result.setNode(finalPage);
+            // transformer.setOutputProperty(OutputKeys.DOCTYPE_SYSTEM, "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd");
+            //DOMResult result = new DOMResult();
+            //result.setNode(finalPage);
             
             //transformer.transform(new DOMSource(sourceXml), result2);
             StringWriter result2 = new StringWriter();
-            transformer.transform(new DOMSource(sourceXml), result);
-            
-            //transformer.transform(new DOMSource(sourceXml), new StreamResult(result2));
-            //writefile("c:\\mr49\\result.html", result2.toString());
-            //System.err.println("outputting result:");
-            //System.err.println(this.converter.getPrettyString(finalPage));
-            /*
-            //Testing stuff
-            
-                TransformerFactory tFactory = TransformerFactory.newInstance();
-                Transformer with identity transformation
-                Transformer transformer2 =  tFactory.newTransformer(new DOMSource(processedXsl));
-            
-                String xml="<root><a><b><c>aaa</c></b></a></root>";
-                StringWriter result2 = new StringWriter();
-            //Transfrom xml (in String) to formatted xml (in String)                        
-                transformer2.transform(new StreamSource(new StringReader(theXMLAnswer)), new StreamResult(result2));
-            //Output result            
-                writefile("c:\\mr49\\testHTML.txt", result2.toString());
-        */
-            
-            
-            
+            transformer.transform(new DOMSource(sourceXml), new StreamResult(result2));
+
+            XMLConverter converter = new XMLConverter();
+            finalPageParsed = converter.getDOM(result2.toString());                     
             
         } catch (TransformerException e) {
@@ -326 +305 @@
         }
             
-        return finalPage.getDocumentElement() ;
+        return finalPageParsed;
     }
     
@@ -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();
-    }
-    
-    
-   
-  }
 
 }