Changeset 24007 for main/branches/64_bit_Greenstone/greenstone3/src/java/org/greenstone/gsdl3/util/XMLConverter.java

Timestamp:

2011-05-09T14:37:04+12:00 (13 years ago)

Author:

sjm84

Message:

Updating this branch to match the latest Greenstone3 changes

Location:

main/branches/64_bit_Greenstone/greenstone3

Files:

• . (modified) (1 prop)
• src/java/org/greenstone/gsdl3/util/XMLConverter.java (modified) (5 diffs)

main/branches/64_bit_Greenstone/greenstone3/src/java/org/greenstone/gsdl3/util/XMLConverter.java

@@ -41 +41 @@
 import java.io.FileInputStream;
 import java.io.FileReader;
+import java.util.regex.*;
 
 import org.apache.log4j.*;
+
+// Apache Commons
+import org.apache.commons.lang3.*;
+
+import java.util.*;
+import java.lang.reflect.*;
 
 /** XMLConverter - utility class for greenstone
@@ -59 +66 @@
 
     private static boolean outputEscaping = true;
-
 
      /** the no-args constructor */
@@ -216 +222 @@
     }
 
+    /* For the purposes of logger.debug statements, where this is called and hence outputted,
+    returns an empty string if debugging is not enabled */
+    public static String getPrettyStringLogger(Node xmlNode, Logger log) {
+
+    if(log.isDebugEnabled())
+        return getPrettyString(xmlNode);
+    
+    return "";
+
+    }
+
     private static void getString(Node xmlNode, StringBuffer xmlRepresentation, 
                  int depth, boolean pretty)
@@ -242 +259 @@
         String sid  = dt.getSystemId();
         
-        String doctype_str = "<!DOCTYPE " + dt.getName() + " PUBLIC \"" + pid + "\" \"" + sid + "\">\n";
+        // Use previously assigned name, not dt.getName() again
+        String doctype_str = "<!DOCTYPE " + name + " PUBLIC \"" + pid + "\" \"" + sid + "\">\n";
         
         xmlRepresentation.append(doctype_str);
@@ -321 +339 @@
 
         // Perform output escaping, if required
+        // Apache Commons replace method is far superior to String.replaceAll - very fast!
         if (outputEscaping) {
-        text = text.replaceAll("&", "&amp;");  // Must be done first!!
-        text = text.replaceAll("<", "&lt;");
-        text = text.replaceAll(">", "&gt;");
-        text = text.replaceAll("\"", "&quot;");
-        text = text.replaceAll("\'", "&apos;");
+
+        text = StringUtils.replace(text, "&", "&amp;");
+        text = StringUtils.replace(text, "<", "&lt;");
+        text = StringUtils.replace(text, ">", "&gt;");
+        text = StringUtils.replace(text, "'", "&apos;");
+        text = StringUtils.replace(text, "\"", "&quot;");
         }
 
         // Remove any control-C characters
-        text = text.replaceAll("" + (char) 3, "");
+        text = StringUtils.replace(text, "" + (char)3, "");
+
         xmlRepresentation.append(text);
     }