Changeset 3970

Timestamp:

2003-03-25T09:44:12+12:00 (21 years ago)

Author:

kjdon

Message:

now have getString() - for plain output, and getPrettyString() for nocely indented output - only use the pretty one for printing - when its read back in it introduces extra text nodes

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/util/XMLConverter.java (modified) (3 diffs)

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

@@ -106 +106 @@
     {
     outputEscaping = true;
-    return getString(xmlNode, 0);
-    }
-
-
-    private String getString(Node xmlNode, int depth)
+    return getString(xmlNode, 0, false);
+    }
+
+    /** returns the node as a nicely formatted String - this introduces extra
+     * text nodes if the String is read back in as a DOM, so should only be 
+     * used for printing */
+    public String getPrettyString(Node xmlNode) {
+    
+    outputEscaping = true;
+    return getString(xmlNode, 0, true);
+    }
+
+    private String getString(Node xmlNode, int depth, boolean pretty)
     {
     String xmlRepresentation = "";
@@ -122 +130 @@
     // Handle Element nodes
     if (nodeType == Node.ELEMENT_NODE) {
-        xmlRepresentation += "\n";
-        for (int i = 0; i < depth; i++)
-        xmlRepresentation += "  ";
+        if (pretty) {
+        xmlRepresentation += "\n";
+        for (int i = 0; i < depth; i++) {
+            xmlRepresentation += "  ";
+        }
+        }
 
         // Write opening tag
         xmlRepresentation += "<" + nodeName;
-
+        
         // Write the node attributes
         NamedNodeMap nodeAttributes = xmlNode.getAttributes();
@@ -148 +159 @@
         return xmlRepresentation;
         }
-
+        
         // Close the opening tag
         xmlRepresentation += ">";
-
+        
         // Apply recursively to the children of this node
         NodeList children = xmlNode.getChildNodes();
         for (int i = 0; i < children.getLength(); i++) {
-        xmlRepresentation += getString(children.item(i), depth + 1);
-        }
-
+        xmlRepresentation += getString(children.item(i), depth + 1, pretty);
+        }
+        
         // Write closing tag
-        if (xmlRepresentation.endsWith("\n")) {
-        for (int i = 0; i < depth; i++)
-            xmlRepresentation += "  ";
-        }
-        xmlRepresentation += "</" + nodeName + ">\n";
-    }
-
+        if (pretty) {
+        if (xmlRepresentation.endsWith("\n")) {
+            for (int i = 0; i < depth; i++)
+            xmlRepresentation += "  ";
+        }
+        }
+        xmlRepresentation += "</" + nodeName + ">";
+        if (pretty) {
+        xmlRepresentation += "\n";
+        }
+    }
+    
     // Handle Text nodes
     else if (nodeType == Node.TEXT_NODE) {