Changeset 8714

Timestamp:

2004-12-01T11:37:21+13:00 (19 years ago)

Author:

kjdon

Message:

fixed up query term highlighting with the new s1. service params

File:

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

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

@@ -424 +424 @@
     return result;
     }
-
+    
     /** tell the param class what its arguments are 
      * if an action has its own arguments, this should add them to the params
@@ -514 +514 @@
     HashMap params = GSXML.extractParams(cgi_param_list, false);
     
-    String service_name = (String)params.get(GSParams.SERVICE);
+    
+    String service_name = (String)((HashMap)params.get("p")).get(GSParams.SERVICE);
     if (service_name == null || !service_name.endsWith("Query")) { // hack for now - we only do highlighting if we were in a query last - ie not if we were in a browse thingy
+        System.err.println("DocumentAction: invalid service, not doing highlighting");
         return dc_response_doc_content;
     }
@@ -528 +530 @@
     
     // paramList
-    Element query_param_list = (Element)this.doc.importNode(cgi_param_list, true);
+    HashMap service_params = (HashMap)params.get("s1");
+    
+    Element query_param_list = this.doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
+    GSXML.addParametersToList(this.doc, query_param_list, service_params);
     mr_query_request.appendChild(query_param_list);
 
     // do the query
         Element mr_query_response = (Element)this.mr.process(mr_query_message);
-
+    
     String path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.TERM_ELEM+GSXML.LIST_MODIFIER);
     Element query_term_info_list = (Element) GSXML.getNodeByPath(mr_query_response, path);