svn commit: r830720 - /ode/branches/APACHE_ODE_1.X/utils/src/main/java/org/apache/ode/utils/xsl/XslTransformHandler.java

[midon]

Author: midon
Date: Wed Oct 28 18:54:25 2009
New Revision: 830720

URL: http://svn.apache.org/viewvc?rev=830720&view=rev
Log:
xsl output: html should not be handled as xml but as text

Modified:
    
ode/branches/APACHE_ODE_1.X/utils/src/main/java/org/apache/ode/utils/xsl/XslTransformHandler.java

Modified: 
ode/branches/APACHE_ODE_1.X/utils/src/main/java/org/apache/ode/utils/xsl/XslTransformHandler.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/utils/src/main/java/org/apache/ode/utils/xsl/XslTransformHandler.java?rev=830720&r1=830719&r2=830720&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.X/utils/src/main/java/org/apache/ode/utils/xsl/XslTransformHandler.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.X/utils/src/main/java/org/apache/ode/utils/xsl/XslTransformHandler.java
 Wed Oct 28 18:54:25 2009
@@ -38,6 +38,9 @@
 import javax.xml.transform.stream.StreamSource;
 
 import org.apache.commons.collections.map.MultiKeyMap;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ode.utils.DOMUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
@@ -52,6 +55,8 @@
  */
 public class XslTransformHandler {
 
+    private static final Log __log = 
LogFactory.getLog(XslTransformHandler.class);
+
   private static XslTransformHandler __singleton;
 
   private TransformerFactory _transformerFactory = null;
@@ -138,19 +143,23 @@
         }
       }
       String method = tf.getOutputProperties().getProperty("method");
-      if (method == null || method.equals("xml") || method.equals("html")) {
+      if (method == null || "xml".equals(method)) {
          DOMResult result = new DOMResult();
          tf.transform(source, result);
          Node node = result.getNode();
          if(node.getNodeType() == Node.DOCUMENT_NODE)
                  node = ((Document)node).getDocumentElement();
+          if(__log.isDebugEnabled()) __log.debug("Returned node: 
type="+node.getNodeType()+", "+ DOMUtils.domToString(node));
          return node;
       } else {
+          // text and html outputs are handled the same way
           StringWriter writerResult = new StringWriter();
           StreamResult result = new StreamResult(writerResult);
          tf.transform(source, result);
           writerResult.flush();
-          return writerResult.toString();
+          String output = writerResult.toString();
+          if(__log.isDebugEnabled()) __log.debug("Returned string: "+output);
+          return output;
       }
     } catch (TransformerConfigurationException e) {
       throw new XslTransformException(e);