Changeset 25710 for main/trunk/gli

Timestamp:

2012-05-29T15:42:36+12:00 (12 years ago)

Author:

sjm84

Message:

Whitespace will not be removed from the front of a text node if there is not a newline before the first text character

File:

• main/trunk/gli/src/org/greenstone/gatherer/util/XMLTools.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/util/XMLTools.java

@@ -955 +955 @@
             {
                 String text = e.getNodeValue();
-                text = text.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll("^[\\n\\r\\t\\s]*", "").replaceAll("[\\n\\r\\t\\s]*$", "");
+                text = text.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll("[\\n\\r\\t\\s]*$", "");
+                for (Character c : text.toCharArray())
+                {
+                    if (c.equals('\n'))
+                    {
+                        text = text.replaceAll("^[\\n\\r\\t\\s]*", "");
+                        break;
+                    }
+
+                    if (!Character.isWhitespace(c))
+                    {
+                        break;
+                    }
+                }
                 sb.append(text);
             }