Changeset 16809 for greenstone3

Timestamp:

2008-08-15T13:49:47+12:00 (16 years ago)

Author:

ak19

Message:

GDBMWrapper converts the key string to UTF8 now before doing the lookup. The href_url key is no longer URLencoded by HTMLPlugin, which means it is in UTF8.

File:

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

greenstone3/trunk/src/java/org/greenstone/gsdl3/util/GDBMWrapper.java

@@ -6 +6 @@
 
 import org.apache.log4j.Logger;
+
+import java.io.UnsupportedEncodingException;
 
 /** java wrapper class for gdbm - uses Java-GDBM written by Martin Pool
@@ -72 +74 @@
     String s_info;
     try {
-      s_info = (String)db_.fetch(key);
+    try {
+        // The key is UTF8: do db lookup using the UTF8 version of key
+        s_info = (String)db_.fetch(key.getBytes("UTF-8"));
+    } catch(UnsupportedEncodingException e) {
+        logger.warn("utf8 key for " + key 
+             + " unrecognised. Retrying with default encoding.");
+        // retry db lookup using default encoding of key instead of UTF8
+        s_info = (String)db_.fetch(key);
+    }
     } catch (GdbmException e) {
       logger.error("couldn't get record");
@@ -102 +112 @@
   }
 
-    /** returns a string of key-value entries that 
-     *  can be printed for debugging purposes. */
+    /** returns a string of key-value entries that
+     *  can be printed for debugging purposes. */
     public String displayAllEntries() {
     StringBuffer output = new StringBuffer();
@@ -118 +128 @@
         output.append("\n");
         //logger.warn("key: " + key + "\tvalue: " + value);
+
+        String urlkey = java.net.URLEncoder.encode((String)key, "UTF8");
+        output.append("URL encoded key: " + urlkey);
+        //logger.warn("URL encoded key: " + urlkey);
         }
+    } catch(UnsupportedEncodingException e) {
+        logger.warn("Trouble converting key " + key + " to UTF-8.");
     } catch(Exception e) {
         logger.warn("Exception encountered when trying to displayAllEntries():" + e);