Changeset 25604 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/XMLTransformer.java

Timestamp:

2012-05-16T09:35:37+12:00 (12 years ago)

Author:

sjm84

Message:

Recommiting Anu's changes without the print statements

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/XMLTransformer.java (modified) (18 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/XMLTransformer.java

@@ -130 +130 @@
         try
         {
-            TransformErrorListener transformerErrorListener = (TransformErrorListener)this.t_factory.getErrorListener();
-            transformerErrorListener.setStylesheet(stylesheet);         
+            TransformErrorListener transformerErrorListener = (TransformErrorListener) this.t_factory.getErrorListener();
+            transformerErrorListener.setStylesheet(stylesheet);
             // Use the TransformerFactory to process the stylesheet Source and generate a Transformer.
             Transformer transformer = this.t_factory.newTransformer(new StreamSource(stylesheet));
@@ -165 +165 @@
         try
         {
-            TransformErrorListener transformerErrorListener = (TransformErrorListener)this.t_factory.getErrorListener();
+            TransformErrorListener transformerErrorListener = (TransformErrorListener) this.t_factory.getErrorListener();
             transformerErrorListener.setStylesheet(stylesheet);
             // Use the TransformerFactory to process the stylesheet Source and generate a Transformer.
@@ -223 +223 @@
     public Node transform(Document stylesheet, Document source, HashMap parameters, Document docDocType)
     {
-        System.err.println("1");
         return transform(stylesheet, source, parameters, docDocType, null);
     }
@@ -231 +230 @@
         try
         {
-            System.err.println("1.1");
             // Use the TransformerFactory to process the stylesheet Source and generate a Transformer.
-            TransformErrorListener transformerErrorListener = (TransformErrorListener)this.t_factory.getErrorListener();
+            TransformErrorListener transformerErrorListener = (TransformErrorListener) this.t_factory.getErrorListener();
             transformerErrorListener.setStylesheet(stylesheet);
-            Transformer transformer = this.t_factory.newTransformer(new DOMSource(stylesheet));         
-
-            System.err.println("1.2");
+            Transformer transformer = this.t_factory.newTransformer(new DOMSource(stylesheet));
+
             //logger.info("XMLTransformer transformer is " + transformer); //done in ErrorListener
             if (parameters != null)
@@ -249 +246 @@
                 }
             }
-            System.err.println("1.3");
+
             // When we transform the DOMResult, we need to make sure the result of
             // the transformation has a DocType. For that to happen, we need to create
@@ -261 +258 @@
             }
             DOMSource domSource = new DOMSource(source);
-            System.err.println("2");
             transformer.setErrorListener(new TransformErrorListener(stylesheet, domSource));
-            System.err.println("4");
             transformer.transform(domSource, result);
-            System.err.println("5");
             return result.getNode(); // pass the entire document
         }
@@ -292 +286 @@
         try
         {
-            TransformErrorListener transformerErrorListener = (TransformErrorListener)this.t_factory.getErrorListener();
+            TransformErrorListener transformerErrorListener = (TransformErrorListener) this.t_factory.getErrorListener();
             transformerErrorListener.setStylesheet(stylesheet);
             Transformer transformer = this.t_factory.newTransformer(new StreamSource(stylesheet));
@@ -403 +397 @@
         protected Source source = null; // can be DOMSource or StreamSource
         protected boolean debugAsFile = true; // true if xslt or source are not real physical files
-        
+
         // *********** METHODS TO BE CALLED WHEN SETTING AN ERROR LISTENER ON TRANSFORMERFACTORY OBJECTS
         // The default constructor is only for when setting an ErrorListener on TransformerFactory objects
-        public TransformErrorListener() {
+        public TransformErrorListener()
+        {
             this.stylesheet = null;
             this.source = null;
             XMLTransformer.debugFileCount++;
         }
-        
-        public void setStylesheet(Document xslt) 
+
+        public void setStylesheet(Document xslt)
         {
             this.debugAsFile = true;
@@ -418 +413 @@
             this.source = null;
         }
-        
-        public void setStylesheet(String xslt) 
+
+        public void setStylesheet(String xslt)
         {
             this.debugAsFile = true;
@@ -425 +420 @@
             this.source = null;
         }
-        
-        public void setStylesheet(File xslt) 
+
+        public void setStylesheet(File xslt)
         {
             this.debugAsFile = false; // if this constructor is called, we're dealing with physical files for both xslt and source          
@@ -458 +453 @@
 
         // *********** METHODS CALLED AUTOMATICALLY ON ERROR
-        
+
         //  Receive notification of a recoverable error.
         public void error(TransformerException exception)
@@ -532 +527 @@
                 // since !debugAsFile, we are dealing with physical files, 
                 // variable stylesheet would have stored the filename instead of contents
-                this.errorMessage = this.errorMessage + "\nstylesheet filename: " + stylesheet;             
-                
+                this.errorMessage = this.errorMessage + "\nstylesheet filename: " + stylesheet;
+
                 this.errorMessage += "\nException CAUSE:\n" + exception.getCause();
                 System.err.println("\n****Error transforming xml:\n" + this.errorMessage + "\n****\n");
@@ -544 +539 @@
             }
         }
-        
+
         // This method will redo the transformation that went wrong with *real* files: 
         // it writes out the stylesheet and source XML to files first, then performs the transformation
@@ -557 +552 @@
             File styleFile = new File(webLogsTmpFolder + File.separator + "stylesheet" + XMLTransformer.debugFileCount + ".xml");
             File sourceFile = new File(webLogsTmpFolder + File.separator + "source" + XMLTransformer.debugFileCount + ".xml");
-                
 
             try
@@ -572 +566 @@
             }
 
-            if(this.source != null) { // ErrorListener was set on a Transformer object
+            if (this.source != null)
+            { // ErrorListener was set on a Transformer object
                 try
                 {
@@ -606 +601 @@
             System.err.println("*****************************************");
             System.err.println("Look for stylesheet in: " + styleFile.getAbsolutePath());
-            if(this.source != null) { // ErrorListener was set on a Transformer object
+            if (this.source != null)
+            { // ErrorListener was set on a Transformer object
                 System.err.println("Look for source XML in: " + sourceFile.getAbsolutePath());
-            }   
+            }
 
             // now perform the transform again, which will assign another TransformErrorListener
             // but since debuggingAsFile is turned off, we won't recurse into this section of
             // handling the error again
-            if(this.source != null) { // ErrorListener was set on a Transformer object
+            if (this.source != null)
+            { // ErrorListener was set on a Transformer object
                 XMLTransformer.this.transform(styleFile, sourceFile); // calls the File, File version, so debugAsFile will be false
-            } 
-            
-            else { // ErrorListener was set on a TransformerFactory object
-                
+            }
+
+            else
+            { // ErrorListener was set on a TransformerFactory object
+
                 // The recursive step in this case is to perform the instantiation 
                 // of the Transformer object again.
@@ -627 +625 @@
                 // Therefore, the debugAsFile state for the single TransformerFactory's 
                 // TransformerHandler changes each time also.
-                
-                try {
+
+                try
+                {
                     debugAsFile = false;
-                    this.stylesheet = styleFile.getAbsolutePath();                  
+                    this.stylesheet = styleFile.getAbsolutePath();
                     //TransformErrorListener transformerErrorListener = (TransformErrorListener)XMLTransformer.this.t_factory.getErrorListener();
                     //transformerErrorListener.setStylesheet(styleFile);
                     Transformer transformer = XMLTransformer.this.t_factory.newTransformer(new StreamSource(styleFile));
-                    if(transformer == null) {
+                    if (transformer == null)
+                    {
                         String msg = "XMLTransformer transformer is " + transformer;
                         logger.info(msg);
                         System.out.println(msg + "\n****\n");
                     }
-                } catch (TransformerConfigurationException e)
+                }
+                catch (TransformerConfigurationException e)
                 {
-                    String message = "Couldn't create transformer object: " + e.getMessageAndLocation();                    
+                    String message = "Couldn't create transformer object: " + e.getMessageAndLocation();
                     logger.error(message);
                     logger.error(e.getLocationAsString());
@@ -648 +649 @@
                 catch (TransformerException e)
                 {
-                    String message = "Couldn't transform the source: " + e.getMessageAndLocation(); 
+                    String message = "Couldn't transform the source: " + e.getMessageAndLocation();
                     logger.error(message);
                     System.out.println(message);
                 }
-            } 
+            }
 
         }