Changeset 16926

Timestamp:

2008-08-21T09:48:20+12:00 (16 years ago)

Author:

kjdon

Message:

indented the file consistently

File:

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

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

@@ -88 +88 @@
     String sess_expire = config.getInitParameter(GSXML.SESSION_EXPIRATION);
     if (sess_expire != null && !sess_expire.equals("")) {
-        this.session_expiration = Integer.parseInt(sess_expire);
+      this.session_expiration = Integer.parseInt(sess_expire);
     }
     
@@ -250 +250 @@
     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;
+      return coll_name_params_table;
     }
     public void valueBound(HttpSessionBindingEvent event) {
-    // Do nothing
+      // Do nothing
     }
 
@@ -266 +266 @@
     }
     public int tableSize() {
-        return (coll_name_params_table == null)? 0 : coll_name_params_table.size();
+      return (coll_name_params_table == null)? 0 : coll_name_params_table.size();
     }
   }
   
   public void doGet (HttpServletRequest request,
-    HttpServletResponse response)
+             HttpServletResponse response)
     throws ServletException, IOException {
     logUsageInfo (request);
@@ -277 +277 @@
     String query_string = request.getQueryString();
     if (query_string!=null){
-    String[] query_arr = query_string.split("&");
-    boolean redirect = false;
-    String href = null;
-    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());
-        }
+      String[] query_arr = query_string.split("&");
+      boolean redirect = false;
+      String href = null;
+      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_string contains "el=", the web page will be redirected to the external URl, otherwise a greenstone page with an external URL will be displayed
-    //"rl=0" this is an external link
-    //"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);
-    }
+      }
+      //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
+      //"rl=0" this is an external link
+      //"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);
+      }
     }
     // Nested Diagnostic Configurator to identify the client for
@@ -345 +345 @@
     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
+    //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
     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.");
-            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);
-            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);
-            }
-        }
-        should_cache = false;
+    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.");
+    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);
+    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);
     }
-
+      }
+      should_cache = false;
+    }
+    
     //  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 
@@ -372 +372 @@
     Enumeration attributeNames = session.getAttributeNames();
     while(attributeNames.hasMoreElements()) {
-        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);
-        }
-    }
-
+      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);
+      }
+    }
+    
     // create a dumy collection name for Authentication 
     if (subaction != null && subaction.equals("authen")){
-    collection = "0000000000";
+      collection = "0000000000";
     }
     
@@ -390 +390 @@
     String sid = session.getId();
     if (should_cache == true && collection != null && !collection.equals("")) {
-        String key_str = valid_site_name + collection;
-        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)) {
-                    //logger.info("existing table: " + collection);
-                    table = (Hashtable)param_table.get(key_str);
-                } else {
-                    table = new Hashtable();
-                    param_table.put(key_str, table);
-                    //logger.info("new table: " + collection);
-                }
-        } else {
-            param_table = new Hashtable();
-            table = new Hashtable();
-            param_table.put(key_str, 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");
-        }
+      String key_str = valid_site_name + collection;
+      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)) {
+      //logger.info("existing table: " + collection);
+      table = (Hashtable)param_table.get(key_str);
+    } else {
+      table = new Hashtable();
+      param_table.put(key_str, table);
+      //logger.info("new table: " + collection);
+    }
+      } else {
+    param_table = new Hashtable();
+    table = new Hashtable();
+    param_table.put(key_str, 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");
+      }
     }
 
@@ -439 +439 @@
         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
+        && !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);
@@ -452 +452 @@
           // 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) {              
-                  table.put(name, value);                    
-              }
+        if (table != null) {                
+          table.put(name, value);                    
+        }
           } else {
             Element param = this.doc.createElement (GSXML.PARAM_ELEM);
@@ -465 +465 @@
       //put everything in the table into the session
       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));
+    }
       }
       
@@ -478 +478 @@
         
         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);
@@ -506 +506 @@
   //a debugging method
   private void displaySize(Hashtable table) {
-      if(table == null) {
-          logger.info("cached table is null");
-          return;
-      }
-      if (table.size() == 0) {
-          logger.info("cached table size is zero");
-          return;
-      }
-      int num_cached_coll = 0;
-        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();           
-        }
-      logger.info("Number of sessions : total number of cached collection info = " + table.size() + " : " + num_cached_coll);
+    if(table == null) {
+      logger.info("cached table is null");
+      return;
+    }
+    if (table.size() == 0) {
+      logger.info("cached table size is zero");
+      return;
+    }
+    int num_cached_coll = 0;
+    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();         
+    }
+    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) {
-     String str = "";
-     Enumeration keys = table.keys ();
-     while(keys.hasMoreElements ()) {
-      String name = (String)keys.nextElement();
-      str += name + ", ";
-     }
-     return str;
+    String str = "";
+    Enumeration keys = table.keys ();
+    while(keys.hasMoreElements ()) {
+      String name = (String)keys.nextElement();
+      str += name + ", ";
+    }
+    return str;
   }
 
@@ -546 +546 @@
     short nodeType = dataNode.getNodeType();
     if (nodeType == Node.DOCUMENT_NODE) {
-    Document docNode = (Document)dataNode;
-    data = docNode.getDocumentElement() ;
+      Document docNode = (Document)dataNode;
+      data = docNode.getDocumentElement() ;
     }
     else {
-    data = (Element)dataNode;
+      data = (Element)dataNode;
     }
 
@@ -586 +586 @@
   
   public void doPost(HttpServletRequest request,
-    HttpServletResponse response)
+             HttpServletResponse response)
     throws ServletException, IOException {
     doGet(request,response);