Changeset 12987 for trunk/indexers

Timestamp:

2006-10-03T17:00:22+13:00 (18 years ago)

Author:

mdewsnip

Message:

You can now specify the query string as a command-line argument to GS2LuceneQuery.

File:

• trunk/indexers/lucene-gs/src/org/greenstone/LuceneWrapper/GS2LuceneQuery.java (modified) (4 diffs)

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

@@ -55 +55 @@
     {
     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]");
+        System.out.println("Usage: GS2LuceneQuery <index directory> [-fuzziness value] [-filter filter_string] [-sort sort_field] [-dco AND|OR] [-startresults number -endresults number] [query]");
         return;
     }
@@ -67 +67 @@
         QueryParser query_parser_no_stop_words = new QueryParser(TEXTFIELD, new StandardAnalyzer(new String[] { }));
 
+        String query_string = null;
+
+        // Parse the command-line arguments
             for (int i = 1; i < args.length; i++) {
         if (args[i].equals("-sort")) {
@@ -95 +98 @@
             end_results = Integer.parseInt(args[i]);
             }
+        }
+        else {
+            query_string = args[i];
         }
         }
@@ -104 +110 @@
         }
 
-        BufferedReader in = new BufferedReader(new InputStreamReader(System.in, "UTF-8"));
-        while (true) {
-        // Read the query from STDIN
-        String query_string = in.readLine();
-        if (query_string == null || query_string.length() == -1) {
-            break;
-        }
-
+        // The query string has been specified as a command-line argument
+        if (query_string != null) {
         runQuery(searcher, reader, query_parser, query_parser_no_stop_words, query_string);
+        }
+
+        // Read queries from STDIN
+        else {
+        BufferedReader in = new BufferedReader(new InputStreamReader(System.in, "UTF-8"));
+        while (true) {
+            // Read the query from STDIN
+            query_string = in.readLine();
+            if (query_string == null || query_string.length() == -1) {
+            break;
+            }
+
+            runQuery(searcher, reader, query_parser, query_parser_no_stop_words, query_string);
+        }
         }
     }