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

Timestamp:

2019-05-17T10:26:39+12:00 (5 years ago)

Author:

kjdon

Message:

looking up default param values when start a new session to see if any have been set by Recept or MR. to set, add <format><paramDefault name='x' value='v'/> into interfaceConfig or siteConfig

File:

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

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

@@ -89 +89 @@
      * the cgi stuff - the Receptionist can add new args to this
      * 
-     * its used by the servlet to determine what args to save
+     * its used by the servlet to determine what args to save,
+     * and to set default values
      */
-    protected GSParams params = null;
+    protected GSParams gs_params = null;
 
     /**
@@ -222 +223 @@
         if (params_name == null)
         {
-            this.params = new GSParams();
+            this.gs_params = new GSParams();
         }
         else
@@ -228 +229 @@
             try
             {
-                this.params = (GSParams) Class.forName("org.greenstone.gsdl3.util." + params_name).newInstance();
+                this.gs_params = (GSParams) Class.forName("org.greenstone.gsdl3.util." + params_name).newInstance();
             }
             catch (Exception e)
@@ -234 +235 @@
                 System.err.println("LibraryServlet configure exception when trying to use a new params thing " + params_name + ": " + e.getMessage());
                 e.printStackTrace();
-                this.params = new GSParams();
+                this.gs_params = new GSParams();
             }
         }
@@ -263 +264 @@
             message_router.setSiteName(site_name);
             message_router.setLibraryName(library_name);
-            message_router.setParams(this.params);
+            message_router.setParams(this.gs_params);
             message_router.configure();
             this.recept.setMessageRouter(message_router);
@@ -298 +299 @@
 
         // pass params to the receptionist
-        this.recept.setParams(this.params);
+        this.recept.setParams(this.gs_params);
         this.recept.configure();
 
@@ -649 +650 @@
                 session_ids_table.put(sid, session_cache);
                 session.setAttribute(GSXML.USER_SESSION_CACHE_ATT, session_cache);
-                //logger.info("new session id");
+
+                // here we add in default params?
+                ArrayList<String> defp = this.gs_params.getParamsWithDefaults();
+                Iterator i = this.gs_params.getParamsWithDefaults().iterator();
+                while (i.hasNext()) {
+                    String p = (String)i.next();
+                    String v = this.gs_params.getParamDefault(p);
+                    if (!p.equals(GSParams.ACTION) && !p.equals(GSParams.SUBACTION) && !p.equals(GSParams.LANGUAGE) && !p.equals(GSParams.OUTPUT)) {
+                    table.put(p,v);
+                    }
+                }
+                
             }
         }
@@ -693 +705 @@
                     }
                     // 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)
+                    if (this.gs_params.shouldSave(name) && table != null)
                     {
                         table.put(name, value);
@@ -702 +714 @@
                         param.setAttribute(GSXML.NAME_ATT, name);
                         param.setAttribute(GSXML.VALUE_ATT, GSXML.xmlSafe(value));
-                        if (this.params.isSensitive(name)) {
+                        if (this.gs_params.isSensitive(name)) {
                           param.setAttribute(GSXML.SENSITIVE_ATT, "true");
                         }