Changeset 29318

Timestamp:

2014-09-22T10:07:11+12:00 (10 years ago)

Author:

kjdon

Message:

adding in sort by and sort order params for lucene advanced field query

Location:

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service

Files:

• AbstractGS2FieldSearch.java (modified) (2 diffs)
• SharedSoleneGS2FieldSearch.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractGS2FieldSearch.java

@@ -360 +360 @@
             else if (service_id.equals(ADVANCED_FIELD_QUERY_SERVICE))
             {
-                createParameter(LEVEL_PARAM, param_list, lang);
-                createParameter(RANK_PARAM, param_list, lang);
+                addCustomQueryParamsAdvField(param_list, lang);
                 createParameter(MAXDOCS_PARAM, param_list, lang);
                 if (!default_index_subcollection.equals(""))
@@ -428 +427 @@
         createParameter(LEVEL_PARAM, param_list, lang);
         super.addCustomQueryParams(param_list, lang);
+    }
+    /** add in the level params to TextQuery */
+    protected void addCustomQueryParamsAdvField(Element param_list, String lang)
+    {
+        createParameter(LEVEL_PARAM, param_list, lang);
     }
 

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/SharedSoleneGS2FieldSearch.java

@@ -117 +117 @@
         createParameter(SORT_ORDER_PARAM, param_list, lang);
     }
+  /** add in Lucene/SOLR specific params for AdvancedFieldQuery */
+  protected void addCustomQueryParamsAdvField(Element param_list, String lang)
+    {
+        super.addCustomQueryParamsAdvField(param_list, lang);
+        createParameter(RANK_PARAM, param_list, lang);
+        createParameter(SORT_ORDER_PARAM, param_list, lang);
+        
+    }
 
     /** create a param and add to the list */