Changeset 33611 for main/trunk

Timestamp:

2019-10-31T10:55:04+13:00 (4 years ago)

Author:

kjdon

Message:

added global setting to params - thesea re for params that are valid across collections. eg favouritebasket

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSParams.java (modified) (4 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSParams.java

@@ -29 +29 @@
 
   static Logger logger = Logger.getLogger(org.greenstone.gsdl3.util.GSParams.class.getName());
+
+  // Only used internally in the session
+  public static final String USER_SESSION_CACHE = "user_session_cache";
+  
     // cgi parameter names
     public static final String ACTION = "a"; // the major type of action- eg query or browse or process
@@ -105 +109 @@
 
         // we now only need to add in the ones that need saving, as we will default to "not save"
-        addParameter(LANGUAGE, true);
+        // these ones are global params - apply across all collections
+        addParameter(LANGUAGE, true, false, true);
+        addParameter(BERRYBASKET, true, false, true);
+        addParameter(FAVOURITEBASKET, true, false, true);
+        addParameter(DEBUG, true, false, true);
+
+        // these will only be saved per collection/service
         addParameter(DOCUMENT, true);
         addParameter(PROCESS_ID, true);
         addParameter(COLLECTION_TYPE, true);
-        addParameter(DEBUG, true);
-        addParameter(BERRYBASKET, true);
-        addParameter(FAVOURITEBASKET, true);
+        
         // password is sensitive. don't save, but also don't return it in the page response
         addParameter(PASSWORD, false, true);
@@ -145 +153 @@
         return true;
     }
+  public boolean addParameter(String name, boolean save, boolean sensitive, boolean global)
+  {
+    if (this.param_map.containsKey(name))
+      {
+    // already there so could not add
+    return false;
+      }
+    this.param_map.put(name, new Param("", save, sensitive, global));
+    return true;
+     
+  }
 
   public boolean addServiceParameter(String name, String default_value, boolean save, boolean sensitive) {
@@ -211 +230 @@
   }
 
-    public ArrayList<String> getParamsWithDefaults() {
-    return (ArrayList<String> )this.params_with_default_list.clone();
-    }
-    
+  public boolean isGlobal(String name) {
+    Param p = this.param_map.get(name);
+    if (p==null) {
+      return false;
+    }
+    return p.is_global;
+  }
+  
+  public ArrayList<String> getParamsWithDefaults() {
+    return (ArrayList<String> )this.params_with_default_list.clone();
+  }
+  
   private class Param
-    {
-
-        public String default_value = null;
-        public boolean save = true;
-      public boolean sensitive = false;
-
-      public Param(String default_value, boolean save)
-        {
-            this.default_value = default_value;
-            this.save = save;
-        }
-
-      public Param(String default_value, boolean save, boolean sensitive) {
-            this.default_value = default_value;
-            this.save = save;
-            this.sensitive = sensitive;
-      }
-      
-    }
+  {
+
+    public String default_value = null;
+    public boolean save = true;
+    public boolean sensitive = false;
+    public boolean is_global = false;
+    
+    public Param(String default_value, boolean save)
+    {
+      this.default_value = default_value;
+      this.save = save;
+    }
+    
+    public Param(String default_value, boolean save, boolean sensitive) {
+      this.default_value = default_value;
+      this.save = save;
+      this.sensitive = sensitive;
+    }
+
+    public Param(String default_value, boolean save, boolean sensitive, boolean global) {
+      this.default_value = default_value;
+      this.save = save;
+      this.sensitive = sensitive;
+      this.is_global = global;
+    }
+    
+  }
 }