Changeset 4994

Timestamp:

2003-07-21T11:33:15+12:00 (21 years ago)

Author:

kjdon

Message:

Library2 now takes cgi args as input, and returns the page. you can copy and paste urls from hte output back in as input, and get the next page.

File:

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

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

@@ -45 +45 @@
     
     protected HashMap saved_args = null;
-    protected GSCGI cgi = null;
-    protected WebReceptionist recept = null;
+    protected GSParams params = null;
+    protected DefaultReceptionist recept = null;
     
     public Library2 (){
@@ -52 +52 @@
     this.doc = converter.newDOM();
     this.saved_args = new HashMap();
-    this.cgi = new GSCGI();
-    this.recept = new WebReceptionist();
+    this.params = new GSParams();
+    this.recept = new DefaultReceptionist();
     }
     
@@ -71 +71 @@
     recept.setConfigParams(config_params);
     recept.setMessageRouter(message_router);
+    recept.setParams(params);
     recept.configure();
-    recept.setCGI(cgi);
     }
     public static void main(String args[]) {
@@ -126 +126 @@
     String action = "p";
     String subaction = "home";
-    String lang = (String)saved_args.get(GSCGI.LANGUAGE_ARG);
+    String lang = (String)saved_args.get(GSParams.LANGUAGE);
     if (lang == null) {
         lang = "en";
@@ -139 +139 @@
         String name = arg.substring(0, pos);
         String value = arg.substring(pos+1);
-        if (name.equals(GSCGI.ACTION_ARG)) {
+        if (name.equals(GSParams.ACTION)) {
         action = value;
-        } else if (name.equals(GSCGI.SUBACTION_ARG)) {
+        } else if (name.equals(GSParams.SUBACTION)) {
         subaction = (value);
-        } else if (name.equals(GSCGI.LANGUAGE_ARG)) {
+        } else if (name.equals(GSParams.LANGUAGE)) {
         lang = value;
         saved_args.put(name, value);
-        } else if (name.equals(GSCGI.OUTPUT_ARG)) {
+        } else if (name.equals(GSParams.OUTPUT)) {
         output = value;
-        } else if ( cgi.shouldSave(name)) {
+        } else if (params.shouldSave(name)) {
         saved_args.put(name, value);
         } else {
@@ -155 +155 @@
         param.setAttribute(GSXML.NAME_ATT, name);
         param.setAttribute(GSXML.VALUE_ATT, GSXML.xmlSafe(value));
+        xml_param_list.appendChild(param);
         }
     }
@@ -169 +170 @@
     while (i.hasNext()) {
         String name = (String)i.next();
-        if (name.equals(GSCGI.LANGUAGE_ARG)) continue;
+        if (name.equals(GSParams.LANGUAGE)) continue;
         Element param = this.doc.createElement(GSXML.PARAM_ELEM);
         param.setAttribute(GSXML.NAME_ATT, name);