Changeset 28283 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSXML.java

Timestamp:

2013-09-13T17:02:24+12:00 (11 years ago)

Author:

sjm84

Message:

Trying a new method for printing XML

File:

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

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

@@ -92 +92 @@
     public static final String INDEX_STEM_ELEM = "indexStem";
     public static final String INDEX_OPTION_ELEM = "indexOption";
-  public static final String PARAM_DEFAULT_ELEM = "paramDefault";
+    public static final String PARAM_DEFAULT_ELEM = "paramDefault";
     public static final String BROWSE_ELEM = "browse";
     public static final String DISPLAY_ELEM = "display";
@@ -1341 +1341 @@
             }
         }
-        NodeList children = e.getChildNodes();
-
+
+        if (e.hasChildNodes())
+        {
+            boolean hasElements = false;
+            boolean indentSwapped = false;
+
+            Node child = e.getFirstChild();
+            do
+            {
+                if (child.getNodeType() == Node.ELEMENT_NODE)
+                {
+                    hasElements = true;
+                }
+                if (child.getNodeType() == Node.TEXT_NODE && indent)
+                {
+                    if (child.getNodeValue() != null && child.getNodeValue().trim().length() > 0)
+                    {
+                        indentSwapped = true;
+                        indent = false;
+                    }
+                }
+            } while ((child = child.getNextSibling()) != null);
+
+            sb.append(">");
+            if (hasElements && indent)
+            {
+                sb.append("\n");
+            }
+
+            child = e.getFirstChild();
+            do
+            {
+                xmlNodeToString(sb, child, indent, indentString, depth + 1);
+            } while ((child = child.getNextSibling()) != null);
+
+            if (indent)
+            {
+                for (int i = 0; i < depth; i++)
+                {
+                    sb.append(indentString);
+                }
+            }
+
+            sb.append("</" + e.getNodeName() + ">");
+
+            if ((hasElements && indent) || indentSwapped)
+            {
+                sb.append("\n");
+            }
+        }
+        else
+        {
+            sb.append("/>");
+
+            if (indent)
+            {
+                sb.append("\n");
+            }
+        }
+
+        /*
         boolean hasElements = false;
         boolean indentSwapped = false;
@@ -1399 +1458 @@
             }
         }
+        */
     }