Changeset 28163

Timestamp:

2013-08-27T12:59:37+12:00 (11 years ago)

Author:

kjdon

Message:

set a default sort field, and make sure it is not being set to null

File:

• gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/util/SolrQueryWrapper.java (modified) (3 diffs)

gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/util/SolrQueryWrapper.java

@@ -55 +55 @@
     protected int max_docs = 100;
     protected String sort_order = SORT_DESCENDING;
+  protected String sort_field = SORT_BY_RANK; // don't want null default for solr
     protected ArrayList<String> _facets = new ArrayList<String>();
     protected ArrayList<String> _facetQueries = new ArrayList<String>();
@@ -74 +75 @@
         this.solr_core = solr_core;
     }
-  
+  // make sure its not null.
+  public void setSortField(String sort_field) {
+    if (sort_field != null) {
+      this.sort_field = sort_field;
+    }
+  }
+
   public void setSortOrder(String order)
   {
@@ -201 +208 @@
         solrParams.set("q", query_string);
         // sort param, like "score desc" or "byORG asc"
-
-        if (this.sort_field != null) {
-            solrParams.set("sort", this.sort_field+" "+this.sort_order);
-        }
-
+        solrParams.set("sort", this.sort_field+" "+this.sort_order);
         // which result to start from
         solrParams.set("start", start_results);