Changeset 32448 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/QueryAction.java

Timestamp:

2018-09-13T14:05:59+12:00 (6 years ago)

Author:

kjdon

Message:

params class changed, now returns false by default for shouldsave. so don't need to add any that we don't want saving in the session. turned hard coded strings into static string variables

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/QueryAction.java (modified) (3 diffs)

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

@@ -21 +21 @@
 {
 
-  public static final String HITS_PER_PAGE = "hitsPerPage";
+  public static final String HITS_PER_PAGE_ARG = "hitsPerPage";
     static Logger logger = Logger.getLogger(org.greenstone.gsdl3.action.QueryAction.class.getName());
+  
+    /**
+     * 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 need to be saved to the session
+     */
+    public boolean addActionParameters(GSParams params)
+    {
+      // some query services don't do paging themselves, in shich case we do it here. Let tell servlet to save the param just in case nothing else is doing that.
+      params.addServiceParameter(HITS_PER_PAGE_ARG, "20", true, false);
+        return true;
+    }
   
     /**
@@ -351 +364 @@
     {
 
-      String hits_pp = (String) service_params.get(HITS_PER_PAGE);
+      String hits_pp = (String) service_params.get(HITS_PER_PAGE_ARG);
      
         int hits = 20;
@@ -427 +440 @@
   protected boolean addHitsParamToService(Document doc, Element service_description, String lang) {
     Element param_list = (Element)GSXML.getChildByTagName(service_description, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
-    Element param = GSXML.createParameterDescription(doc, HITS_PER_PAGE, getTextString("param." + HITS_PER_PAGE, lang, "ServiceRack", null), GSXML.PARAM_TYPE_INTEGER, "20", null, null);
+    Element param = GSXML.createParameterDescription(doc, HITS_PER_PAGE_ARG, getTextString("param." + HITS_PER_PAGE_ARG, lang, "ServiceRack", null), GSXML.PARAM_TYPE_INTEGER, "20", null, null);
     Element query_param = GSXML.getNamedElement(param_list, GSXML.PARAM_ELEM, GSXML.NAME_ATT, "query");
     if (query_param != null) {