Changeset 28031 for main/trunk/greenstone2/common-src

Timestamp:

2013-08-13T13:33:08+12:00 (11 years ago)

Author:

kjdon

Message:

changes for sorting search results. setReverseSort now takes a boolean param, otherwise can never unset it.

File:

• main/trunk/greenstone2/common-src/indexers/lucene-gs/src/org/greenstone/LuceneWrapper3/GS2LuceneQuery.java (modified) (4 diffs)

main/trunk/greenstone2/common-src/indexers/lucene-gs/src/org/greenstone/LuceneWrapper3/GS2LuceneQuery.java

@@ -59 +59 @@
 public class GS2LuceneQuery extends SharedSoleneQuery
 {
+  public static String SORT_RANK = "rank";
+  public static String SORT_NATURAL = "natural";
+
     protected String full_indexdir="";
 
+  protected int sort_type = SortField.SCORE;
   protected boolean reverse_sort = false;
     protected Sort sorter=new Sort();
@@ -98 +102 @@
         Directory full_indexdir_dir = FSDirectory.open(new File(full_indexdir));
             searcher = new IndexSearcher(full_indexdir_dir,true);
+        // need to set this to get it to compute ranks when sorting by fields
+        ((IndexSearcher)searcher).setDefaultFieldSortScoring(true,true);
             reader = ((IndexSearcher) searcher).getIndexReader();
         
+        
+        this.sorter = new Sort(new SortField(this.sort_field, this.sort_type, this.reverse_sort));
     }
     catch (IOException exception) {
@@ -114 +122 @@
 
     public void setSortField(String sort_field) {
-    super.setSortField(sort_field);
-
-    if (sort_field == null) {
-        this.sorter = new Sort();
-    } else {
-      this.sorter = new Sort(new SortField(sort_field,SortField.STRING, this.reverse_sort)); // **** can do better than this?!?
-    }
-    }
-  public void setReverseSort() {
-    this.reverse_sort = true;
-    if (this.sort_field != null) {
-      this.sorter = new Sort(new SortField(this.sort_field, SortField.STRING, this.reverse_sort));
-    }
+      if (sort_field.equals(SORT_RANK)) {
+    this.sort_field = null;
+    this.sort_type = SortField.SCORE;
+      } else if (sort_field.equals(SORT_NATURAL)) {
+    this.sort_field = null;
+    this.sort_type = SortField.DOC;
+      } else {
+    this.sort_field  = sort_field;
+    this.sort_type = SortField.STRING; // for now. numeric??
+      }
+    }
+  public void setReverseSort(boolean reverse) {
+    this.reverse_sort = reverse;
   }
   public boolean getReverseSort() {
@@ -528 +536 @@
         }
         else if (args[i].equals("-reverse_sort")) {
-          queryer.setReverseSort();
+          queryer.setReverseSort(true);
         }
         else if (args[i].equals("-filter")) {