Changeset 25655 for main/trunk

Timestamp:

2012-05-23T16:53:17+12:00 (12 years ago)

Author:

sjm84

Message:

Added a version of getDOM that takes an encoding (not sure if this is even useful though)

File:

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

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

@@ -35 +35 @@
 
 // other java classes
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
 import java.io.Reader;
 import java.io.InputStreamReader;
@@ -165 +167 @@
 
     /** returns a DOM Document */
+    public Document getDOM(String in, String encoding)
+    {
+        try
+        {
+            InputStreamReader reader = new InputStreamReader(new ByteArrayInputStream(in.getBytes(encoding)), encoding);
+            InputSource xml_source = new InputSource(reader);
+
+            DOMParser parser = new DOMParser();
+            parser.setFeature("http://xml.org/sax/features/validation", false);
+            parser.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+            parser.setFeature("http://apache.org/xml/features/dom/defer-node-expansion", false);
+            if(resolver != null)
+            {
+                parser.setEntityResolver(this.resolver);
+            }
+            parser.setErrorHandler(new ParseErrorHandler());
+            parser.parse(xml_source);
+            
+            Document doc = parser.getDocument();
+
+            return doc;
+
+        }
+        catch (Exception e)
+        {
+            logger.error(e.getMessage());
+        }
+        return null;
+    }
+    
+    /** returns a DOM Document */
     public Document getDOM(File in)
     {