Changeset 25445 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java

Timestamp:

2012-04-19T22:09:50+12:00 (12 years ago)

Author:

ak19

Message:

Error reporting is now improved again, much better than in previous commit: no longer just writes out the XSLT stylesheet to the log file, but follows Dr Bainbridge and Sam's suggestion of performing the transformation that failed again with physical files instead of in-memory as before. This points out the exact line location of errors.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java (modified) (2 diffs)

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

@@ -593 +593 @@
         Document skinAndLibraryXsl = null;
         Document skinAndLibraryDoc = converter.newDOM();
-        try
+        
+        // Applying the preprocessing XSLT - in its own block {} to allow use of non-unique variable names
         {
 
@@ -615 +616 @@
             //In other words, apply the preProcess.xsl to 'skinAndLibraryXsl' in order to
             //expand all GS-Lib statements into complete XSL statements and also to create
-            //a valid  xsl style sheet document.
-
-            Transformer preProcessor = transformerFactory.newTransformer(new DOMSource(preprocessingXsl));
-            preProcessor.setErrorListener(new XMLTransformer.TransformErrorListener(preprocessingXsl));
-            DOMResult result = new DOMResult();
-            result.setNode(skinAndLibraryDoc);
-            preProcessor.transform(new DOMSource(skinAndLibraryXsl), result);
-            //System.out.println("GS-Lib statements are now expanded") ;        
-
-        }
-        catch (TransformerException e)
-        {
-            e.printStackTrace();
-            System.out.println("TransformerException while preprocessing the skin xslt");
-            return XMLTransformer.constructErrorXHTMLPage(e.getMessage());
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-            System.out.println("Error while preprocessing the skin xslt");
-            return XMLTransformer.constructErrorXHTMLPage(e.getMessage());
-        }
+            //a valid xsl style sheet document.
+
+            XMLTransformer preProcessor = new XMLTransformer();
+            // Perform the transformation, by passing in:
+            // preprocess-stylesheet, source-xsl (skinAndLibraryXsl), and the node that should 
+            // be in the result (skinAndLibraryDoc)
+            preProcessor.transform_withResultNode(preprocessingXsl, skinAndLibraryXsl, skinAndLibraryDoc);
+            //System.out.println("GS-Lib statements are now expanded") ;
+        }
+    
 
         //The following code is to be uncommented if we need to append the extracted GSF statements