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

Timestamp:

2008-12-17T14:17:05+13:00 (15 years ago)

Author:

oranfry

Message:

fixed tabbing in this file

File:

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

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

@@ -39 +39 @@
   /** the receptionist to send messages to */
   protected Receptionist recept=null;
+
   /** the default language - is specified by setting a servlet param,
    * otherwise DEFAULT_LANG is used*/
   protected String default_lang= null;
+
   /** The default default - used if a default lang is not specified
    * in the servlet params */
   protected final String DEFAULT_LANG = "en";
+
   /** container Document to create XML Nodes */
   protected Document doc=null;
+
   /** a converter class to parse XML and create Docs */
   protected XMLConverter converter=null;
+
   /** the cgi stuff - the Receptionist can add new args to this
    *
@@ -78 +83 @@
     // disable preferences - does this work anyway??
     //System.setProperty("java.util.prefs.PreferencesFactory", "org.greenstone.gsdl3.util.DisabledPreferencesFactory");
-    
     
     String library_name = config.getInitParameter(GSConstants.LIBRARY_NAME);
@@ -247 +251 @@
     protected void cleanupCache(String coll_name) {
       if (coll_name_params_table.containsKey(coll_name)) {
-    coll_name_params_table.remove(coll_name);
-      }
-    }
+        coll_name_params_table.remove(coll_name);
+      }
+    }
+
     protected Hashtable getParamsTable() {
       return coll_name_params_table;
     }
+
     public void valueBound(HttpSessionBindingEvent event) {
       // Do nothing
@@ -262 +268 @@
       }
     }
+
     public int tableSize() {
       return (coll_name_params_table == null)? 0 : coll_name_params_table.size();
     }
-  }
-  
-  public void doGet (HttpServletRequest request,
-             HttpServletResponse response)
+
+  }
+  
+  public void doGet (HttpServletRequest request, HttpServletResponse response)
     throws ServletException, IOException {
     logUsageInfo (request);
@@ -279 +286 @@
       String rl = null;
       for (int i=0;i<query_arr.length;i++){
-    if (query_arr[i].startsWith("el")){
-      if (query_arr[i].substring(query_arr[i].indexOf("=")+1,query_arr[i].length()).equals("direct")){
-        redirect = true;
-      }
-    }else if(query_arr[i].startsWith("href")){
-      href = query_arr[i].substring(query_arr[i].indexOf("=")+1,query_arr[i].length());
-      href = href.replaceAll("%2f", "/");
-      href = href.replaceAll("%7e", "~");
-      href = href.replaceAll("%3f", "?");
-      href = href.replaceAll("%3A", "\\:");
-    }else if(query_arr[i].startsWith("rl")){
-      rl = query_arr[i].substring(query_arr[i].indexOf("=")+1,query_arr[i].length());
-    }
+        if (query_arr[i].startsWith("el")){
+          if (query_arr[i].substring(query_arr[i].indexOf("=")+1,query_arr[i].length()).equals("direct")){
+            redirect = true;
+          }
+        }else if(query_arr[i].startsWith("href")){
+          href = query_arr[i].substring(query_arr[i].indexOf("=")+1,query_arr[i].length());
+          href = href.replaceAll("%2f", "/");
+          href = href.replaceAll("%7e", "~");
+          href = href.replaceAll("%3f", "?");
+          href = href.replaceAll("%3A", "\\:");
+        }else if(query_arr[i].startsWith("rl")){
+          rl = query_arr[i].substring(query_arr[i].indexOf("=")+1,query_arr[i].length());
+        }
       }
       //if query_string contains "el=", the web page will be redirected to the external URl, otherwise a greenstone page with an external URL will be displayed
@@ -297 +304 @@
       //"rl=1" this is an internal link
       if ((redirect) && (href != null) && (rl.equals("0"))){// This is an external link, the web page is re-directed to the external URL (&el=&rl=0&href="http://...")
-    response.setContentType("text/xml");
-    response.sendRedirect(href);
+        response.setContentType("text/xml");
+        response.sendRedirect(href);
       }
     }
@@ -357 +364 @@
       String coll = request.getParameter(GSParams.SYSTEM_CLUSTER);
       if (coll != null && !coll.equals("")) {
-    clean_all = false;
-    clean_collection = coll;
+        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;
-      }
-    }
+        // 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);
+        session_ids_table = new Hashtable(); 
+        session.removeAttribute(GSXML.USER_SESSION_CACHE_ATT);
       } else {
-    // 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(clean_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(clean_collection);
+        }
+    
       }
 
@@ -390 +397 @@
     }
     
-    //  logger.info("should_cache= " + should_cache);
+    // 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 
@@ -398 +405 @@
       String name = (String)attributeNames.nextElement();
       if (!name.equals (GSXML.USER_SESSION_CACHE_ATT)
-      && !name.equals (GSParams.LANGUAGE) 
-      && !name.equals (GSXML.USER_ID_ATT)) {
-    session.removeAttribute(name);
+        && !name.equals (GSParams.LANGUAGE) 
+        && !name.equals (GSXML.USER_ID_ATT)) {
+
+        session.removeAttribute(name);
       }
     }
@@ -408 +416 @@
       cache_key = "0000000000";
     }
-    
+    
     UserSessionCache session_cache = null;
     Hashtable param_table = null;    
@@ -415 +423 @@
     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(cache_key)) {
-      //logger.info("existing table: " + collection);
-      table = (Hashtable)param_table.get(cache_key);
-    } else {
-      table = new Hashtable();
-      param_table.put(cache_key, table);
-      //logger.info("new table: " + collection);
-    }
+        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(cache_key)) {
+          //logger.info("existing table: " + collection);
+          table = (Hashtable)param_table.get(cache_key);
+        } else {
+          table = new Hashtable();
+          param_table.put(cache_key, table);
+          //logger.info("new table: " + collection);
+        }
       } else {
-    param_table = new Hashtable();
-    table = new Hashtable();
-    param_table.put(cache_key, table);
-    session_cache = new UserSessionCache(sid, param_table);
-    session_ids_table.put(sid, session_cache);
-    session.setAttribute(GSXML.USER_SESSION_CACHE_ATT, session_cache);
-    //logger.info("new session id");
+        param_table = new Hashtable();
+        table = new Hashtable();
+        param_table.put(cache_key, table);
+        session_cache = new UserSessionCache(sid, param_table);
+        session_ids_table.put(sid, session_cache);
+        session.setAttribute(GSXML.USER_SESSION_CACHE_ATT, session_cache);
+        //logger.info("new session id");
       }
     }
@@ -446 +454 @@
       xml_request.setAttribute (GSXML.ACTION_ATT, action);
       if (subaction != null) {
-    xml_request.setAttribute (GSXML.SUBACTION_ATT, subaction);
+        xml_request.setAttribute (GSXML.SUBACTION_ATT, subaction);
       }
       
@@ -457 +465 @@
       while(params.hasMoreElements ()) {
         String name = (String)params.nextElement ();
-    if (!name.equals (GSParams.ACTION) 
-        && !name.equals (GSParams.SUBACTION) 
-        && !name.equals (GSParams.LANGUAGE) 
-        && !name.equals (GSParams.OUTPUT)) {// we have already dealt with these
+        if (!name.equals (GSParams.ACTION) 
+          && !name.equals (GSParams.SUBACTION) 
+          && !name.equals (GSParams.LANGUAGE) 
+          && !name.equals (GSParams.OUTPUT)) {// we have already dealt with these
+
           String value="";
           String [] values = request.getParameterValues (name);
@@ -471 +480 @@
           // either add it to the param list straight away, or save it to the session and add it later
           if (this.params.shouldSave (name) && table != null) {
-          table.put(name, value);                    
+            table.put(name, value);
           } else {
             Element param = this.doc.createElement (GSXML.PARAM_ELEM);
@@ -483 +492 @@
       // do we need to do this? why not just put from table into param list
       if (table != null) {
-    Enumeration keys = table.keys ();
-    while(keys.hasMoreElements ()) {
-      String name = (String)keys.nextElement();
-      session.setAttribute(name, (String)table.get(name));
-    }
+        Enumeration keys = table.keys ();
+        while(keys.hasMoreElements ()) {
+          String name = (String)keys.nextElement();
+          session.setAttribute(name, (String)table.get(name));
+        }
       }
       
@@ -496 +505 @@
         
         if ( !name.equals (GSXML.USER_SESSION_CACHE_ATT) 
-         && !name.equals (GSParams.LANGUAGE) 
-         && !name.equals (GSXML.USER_ID_ATT)) { 
-      // lang and uid are stored but we dont want it in the param list cos its already in the request
+          && !name.equals (GSParams.LANGUAGE) 
+          && !name.equals (GSXML.USER_ID_ATT)) { 
+
+          // lang and uid are stored but we dont want it in the param list cos its already in the request
           Element param = this.doc.createElement (GSXML.PARAM_ELEM);
           param.setAttribute (GSXML.NAME_ATT, name);
           String value =  GSXML.xmlSafe ((String)session.getAttribute (name));
+
           // ugly hack to undo : escaping
           value = value.replaceAll ("%3A", "\\:");
@@ -521 +532 @@
     
     displaySize(session_ids_table);
-}
+
+  } //end of doGet(HttpServletRequest, HttpServletResponse)
 
   //a debugging method
@@ -536 +548 @@
     ArrayList cache_list = new ArrayList(table.values());
     for (int i=0; i<cache_list.size(); i++) {
-      num_cached_coll += ((UserSessionCache)cache_list.get(i)).tableSize();         
+      num_cached_coll += ((UserSessionCache)cache_list.get(i)).tableSize();
     }
     logger.info("Number of sessions : total number of cached collection info = " + table.size() + " : " + num_cached_coll);
-  }  
+  }
+
   /** merely a debugging method! */
   private String tableToString(Hashtable table) {
@@ -604 +617 @@
   }
   
-  public void doPost(HttpServletRequest request,
-             HttpServletResponse response)
+  public void doPost(HttpServletRequest request, HttpServletResponse response)
     throws ServletException, IOException {
+
     doGet(request,response);
     
   }
+
 }