Changeset 4692

Timestamp:

2003-06-18T11:39:26+12:00 (21 years ago)

Author:

kjdon

Message:

no longer use ConfigVars, use a HashMap instead. request type cgi is now request type page

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/core/Receptionist.java (modified) (8 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/core/Receptionist.java

@@ -23 +23 @@
 
     /** the set up variables */
-    /// this is web specific - perhaps use an interface so diff types (web/java app) can use diff classes
-    protected ConfigVars config=null;
-
+    protected HashMap config_params = null;
     /** container Document to create XML Nodes */
     protected Document doc=null; 
@@ -44 +42 @@
     }
     
-    /** the set up vars must be set before configure called*/
-    public void setConfigVars(ConfigVars config) {
-    this.config = config;
+    public void setConfigParams(HashMap params) {
+    this.config_params = params;
     }
-
     /** sets the message router  - it should already be created and 
      * configured before  being passed to the receptionist*/
@@ -58 +54 @@
     public boolean configure() {
 
-    if (this.config==null) {
+    if (this.config_params==null) {
         System.err.println("Receptionist Error: config variables must be set before calling configure");
         return false;
@@ -68 +64 @@
 
     // find the config file containing a list of actions
-    File interface_config_file = new File(GSFile.interfaceConfigFile(GSFile.interfaceHome(this.config.gsdl3_home_, this.config.interface_name_)));
+    File interface_config_file = new File(GSFile.interfaceConfigFile(GSFile.interfaceHome((String)this.config_params.get(GSConstants.GSDL3_HOME), (String)this.config_params.get(GSConstants.INTERFACE_NAME))));
     if (!interface_config_file.exists()) {
         System.err.println("Receptionist: interface config file: "+interface_config_file.getPath()+" not found!");
@@ -90 +86 @@
         continue;
         }
-        ac.setConfigVars(this.config);
+        ac.setConfigParams(this.config_params);
         ac.setMessageRouter(this.mr);
         ac.configure();
@@ -119 +115 @@
     // check the request type 
     String type = request.getAttribute(GSXML.TYPE_ATT); // returns "" if no att of this name
-    if (!type.equals(GSXML.REQUEST_TYPE_CGI)) { // should use a diff name??
-        // now Receptionist forwards non-cgi requests straight to the MR, and returns the responses
-        System.err.println("Receptionist: request type is not '"+GSXML.REQUEST_TYPE_CGI+"', but it is '"+type+"', so forwarding the message to the MR!");
+    if (!type.equals(GSXML.REQUEST_TYPE_PAGE)) { 
+        // now Receptionist forwards non-page requests straight to the MR, and returns the responses
+        System.err.println("Receptionist: request type is not '"+GSXML.REQUEST_TYPE_PAGE+"', but it is '"+type+"', so forwarding the message to the MR!");
         // process the whole message - mr needs <message> tags, and 
         // in this case, there may be more than one request in the message
@@ -141 +137 @@
         action_name = action.substring(0,1).toUpperCase()+action.substring(1)+"Action";
         Action ac = (Action)Class.forName("org.greenstone.gsdl3.action."+action_name).newInstance();
-        ac.setConfigVars(this.config);
+        ac.setConfigParams(this.config_params);
         ac.setMessageRouter(this.mr);
         ac.configure();
@@ -157 +153 @@
     // set up the page
     Element page = this.doc.createElement(GSXML.PAGE_ELEM);
-    // do we need this??
     page.setAttribute(GSXML.LANG_ATT, request.getAttribute(GSXML.LANG_ATT));