Changeset 30477 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/XMLConverter.java

Timestamp:

2016-04-20T22:50:52+12:00 (8 years ago)

Author:

davidb

Message:

Changes in the Java code to support the new approach taken to client-side XSLT (using Saxon-CE JS library in the browser -- see next commit). Also some better error reporting when processing XSLT files

File:

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

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

@@ -94 +94 @@
         {
             logger.error(e.getMessage());
+            logger.error("Input string was:\n" + in);
+            e.printStackTrace();
         }
         return null;
@@ -113 +115 @@
         {
             logger.error(e.getMessage());
+            logger.error("Input string was:\n" + in);
+            e.printStackTrace();
         }
         return null;
@@ -131 +135 @@
         {
             logger.error(e.getMessage(), e);
+            logger.error("File was:\n" + in.getPath());
+            e.printStackTrace();
 
         }
@@ -156 +162 @@
       {
     logger.error(e.getMessage());
+    logger.error("File was:\n" + in.getPath());
+    e.printStackTrace();
       }
     return null;
@@ -170 +178 @@
       {
     logger.error(e.getMessage());
+    logger.error("File was:\n" + in.getPath());
+    e.printStackTrace();
       }
     return null;
@@ -199 +209 @@
       
       logger.error(e.getMessage());
+      logger.error("InputSource:\n");
+      e.printStackTrace();
     }
     return null;
@@ -337 +349 @@
                 xmlRepresentation.append(attribute.getNodeName());
                 xmlRepresentation.append("=\"");
-                xmlRepresentation.append(attribute.getNodeValue());
+                String attr_val = attribute.getNodeValue();
+                
+                attr_val = attr_val.replaceAll("&","&");
+                attr_val = attr_val.replaceAll("<","&lt;");
+                attr_val = attr_val.replaceAll(">","&gt;");
+                attr_val = attr_val.replaceAll("\"","&quot;");
+                // assume that any of the above chars that was already entity escaped
+                // was already correct => return back to how they were
+                attr_val = attr_val.replaceAll("&amp;amp;","&amp;");
+                attr_val = attr_val.replaceAll("&amp;lt;","&lt;");
+                attr_val = attr_val.replaceAll("&amp;gt;","&gt;");
+                attr_val = attr_val.replaceAll("&amp;quot;","&quot;");
+                
+                
+                xmlRepresentation.append(attr_val);
                 xmlRepresentation.append("\"");
             }