Changeset 8676

Timestamp:

2004-11-25T15:46:46+13:00 (19 years ago)

Author:

kjdon

Message:

now we look for s0 parameters which get passed to all teh retrieve services. also GSXML.createParameterList changed to addParametersToList

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/action/DocumentAction.java (modified) (6 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/action/DocumentAction.java

@@ -63 +63 @@
     HashMap params = GSXML.extractParams(cgi_paramList, false);
 
+    // just in case there are some that need to get passed to the services
+    HashMap service_params = (HashMap)params.get("s0"); 
+
     String collection = (String) params.get(GSParams.COLLECTION);
     String lang = request.getAttribute(GSXML.LANG_ATT);
@@ -124 +127 @@
     // Create a parameter list to specify the required structure information
     Element ds_param_list = this.doc.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
+    
+    if (service_params != null) {
+        GSXML.addParametersToList(this.doc, ds_param_list, service_params);
+    }
 
     Element ds_param = null; 
@@ -238 +245 @@
     
     Element dm_param_list = createMetadataParamList(meta_names);
+    if (service_params != null) {
+        GSXML.addParametersToList(this.doc, dm_param_list, service_params);
+    }
+    
     dm_request.appendChild(dm_param_list);
+    
     
     // create the doc node list for the metadata request
@@ -263 +275 @@
     dm_message.appendChild(doc_meta_request);
     Element doc_meta_param_list = this.doc.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
+    if (service_params != null) {
+        GSXML.addParametersToList(this.doc, doc_meta_param_list, service_params);
+    }
+
     doc_meta_request.appendChild(doc_meta_param_list);
     Element doc_param = this.doc.createElement(GSXML.PARAM_ELEM);
@@ -302 +318 @@
     // Create a parameter list to specify the request parameters - empty for now
     Element dc_param_list = this.doc.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
+    if (service_params != null) {
+        GSXML.addParametersToList(this.doc, dc_param_list, service_params);
+    }
+
     dc_request.appendChild(dc_param_list);
 
@@ -346 +366 @@
         enrich_message.appendChild(enrich_request);
         // check for parameters
-        HashMap service_params = (HashMap)params.get("s1");
-        if (service_params != null) { 
-            Element enrich_pl = GSXML.createParameterList(this.doc, service_params); 
+        HashMap e_service_params = (HashMap)params.get("s1");
+        if (e_service_params != null) { 
+            Element enrich_pl = this.doc.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
+            GSXML.addParametersToList(this.doc, enrich_pl, e_service_params); 
             enrich_request.appendChild(enrich_pl);
         }