Changeset 16988 for gli/trunk

Timestamp:

2008-08-25T12:32:17+12:00 (16 years ago)

Author:

kjdon

Message:

added xmlNodeToStringWithoutIndenting for use with format statements for gs3, so don't get more and more spaces added in each time its saved

File:

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

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

@@ -624 +624 @@
             f.setLineWidth (0); // Why isn't this working!
             f.setPreserveSpace (false);
-            
-            f.setNonEscapingElements (nonEscapingTagNames);
+            if (nonEscapingTagNames != null) {
+          f.setNonEscapingElements (nonEscapingTagNames);
+        }
             // Create the necessary writer stream for serialization.
             OutputStreamWriter osw = new OutputStreamWriter (os, "UTF-8");
@@ -644 +645 @@
     /** Write an XML document to a given file */
     static public void writeXMLFile (File xml_file, Document document) {
-        try {
-            OutputStream os = new FileOutputStream (xml_file);
-            // Create an output format for our document.
-            OutputFormat f = new OutputFormat (document);
-            f.setEncoding ("UTF-8");
-            f.setIndenting (true);
-            f.setLineWidth (0); // Why isn't this working!
-            f.setPreserveSpace (false);
-            // Create the necessary writer stream for serialization.
-            OutputStreamWriter osw = new OutputStreamWriter (os, "UTF-8");
-            Writer w               = new BufferedWriter (osw);
-            // Generate a new serializer from the above.
-            XMLSerializer s        = new XMLSerializer (w, f);
-            s.asDOMSerializer ();
-            // Finally serialize the document to file.
-            s.serialize (document);
-            // And close.
-            os.close ();
-        }
-        catch (Exception exception) {
-            DebugStream.printStackTrace (exception);
-        }
-    }
-    
+      writeXMLFile(xml_file, document, null);
+    }
+
     public static void printXMLNode (Node e) {
         printXMLNode (e, 0) ;
@@ -770 +750 @@
         
     }
+
+  public static String xmlNodeToStringWithoutIndenting (Node e) {
+    StringBuffer sb = new StringBuffer ("");
+    xmlNodeToStringWithoutNewline(sb, e, -1);
+    return sb.toString();
+  }
     public static String xmlNodeToStringWithoutNewline (Node e){
         StringBuffer sb = new StringBuffer ("");
@@ -780 +766 @@
         for (int i=0 ; i<depth ; i++)
             sb.append (' ') ;
-        
+      
         if (e.getNodeType () == Node.TEXT_NODE){
             if (e.getNodeValue () != "") {
@@ -811 +797 @@
             int len = children.getLength ();
             for (int i = 0; i < len; i++) {
+          if (depth >= 0) {
                 xmlNodeToStringWithoutNewline (sb,children.item (i), depth + 1);
+          } else {
+        xmlNodeToStringWithoutNewline (sb,children.item (i), depth);
+          }
             }