Changeset 21403 for main/trunk/greenstone2/common-src/src/jdbmedit/Jdb2Txt.java

Timestamp:

2010-01-04T17:40:03+13:00 (14 years ago)

Author:

davidb

Message:

Code was working for Ascii characters, but not for Unicode values > 128. More careful prescription of utf-8 used in code

File:

• main/trunk/greenstone2/common-src/src/jdbmedit/Jdb2Txt.java (modified) (3 diffs)

main/trunk/greenstone2/common-src/src/jdbmedit/Jdb2Txt.java

@@ -30 +30 @@
 
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
 import java.util.Properties;
 
@@ -40 +43 @@
     HTree          hashtable_;
 
+    static private PrintWriter utf8out = null;
+
+    static
+    {
+        try {
+            OutputStreamWriter osw = new OutputStreamWriter(System.out, "UTF-8");
+            utf8out = new PrintWriter(osw, true);
+        }
+        catch (UnsupportedEncodingException e) {
+            System.out.println(e);
+        }
+    }
 
     public Jdb2Txt(String db_filename)
     throws IOException
     {
+    if (db_filename.endsWith(".jdb")) {
+        // remove file extension as JDBM does not expect it
+        db_filename = db_filename.substring(0,db_filename.length()-4);
+    }
+
         // create or open a record manager
         Properties props = new Properties();
@@ -71 +91 @@
         while (key != null) {
             val = (String) hashtable_.get(key);
-            System.out.println("[" + key + "]");
-            System.out.println(val);
+            utf8out.println("[" + key + "]");
+            utf8out.println(val);
         // 70 hypens
-        System.out.println("----------------------------------------------------------------------");
+        utf8out.println("----------------------------------------------------------------------");
             key = (String) iter.next();
         }