Changeset 4981 for trunk/gsdl3/src/java/org/greenstone/gsdl3/action

Timestamp:

2003-07-18T15:59:26+12:00 (21 years ago)

Author:

kjdon

Message:

service params are now namespaced to avoid conflict with same named action params

Location:

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

Files:

• ProcessAction.java (modified) (2 diffs)
• QueryAction.java (modified) (1 diff)

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

@@ -58 +58 @@
         Element mr_query_message = doc_.createElement(GSXML.MESSAGE_ELEM);
         String request_type_att;
-        Element param_list;
+        Element param_list = null;
         if (request_type.equals("s")) { // status
         request_type_att = GSXML.REQUEST_TYPE_STATUS;
@@ -68 +68 @@
         } else {
         request_type_att = GSXML.REQUEST_TYPE_PROCESS;
-        // add in the params - except the ones only used by the action
-        param_list = getServiceParamList(cgi_param_list);
+        // add in the service params - except the ones only used by the action
+        HashMap service_params = (HashMap)params.get("s1");
+        if (service_params != null) { 
+            param_list = GSXML.createParameterList(doc_, service_params);
+        }
         
         }
         Element mr_query_request = GSXML.createBasicRequest(doc_, request_type_att, to, lang);
-        mr_query_request.appendChild(param_list);
+        if (param_list != null) {
+        mr_query_request.appendChild(param_list);
+        }
         mr_query_message.appendChild(mr_query_request);
         

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

@@ -107 +107 @@
     
     // paramList
-    Element query_param_list = (Element)doc_.importNode(cgi_param_list, true);
+    HashMap service_params = (HashMap)params.get("s1");
+    if (service_params == null) { // no query
+        return page_response;
+    }
+    Element query_param_list = GSXML.createParameterList(doc_, service_params);//(Element)doc_.importNode(cgi_param_list, true);
+    System.out.println("service params are "+converter_.getString(query_param_list));
     mr_query_request.appendChild(query_param_list);