Changeset 21403 for main/trunk/greenstone2/common-src/src/jdbmedit/JdbmAPI.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/JdbmAPI.java (modified) (5 diffs)

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

@@ -27 +27 @@
 import java.io.InputStreamReader;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
 
 import java.util.Properties;
@@ -45 +48 @@
     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 JdbmAPI(String db_filename,boolean must_exist)
     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();
@@ -197 +218 @@
         JdbmAPI jdbm_api = new JdbmAPI(dbname);
 
-        InputStreamReader isr=new InputStreamReader(System.in);
+        InputStreamReader isr=new InputStreamReader(System.in,"UTF-8");
         BufferedReader brin = new BufferedReader(isr);
 
@@ -208 +229 @@
 
             int keys_len = keys.size();
-            System.out.println(keys_len);
+            utf8out.println(keys_len);
 
             for (int i=0; i<keys_len; i++) {
             String key = (String) keys.get(i);
-            System.out.println(key);
+            utf8out.println(key);
             }
         }
@@ -221 +242 @@
             if (cmd.equals("Get")) {
                 String val = jdbm_api.get(key);
-                System.out.println(val.length());
-                System.out.println(val);
+                utf8out.println(val.length());
+                utf8out.println(val);
             }
             else {