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

Timestamp:

2012-06-13T21:00:45+12:00 (12 years ago)

Author:

ak19

Message:

Modified the indentXML() method to clear empty text nodes (containing any type of spaces) before prefixing the custom start and end text nodes containing newlines and tabs. This fixes the bug where the ServiceRackList in the collectionConfig.xml was peculiarly affected and would end up with an increasing number of new lines around its subelements each time GLI was quit.

File:

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

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

@@ -814 +814 @@
         while (child != null)
         {
+            // first clear all empty text nodes (those containing space characters like \n,\r,\t and such)
+            if(child.getNodeType() == Node.TEXT_NODE && child.getNodeValue().matches("^\\s*$")) 
+            {
+                Node spaceTextNode = child;
+                child = child.getNextSibling();
+                elem.removeChild(spaceTextNode);
+                
+                if(child == null) break;
+            }
+
+            // now process normal element nodes as intended
             if (child.getNodeType() == Node.ELEMENT_NODE)
             {
@@ -830 +841 @@
         while (child != null)
         {
+            // Again, need to first clear all empty text nodes (those containing space characters like \n,\r,\t and such)
+            // because the first while loop above would break out when it found an element node and wouldn't have got rid
+            // of all the empty text nodes yet.
+            // This time, beware not to delete the special end and start empty textnodes just added, since 
+            // they've been created and inserted specifically.
+            if(child != endTextNode && child != startTextNode 
+               && child.getNodeType() == Node.TEXT_NODE && child.getNodeValue().matches("^\\s*$"))
+            {
+                Node spaceTextNode = child;
+                child = child.getNextSibling();
+                elem.removeChild(spaceTextNode);
+
+                if(child == null) break;
+            }
+
+            // go back to processing normal element nodes as intended
             if (child.getNodeType() == Node.ELEMENT_NODE)
             {