Changeset 4690

Timestamp:

2003-06-18T11:31:19+12:00 (21 years ago)

Author:

kjdon

Message:

no longer use ConfigVars, now we use a HashMap - so now there is no restriction on what config variables there are. also cgi request type is now page request type

File:

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

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

@@ -11 +11 @@
 import javax.servlet.http.*;
 import java.util.Enumeration;
+import java.util.HashMap;
 import java.io.File;
 
@@ -46 +47 @@
     super.init(config);
 
-    ConfigVars config_vars = new ConfigVars();
-    String library_name = config.getInitParameter("libraryname");
-    String gsdl3_home = config.getInitParameter("gsdl3home");
-    String site_name = config.getInitParameter("sitename");
-    String interface_name = config.getInitParameter("interfacename");
-    this.default_lang = config.getInitParameter("defaultlang");
+    String library_name = config.getInitParameter(GSConstants.LIBRARY_NAME);
+    String gsdl3_home = config.getInitParameter(GSConstants.GSDL3_HOME);
+    String site_name = config.getInitParameter(GSConstants.SITE_NAME);
+    String interface_name = config.getInitParameter(GSConstants.INTERFACE_NAME);
+    this.default_lang = config.getInitParameter(GSConstants.DEFAULT_LANG);
     if (library_name == null || gsdl3_home == null || site_name ==null ||  interface_name ==null) {
         // must have this
@@ -63 +63 @@
         this.default_lang = DEFAULT_LANG;
     }
-
-    config_vars.library_name_ = library_name;
-    config_vars.gsdl3_home_ = gsdl3_home;
-    config_vars.site_name_ = site_name;
-    config_vars.interface_name_ =interface_name;
-    config_vars.default_language_ = this.default_lang;
-    config_vars.createXML();
+    
+    HashMap config_params = new HashMap();
+    
+    config_params.put(GSConstants.LIBRARY_NAME, library_name);
+    config_params.put(GSConstants.GSDL3_HOME, gsdl3_home);
+    config_params.put(GSConstants.SITE_NAME, site_name);
+    config_params.put(GSConstants.INTERFACE_NAME, interface_name);
     
     this.converter = new XMLConverter();
@@ -91 +91 @@
     }
     
-    message_router.setSiteHome(GSFile.siteHome(config_vars.gsdl3_home_, 
-                           config_vars.site_name_));
+    message_router.setSiteHome(GSFile.siteHome(gsdl3_home, 
+                           site_name));
     message_router.configure();
     
@@ -108 +108 @@
         }
     }
-    this.recept.setConfigVars(config_vars);
+    this.recept.setConfigParams(config_params);
     this.recept.setMessageRouter(message_router);
     this.recept.configure();
@@ -167 +167 @@
     // the request to the receptionist  
     Element xml_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
-    Element xml_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_CGI, "", lang);
+    Element xml_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PAGE, "", lang);
     xml_request.setAttribute(GSXML.OUTPUT_ATT, output);
     xml_message.appendChild(xml_request);
@@ -248 +248 @@
      */
     protected void encodeURLs(Element data, HttpServletResponse response) {
-
+    
+    if (data == null) {
+        return;
+    }
     // get all the <a> elements
     NodeList hrefs = data.getElementsByTagName("a");