Changeset 32716 for main

Timestamp:

2018-12-19T14:14:46+13:00 (5 years ago)

Author:

kjdon

Message:

params are cached in a user's session per collection, or for eg cross collection search, by the service name. This lead to problems when doing cross collection search, the params eg query string, are cached under TextQuery, but when we view a document, we are getting the params form the colleciton cache. so teh query string is either not there or wrong, and search term highlighting either doesn't work or highlights the wrong things. now we can pass a cgi parameter, ck for 'cache key' - use that to get cached params instead of colleciton name. ccs searches need to pass that param to document links.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java (modified) (3 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java

@@ -549 +549 @@
         String document = getFirstParam(GSParams.DOCUMENT, queryMap);
         String service = getFirstParam(GSParams.SERVICE, queryMap);
+        String specified_cache_key = getFirstParam(GSParams.CACHE_KEY, queryMap);
 
         // We clean up the cache session_ids_table if system
@@ -604 +605 @@
 
         // cache_key is the collection name, or service name
-        String cache_key = collection;
+        String cache_key = specified_cache_key;
         if (cache_key == null || cache_key.equals(""))
+          {
+            cache_key = collection;
+          }
+        if (cache_key == null || cache_key.equals(""))
         {
             cache_key = service;
         }
-
+        
         // logger.info("should_cache= " + should_cache);
 
@@ -634 +639 @@
                 session_cache = session_ids_table.get(sid);
                 param_table = session_cache.getParamsTable();
-                logger.info("collections in table: " + tableToString(param_table));
                 if (param_table.containsKey(cache_key))
                 {