Changeset 16810

Timestamp:

2008-08-15 13:50:46 (3 months 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. Therefore getHrefOID() here does not need to do any corresponding URL encoding of the key for the database lookup either.

Files:

• greenstone3/trunk/src/java/org/greenstone/gsdl3/service/AbstractGS2DocumentRetrieve.java (modified) (1 diff)

greenstone3/trunk/src/java/org/greenstone/gsdl3/service/AbstractGS2DocumentRetrieve.java

@@ -496 +496 @@
-
-    protected String getHrefOID(String href_url){
-        // URL encode the href_url since that's how the href key is stored in the database
-        try {
-            // URLEncoder encodes spaces as + instead of %20, but the key will be %20
-            href_url = java.net.URLEncoder.encode(href_url, "UTF8");
-            href_url = href_url.replace("+", "%20");
-        }catch(Exception e) {
-            logger.warn("Tried to encode href_url into URL but failed with: " + e.getMessage());
-        }
-        
-        return this.coll_db.docnum2OID(href_url);
-    }