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

Timestamp:

2003-07-18T16:01:10+12:00 (21 years ago)

Author:

kjdon

Message:

service params are now namespaced to avoid conflict with same named action params, docActionalso adds some params to the receptionists GSParams object, and fixed up the enriching stuff

File:

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

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

@@ -44 +44 @@
     public static final String DOC_TYPE_ARG = "dt";
     public static final String GOTO_PAGE_ARG = "gp";
+    public static final String ENRICH_DOC_ARG = "ed";
     
     /** if this is set to true, when a document is displayed, any annotation
@@ -295 +296 @@
     }
     if (provide_annotations) {
-        // now we can modifiy the response doc if needed
-        String enrich_service = (String)params.get(GSCGI.SERVICE_ARG);
-        if (enrich_service != null && !enrich_service.equals("")) {
+        String service_selected = (String)params.get(ENRICH_DOC_ARG);
+        if (service_selected != null && service_selected.equals("1")) {
+        // now we can modifiy the response doc if needed
+        String enrich_service = (String)params.get(GSCGI.SERVICE_ARG);
+        System.out.println("enrich service is "+enrich_service);
         // send a message to the service
         Element enrich_message = doc_.createElement(GSXML.MESSAGE_ELEM);
         Element enrich_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_PROCESS, enrich_service, lang);
         enrich_message.appendChild(enrich_request);
-        Element enrich_pl = getServiceParamList(cgi_paramList);
-        enrich_request.appendChild(enrich_pl);
+        // check for parameters
+        HashMap service_params = (HashMap)params.get("s1");
+        if (service_params != null) { 
+            Element enrich_pl = GSXML.createParameterList(doc_, service_params); 
+            enrich_request.appendChild(enrich_pl);
+        }
         Element e_doc_list = doc_.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
         enrich_request.appendChild(e_doc_list);
@@ -355 +362 @@
     }
 
-    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) || name.equals(GSCGI.DOCUMENT_ARG) || name.equals(SIBLING_ARG) ) {
-        continue;
-        }
-        // esle add it in to the list
-        new_param_list.appendChild(doc_.importNode(p, true));
-    }
-    return new_param_list;
+    /** tell the param class what its arguments are 
+     * if an action has its own arguments, this should add them to the params
+     * object - particularly important for args that should not be saved */
+    public boolean getActionParameters(GSParams params) {
+    params.addParameter(DOC_TYPE_ARG, true);
+    params.addParameter(GOTO_PAGE_ARG, false);
+    params.addParameter(ENRICH_DOC_ARG, false);
+    return true;
     }
+
 
     /** this method gets the collection description, the format info, the