Changeset 28065

Timestamp:

2013-08-15T14:53:57+12:00 (11 years ago)

Author:

kjdon

Message:

adding in sort by none, and sort order asc/desc

File:

• gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service/GS2SolrSearch.java (modified) (5 diffs)

gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service/GS2SolrSearch.java

@@ -121 +121 @@
         
         // 2. Setting up facets
+        // TODO - get these from build config, in case some haven't built
         Element searchElem = (Element) GSXML.getChildByTagName(extra_info, GSXML.SEARCH_ELEM);
         NodeList facet_list = info.getElementsByTagName("facet");
@@ -199 +200 @@
             }
         }
-
+        
         // 3. if there are no more solr cores in Greenstone, then all_solr_cores will be empty, null the CoreContainer
         // All going well, this will happen when we're ant stopping the Greenstone server and the last Solr collection
         // is being deactivated
-
         if (all_solr_cores!=null) {
             Collection<String> coreNamesRemaining = all_solr_cores.getCoreNames();
@@ -274 +274 @@
             else if (name.equals(RANK_PARAM))
             {
-                if (value.equals(RANK_PARAM_RANK_VALUE))
-                {
-                    value = null;
-                }
+                if (value.equals(RANK_PARAM_RANK))
+                {
+                  value = SolrQueryWrapper.SORT_BY_RANK;
+                } else if (value.equals(RANK_PARAM_NONE)) {
+                    value = SolrQueryWrapper.SORT_BY_INDEX_ORDER;
+                  }
+               
                 this.solr_src.setSortField(value);
             }
+            else if (name.equals(SORT_ORDER_PARAM)) {
+                if (value.equals(SORT_ORDER_DESCENDING)) {
+                  this.solr_src.setSortOrder(SolrQueryWrapper.SORT_DESCENDING);
+                } else {
+                  this.solr_src.setSortOrder(SolrQueryWrapper.SORT_ASCENDING);
+                }
+              }
             else if (name.equals(LEVEL_PARAM))
             {
@@ -291 +301 @@
                 }
             }
+            // Would facets ever come in through params???
             else if (name.equals("facets") && value.length() > 0)
             {
@@ -459 +470 @@
         {
           SolrFacetWrapper wrap = new SolrFacetWrapper(facet);
-          String name = wrap.getName();
-          String display_name = "Poo";
-          //wrap.setDisplayName(display_name);
+          // String name = wrap.getName();
+          // String display_name = "Poo";
+          // wrap.setDisplayName(display_name);
             
           newFacetList.add(wrap);