Changeset 27068 for main/trunk

Timestamp:

2013-03-12T14:59:41+13:00 (11 years ago)

Author:

kjdon

Message:

adding in reverse sort option

File:

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

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

@@ -65 +65 @@
     private String fuzziness = null;
     private String sort_field = null;
+  private boolean reverse_sort = false;
     private Sort sorter=new Sort();
     private String filter_string = null;
@@ -132 +133 @@
     try {               
         Query query_including_stop_words = query_parser_no_stop_words.parse(query_string);
+        System.err.println("stop query class="+query_including_stop_words.getClass().getName());
         query_including_stop_words = query_including_stop_words.rewrite(reader);
-        
-        // System.err.println("********* query_string " + query_string + "****");
+        System.err.println("stop query class="+query_including_stop_words.getClass().getName());    
+        System.err.println("********* query_string " + query_string + "****");
 
         Query query = parseQuery(reader, query_parser, query_string, fuzziness);
@@ -305 +307 @@
         this.sorter = new Sort();
     } else {
-        this.sorter = new Sort(sort_field);
+      this.sorter = new Sort(sort_field, this.reverse_sort);
     }
     }
@@ -311 +313 @@
     return this.sort_field;
     }
-        
+  public void setReverseSort() {
+    this.reverse_sort = true;
+    if (this.sort_field != null) {
+      this.sorter = new Sort(this.sort_field, this.reverse_sort);
+    }
+  }
+  public boolean getReverseSort() {
+    return this.reverse_sort;
+  }
     public void setStartResults(int start_results) {
     if (start_results < 1) {
@@ -475 +485 @@
 
     if (args.length == 0) {
-        System.out.println("Usage: GS2LuceneQuery <index directory> [-fuzziness value] [-filter filter_string] [-sort sort_field] [-dco AND|OR] [-startresults number -endresults number] [query]");
+        System.out.println("Usage: GS2LuceneQuery <index directory> [-fuzziness value] [-filter filter_string] [-sort sort_field] [-reverse_sort] [-dco AND|OR] [-startresults number -endresults number] [query]");
         return;
     }
@@ -506 +516 @@
             i++;
             queryer.setSortField(args[i]);
+        }
+        else if (args[i].equals("-reverse_sort")) {
+          queryer.setReverseSort();
         }
         else if (args[i].equals("-filter")) {
@@ -582 +595 @@
         String sort_string = queryer.getSortField();
         query_result_cache_file_name += ((sort_string != null) ? sort_string : "") + "-";
+        String reverse_sort_string = (queryer.getReverseSort() ? "1" : "0");
+        query_result_cache_file_name += reverse_sort_string + "-";
         String default_conjunction_operator = queryer.getDefaultConjunctionOperator();
         query_result_cache_file_name += default_conjunction_operator + "-";