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

Timestamp:

2014-04-24T21:34:33+12:00 (10 years ago)

Author:

ak19

Message:

First commit for GLI part of GS2 to GS3 Format Conversion. Contains all the changes needed for the FormatConversionDialog to work, and some cosmetic changes to cdm.Format4gs3Manager.java. Still need to implement undo and redo and think about what needs to happen and how for Remote GS3.

File:

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

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

@@ -22 +22 @@
 
 // JAXP
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.FactoryConfigurationError;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
+
 
 /** This class is a static class containing useful XML functions */
@@ -331 +334 @@
     static final private String HEADER = "<?xml version='1.0' encoding='UTF-8'?><collectionConfig xmlns:gsf='http://www.greenstone.org/greenstone3/schema/ConfigFormat' xmlns:xsl='http://www.w3.org/1999/XSL/Transform'>";
     static final private String FOOTER = "</collectionConfig>";
+
+
+    public static Document getDOM(String xml_str) 
+    {   
+    Document doc = null;
+    try {
+        /*SAXParserFactory factory = SAXParserFactory.newInstance();
+        factory.setNamespaceAware(true);
+        //factory.setValidating (true);
+        SAXParser parser = factory.newSAXParser();
+        InputSource iSource = new InputSource(new StringReader(xml_str));
+        //              parser.parse (iSource, new DefaultHandler ());
+        
+        org.xml.sax.XMLReader reader = parser.getXMLReader();
+        reader.setContentHandler(new DefaultHandler());
+        reader.setErrorHandler(new DefaultHandler());
+        doc = reader.parse(iSource);
+        */
+
+        DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+        InputSource is = new InputSource();
+        is.setCharacterStream(new StringReader(xml_str));
+        doc = db.parse(is);
+
+    } catch (Exception e) {
+        e.printStackTrace();
+    }
+    return doc; 
+    }
 
     public static String parse(String xml_str)
@@ -991 +1023 @@
     public static void xmlNodeToString(StringBuffer sb, Node e, boolean indent, String indentString, int depth)
     {
-        if (e.getNodeType() == Node.TEXT_NODE)
+
+        if (e.getNodeType() == Node.CDATA_SECTION_NODE)
+        {
+            if (e.getNodeValue() != "")
+            {
+                String text = e.getNodeValue();             
+                sb.append("<![CDATA[");
+                sb.append(text);
+                sb.append("]]>");
+            }
+            return;
+        }
+
+        if (e.getNodeType() == Node.TEXT_NODE)
         {
             if (e.getNodeValue() != "")
@@ -1057 +1102 @@
                 hasElements = true;
             }
-            if (children.item(i).getNodeType() == Node.TEXT_NODE && indent)
+            if ((children.item(i).getNodeType() == Node.TEXT_NODE || children.item(i).getNodeType() == Node.CDATA_SECTION_NODE) && indent)
             {
                 if (children.item(i).getNodeValue().trim().length() > 0)