Changeset 3966

Timestamp:

2003-03-25T09:40:12+12:00 (21 years ago)

Author:

kjdon

Message:

process id att and param now pid instead of handle/id, tidied up params sent to service

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/action/ProcessAction.java (modified) (2 diffs)

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

@@ -70 +70 @@
         mr_query_message.appendChild(mr_query_request);
         
-        if (request_type.equals("s")) { // status
-        mr_query_request.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_STATUS);
-        } else {
-        mr_query_request.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
-        }
         mr_query_request.setAttribute(GSXML.LANG_ATT, page.getAttribute(GSXML.LANG_ATT)); 
         mr_query_request.setAttribute(GSXML.TO_ATT, to);
         
-        // add the param list as is 
-        Element query_param_list = (Element)doc_.importNode(cgi_param_list, true);
-        mr_query_request.appendChild(query_param_list);
+        Element param_list;
+        if (request_type.equals("s")) { // status
+        mr_query_request.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_STATUS);
+        // only need the handle param
+        param_list = doc_.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
+        Element param = doc_.createElement(GSXML.PARAM_ELEM);
+        param.setAttribute(GSXML.NAME_ATT, GSCGI.PROCESS_ID_ARG);
+        param.setAttribute(GSXML.VALUE_ATT, (String)params.get(GSCGI.PROCESS_ID_ARG));
+        param_list.appendChild(param);
+        } else {
+        mr_query_request.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
+        // add in the params - except the ones only used by the action
+        param_list = getServiceParamList(cgi_param_list);
+        
+        }
+        mr_query_request.appendChild(param_list);
+    
         
         Element mr_query_response = (Element)mr_.process(mr_query_message);
@@ -150 +159 @@
     }
 
-    
+    protected Element getServiceParamList(Element cgi_param_list) {
+
+    Element new_param_list = doc_.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
+    Element param;
+    NodeList cgi_params = cgi_param_list.getChildNodes();
+    for (int i=0; i<cgi_params.getLength(); i++) {
+        Element p = (Element) cgi_params.item(i);
+        String name = p.getAttribute(GSXML.NAME_ATT);
+        if (name.equals(GSCGI.SERVICE_ARG) || name.equals(GSCGI.REQUEST_TYPE_ARG) || name.equals(GSCGI.CLUSTER_ARG)) {
+        continue;
+        }
+        // esle add it in to the list
+        new_param_list.appendChild(doc_.importNode(p, true));
+    }
+    return new_param_list;
+    }
 }