Changeset 16938 for greenstone3/trunk/src/java/org/greenstone/gsdl3/LibraryServlet.java

Timestamp:

2008-08-21T13:24:40+12:00 (16 years ago)

Author:

kjdon

Message:

modified session caching stuff so that if there is no collection name, use the service name instead as the key

File:

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

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

@@ -63 +63 @@
    */
   protected Hashtable session_ids_table = new Hashtable();
-  //this name is combined with the collection name and used for caching 
-  protected String valid_site_name = "";
-  
+ 
   /** the maximum interval that the cached info remains in session_ids_table (in seconds) 
    *  This is set in web.xml
@@ -114 +112 @@
       }
     }
-    valid_site_name = (site_name != null)? site_name : remote_site_name;
     
     if (this.default_lang == null) {
@@ -344 +341 @@
     String subaction = request.getParameter (GSParams.SUBACTION);
     String collection = request.getParameter(GSParams.COLLECTION);
-
-    //specifically we clean up the cache session_ids_table if the two reconfigure command
-    //are issued: a=s&sa=c and a=s&sa=c&c=coll_name, in which case there is no caching action to be taken
+    String service = request.getParameter(GSParams.SERVICE);
+
+    // We clean up the cache session_ids_table if system
+    // commands are issued (and also don't need to do caching for this request)
     boolean should_cache = true;
-    if(action != null && action.equals(GSParams.SYSTEM) 
-       && subaction != null && subaction.equals(GSParams.CONFIGURE)) {
-      if (collection == null || collection.equals("")) {
-    //user reconfiugred the whole site, clean up all cached info
-    //logger.info("clear cache for the whole site.");
+    if(action != null && action.equals(GSParams.SYSTEM)) {
+      should_cache = false;
+
+      // we may want to remove all collection cache info, or just a specific collection
+      boolean clean_all = true; 
+      String clean_collection = null;
+      // system commands are to activate/deactivate stuff
+      // collection param is in the sc parameter.
+      // don't like the fact that it is hard coded here
+      String coll = request.getParameter(GSParams.SYSTEM_CLUSTER);
+      if (coll != null && !coll.equals("")) {
+    clean_all = false;
+    clean_collection = coll;
+      } else {
+    // check other system types
+    if (subaction.equals("a") || subaction.equals("d")) {
+      String module_name = request.getParameter("sn");
+      if (module_name != null && !module_name.equals("")) {
+        clean_all = false;
+        clean_collection = module_name;
+      }
+    }
+      }
+      if (clean_all) {
     session_ids_table = new Hashtable(); 
     session.removeAttribute(GSXML.USER_SESSION_CACHE_ATT);
       } else {
-    //clean up all cache info related to the collection
-    //logger.info("clear cache for collection: " + collection);
+    // just clean up info for clean_collection
     ArrayList cache_list = new ArrayList(session_ids_table.values());
     for (int i=0; i<cache_list.size(); i++) {
       UserSessionCache cache = (UserSessionCache)cache_list.get(i);
-      cache.cleanupCache(collection);
+      cache.cleanupCache(clean_collection);
     }
-      }
-      should_cache = false;
+    
+      }
+
+    }
+    
+    // cache_key is the collection name, or service name
+    String cache_key = collection;
+    if (cache_key == null || cache_key.equals("")) {
+      cache_key = service;
     }
     
     //  logger.info("should_cache= " + should_cache);
+
     //clear the collection-specific cache in the session, since we have no way to know whether this session is 
     //about the same collection as the last session or not.
@@ -382 +406 @@
     // create a dumy collection name for Authentication 
     if (subaction != null && subaction.equals("authen")){
-      collection = "0000000000";
+      cache_key = "0000000000";
     }
     
@@ -389 +413 @@
     Hashtable table = null;
     String sid = session.getId();
-    if (should_cache == true && collection != null && !collection.equals("")) {
-      String key_str = valid_site_name + collection;
+    if (should_cache == true && cache_key != null && !cache_key.equals("")) {
       if (session_ids_table.containsKey(sid)) {
     session_cache = (UserSessionCache)session_ids_table.get(sid);
     param_table = session_cache.getParamsTable();
     logger.info("collections in table: " + tableToString(param_table));
-    if (param_table.containsKey(key_str)) {
+    if (param_table.containsKey(cache_key)) {
       //logger.info("existing table: " + collection);
-      table = (Hashtable)param_table.get(key_str);
+      table = (Hashtable)param_table.get(cache_key);
     } else {
       table = new Hashtable();
-      param_table.put(key_str, table);
+      param_table.put(cache_key, table);
       //logger.info("new table: " + collection);
     }
@@ -406 +429 @@
     param_table = new Hashtable();
     table = new Hashtable();
-    param_table.put(key_str, table);
+    param_table.put(cache_key, table);
     session_cache = new UserSessionCache(sid, param_table);
     session_ids_table.put(sid, session_cache);
@@ -417 +440 @@
       // should we do all the following stuff if using default page?
       // display the home page  - the default page
-      action = "p";
-      subaction = PageAction.HOME_PAGE;
-      
-      xml_request.setAttribute (GSXML.ACTION_ATT, action);
-      xml_request.setAttribute (GSXML.SUBACTION_ATT, subaction);
-      
-    } else {
-      
+      xml_request.setAttribute (GSXML.ACTION_ATT, "p");
+      xml_request.setAttribute (GSXML.SUBACTION_ATT, PageAction.HOME_PAGE);
+    }
+    else {
       xml_request.setAttribute (GSXML.ACTION_ATT, action);
       if (subaction != null) {
-        xml_request.setAttribute (GSXML.SUBACTION_ATT, subaction);
+    xml_request.setAttribute (GSXML.SUBACTION_ATT, subaction);
       }
       
@@ -438 +457 @@
       while(params.hasMoreElements ()) {
         String name = (String)params.nextElement ();
-        if (!name.equals (GSParams.ACTION) 
+    if (!name.equals (GSParams.ACTION) 
         && !name.equals (GSParams.SUBACTION) 
         && !name.equals (GSParams.LANGUAGE) 
@@ -451 +470 @@
           }
           // either add it to the param list straight away, or save it to the session and add it later
-          if (this.params.shouldSave (name)) {
-        if (table != null) {                
+          if (this.params.shouldSave (name) && table != null) {
           table.put(name, value);                    
-        }
           } else {
             Element param = this.doc.createElement (GSXML.PARAM_ELEM);
@@ -464 +481 @@
       }
       //put everything in the table into the session
+      // do we need to do this? why not just put from table into param list
       if (table != null) {
     Enumeration keys = table.keys ();
@@ -491 +509 @@
       }
     }
-    
+      
     if (!output.equals ("html")) {
       response.setContentType ("text/xml"); // for now use text
@@ -503 +521 @@
     
     displaySize(session_ids_table);
-  }
+}
+
   //a debugging method
   private void displaySize(Hashtable table) {