Changeset 32447 for main/trunk

Timestamp:

2018-09-13T13:57:44+12:00 (6 years ago)

Author:

kjdon

Message:

initialise params class earlier, so we can pass to MR as well as to recpt. - services now need to add any params that they want saving in the session

File:

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

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

@@ -223 +223 @@
         this.recept.setConfigParams(config_params);
 
+        // the params arg thingy
+
+        String params_name = (String) config.getInitParameter("params_class");
+        if (params_name == null)
+        {
+            this.params = new GSParams();
+        }
+        else
+        {
+            try
+            {
+                this.params = (GSParams) Class.forName("org.greenstone.gsdl3.util." + params_name).newInstance();
+            }
+            catch (Exception e)
+            {
+                System.err.println("LibraryServlet configure exception when trying to use a new params thing " + params_name + ": " + e.getMessage());
+                e.printStackTrace();
+                this.params = new GSParams();
+            }
+        }
+        
         // the receptionist uses a MessageRouter or Communicator to send its requests to. We either create a MessageRouter here for the designated site (if site_name set), or we create a Communicator for a remote site. The is given to the Receptionist, and the servlet never talks to it again directly.
         if (site_name != null)
@@ -248 +269 @@
             message_router.setSiteName(site_name);
             message_router.setLibraryName(library_name);
+            message_router.setParams(this.params);
             message_router.configure();
             this.recept.setMessageRouter(message_router);
@@ -253 +275 @@
         else
         {
+          // TODO: what do we do about params here?
             // talking to a remote site, create a communicator
             Communicator communicator = null;
@@ -280 +303 @@
         }
 
-        // the params arg thingy
-
-        String params_name = (String) config.getInitParameter("params_class");
-        if (params_name == null)
-        {
-            this.params = new GSParams();
-        }
-        else
-        {
-            try
-            {
-                this.params = (GSParams) Class.forName("org.greenstone.gsdl3.util." + params_name).newInstance();
-            }
-            catch (Exception e)
-            {
-                System.err.println("LibraryServlet configure exception when trying to use a new params thing " + params_name + ": " + e.getMessage());
-                e.printStackTrace();
-                this.params = new GSParams();
-            }
-        }
-        // pass it to the receptionist
+        // pass params to the receptionist
         this.recept.setParams(this.params);
         this.recept.configure();
@@ -842 +845 @@
     {
         //Check if we need to login or logout
-        String username = getFirstParam("username", queryMap);
-        String password = getFirstParam("password", queryMap);
-        String logout = getFirstParam("logout", queryMap);
+        String username = getFirstParam(GSParams.USERNAME, queryMap);
+        String password = getFirstParam(GSParams.PASSWORD, queryMap);
+        String logout = getFirstParam(GSParams.LOGOUT, queryMap);
 
         if (logout != null)