Changeset 28125 for gs3-extensions/solr

Timestamp:

2013-08-26T11:47:57+12:00 (11 years ago)

Author:

davidb

Message:

Added if-statement test to make sure sort_field exists before it is used. Using the search box on the 'about' page is one place where this can occur, for example.

File:

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

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

@@ -54 +54 @@
     static Logger logger = Logger.getLogger(org.greenstone.gsdl3.util.SolrQueryWrapper.class.getName());
     protected int max_docs = 100;
-  protected String sort_order = SORT_DESCENDING;
+    protected String sort_order = SORT_DESCENDING;
     protected ArrayList<String> _facets = new ArrayList<String>();
     protected ArrayList<String> _facetQueries = new ArrayList<String>();
@@ -201 +201 @@
         solrParams.set("q", query_string);
         // sort param, like "score desc" or "byORG asc"
-        solrParams.set("sort", this.sort_field+" "+this.sort_order);
+
+        if (this.sort_field != null) {
+            solrParams.set("sort", this.sort_field+" "+this.sort_order);
+        }
+
         // which result to start from
         solrParams.set("start", start_results);