Changeset 12275

Timestamp:

2006-07-21T17:23:04+12:00 (18 years ago)

Author:

mdewsnip

Message:

Added a command-line option for sorting the search results.

Location:

trunk

Files:

• gsdl/bin/java/LuceneWrap.jar (modified) ( previous)
• gsdl/bin/script/lucene_query.pl (modified) (3 diffs)
• gsdl/src/java/org/nzdl/gsdl/LuceneWrap/GS2LuceneQuery.java (modified) (4 diffs)
• indexers/lucene-gs/src/org/greenstone/LuceneWrapper/GS2LuceneQuery.java (modified) (4 diffs)

trunk/gsdl/bin/script/lucene_query.pl

@@ -52 +52 @@
 sub open_java_lucene
 {
-    my ($full_indexdir, $out_file) = @_;
+    my $full_indexdir = shift(@_);
+    my $sort_field = shift(@_) || "";
+    my $out_file = shift(@_);
     my $bin_java = &util::filename_cat($ENV{'GSDLHOME'},"bin","java");
     my $classpath = &util::filename_cat($bin_java,"LuceneWrap.jar");
@@ -64 +66 @@
     $out_file = "";
     }
-    if (!open (PIPEOUT, "| $java_cmd \"$full_indexdir\" $out_file")) {
+    if (!open (PIPEOUT, "| $java_cmd \"$full_indexdir\" $sort_field")) {
     die "$PROGNAME - couldn't run $java_cmd\n";
     }
-
 }
 
@@ -82 +83 @@
     my $full_indexdir;
     my $query = undef;
+    my $sort_field = undef;
     my $out_file = undef;
-    if ($argc==1) {
+    if ($argc == 0) {
+    print STDERR "Usage: $PROGNAME full-index-dir [query] [sort_field] [outfile]\n";
+    exit 1;
+    }
+    if ($argc >= 1) {
     $full_indexdir = $argv[0];
     }
-    elsif ($argc==2) {
-    $full_indexdir = $argv[0];
+    if ($argc >= 2) {
     $query = $argv[1];
     }
-    elsif  ($argc==3) {
-    $full_indexdir = $argv[0];
-    $query = $argv[1];
-    $out_file = $argv[2];
+    if ($argc >= 3) {
+    $sort_field = $argv[2];
     }
-    else {
-    print STDERR "Usage: $PROGNAME full-index-dir [query] [outfile]\n";
-    exit 1;
+    if ($argc >= 4) {
+    $out_file = $argv[3];
     }
-    open_java_lucene($full_indexdir, $out_file);
+    open_java_lucene($full_indexdir, $sort_field, $out_file);
 
     if (defined $query) {

trunk/gsdl/src/java/org/nzdl/gsdl/LuceneWrap/GS2LuceneQuery.java

@@ -24 +24 @@
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.Searcher;
+import org.apache.lucene.search.Sort;
 
 
@@ -31 +32 @@
     {
     if (args.length == 0) {
-        System.out.println("Usage: GS2LuceneQuery <index directory>");
+        System.out.println("Usage: GS2LuceneQuery <index directory> (<sort field>)");
         return;
     }
@@ -37 +38 @@
         try {
         Searcher searcher = new IndexSearcher(args[0]);
+        Sort sorter = new Sort();
+        if (args.length > 1) {
+        sorter = new Sort(args[1]);
+        }
         Analyzer analyzer = new StandardAnalyzer();
         IndexReader reader = ((IndexSearcher) searcher).getIndexReader();
@@ -55 +60 @@
 
         // Perform the query
-        Hits hits = searcher.search(query);
+        Hits hits = searcher.search(query, sorter);
         System.out.println("<ResultSet>");
         System.out.println("  <QueryString>" + query_string + "</QueryString>");

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

@@ -24 +24 @@
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.Searcher;
+import org.apache.lucene.search.Sort;
 
 
@@ -31 +32 @@
     {
     if (args.length == 0) {
-        System.out.println("Usage: GS2LuceneQuery <index directory>");
+        System.out.println("Usage: GS2LuceneQuery <index directory> (<sort field>)");
         return;
     }
@@ -37 +38 @@
         try {
         Searcher searcher = new IndexSearcher(args[0]);
+        Sort sorter = new Sort();
+        if (args.length > 1) {
+        sorter = new Sort(args[1]);
+        }
         Analyzer analyzer = new StandardAnalyzer();
         IndexReader reader = ((IndexSearcher) searcher).getIndexReader();
@@ -55 +60 @@
 
         // Perform the query
-        Hits hits = searcher.search(query);
+        Hits hits = searcher.search(query, sorter);
         System.out.println("<ResultSet>");
         System.out.println("  <QueryString>" + query_string + "</QueryString>");