Changeset 4087

Timestamp:

2003-04-03T12:33:29+12:00 (21 years ago)

Author:

kjdon

Message:

added a new getDOM(File, String) that specifies an encoding to read the file with

File:

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

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

@@ -30 +30 @@
 // other java classes
 import java.io.Reader;
+import java.io.InputStreamReader;
 import java.io.StringReader;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileReader;
 
@@ -71 +73 @@
         Document doc = parser_.getDocument();
         return doc;
-
+        
     } catch (Exception e) {
         System.err.println("XMLConverter.getDOM(String): exception "+e.getMessage());
@@ -82 +84 @@
     try {
         
-        Reader reader = new FileReader(in);
+        FileReader reader = new FileReader(in);
         InputSource xml_source = new InputSource(reader);
-        
+            
         parser_.parse(xml_source);
         Document doc = parser_.getDocument();
@@ -95 +97 @@
     return null;
     }
+
+    /** returns a DOM document */
+    public Document getDOM(File in, String encoding) {
+    try {
+        
+        InputStreamReader isr = new InputStreamReader(new FileInputStream(in), encoding);
+        InputSource xml_source = new InputSource(isr);
+        
+        parser_.parse(xml_source);
+        Document doc = parser_.getDocument();
+        
+        return doc;
+
+    } catch (Exception e) {
+        System.err.println("XMLConverter.getDOM(File): exception "+e.getMessage());
+    }
+    return null;
+    }
+    
 
     /** creates a new empty DOM Document */