Changeset 12981 for trunk/indexers

Timestamp:

2006-10-03T16:44:17+13:00 (18 years ago)

Author:

mdewsnip

Message:

Tidied up command-line option parsing in preparation for allowing the query string to be specified as a command-line option.

File:

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

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

@@ -43 +43 @@
     static private String[] stop_words = StandardAnalyzer.STOP_WORDS;
 
+    // Command-line options
+    static private String fuzziness = null;
+    static private Filter filter = null;
+    static private Sort sorter = new Sort();
+    static private String default_conjuction_operator = "OR";
+    static private int start_results = 1;
+    static private int end_results = Integer.MAX_VALUE;
+
 
     static public void main (String args[])
@@ -59 +67 @@
         QueryParser query_parser_no_stop_words = new QueryParser(TEXTFIELD, new StandardAnalyzer(new String[] { }));
 
-        Sort sorter = new Sort();
-        Filter filter = null;
-        String fuzziness = null;
-
-        // Paging
-        int start_results = 1;
-        int end_results = Integer.MAX_VALUE;
-
-            // New code to allow the default conjunction operator to be
-            // definable
-            String default_conjuction_operator = "OR";
             for (int i = 1; i < args.length; i++) {
         if (args[i].equals("-sort")) {
@@ -75 +72 @@
             sorter = new Sort(args[i]);
         }
-        if (args[i].equals("-filter")) {
+        else if (args[i].equals("-filter")) {
             i++;
             filter = parseFilterString(args[i]);
         }
-        if (args[i].equals("-dco")) {
+        else if (args[i].equals("-dco")) {
             i++;
             default_conjuction_operator = args[i];
         }
-        if (args[i].equals("-fuzziness")) {
+        else if (args[i].equals("-fuzziness")) {
             i++;
             fuzziness = args[i];
         }
-        if (args[i].equals("-startresults")) {
+        else if (args[i].equals("-startresults")) {
             i++;
             if (args[i].matches("\\d+")) {
@@ -93 +90 @@
             }
         }
-        if (args[i].equals("-endresults")) {
+        else if (args[i].equals("-endresults")) {
             i++;
             if (args[i].matches("\\d+")) {