Changeset 12373

Timestamp:

2006-08-02T13:19:10+12:00 (18 years ago)

Author:

mdewsnip

Message:

Bit tidy up, particularly regarding command-line option parsing.

File:

• trunk/gsdl/bin/script/lucene_query.pl (modified) (4 diffs)

trunk/gsdl/bin/script/lucene_query.pl

@@ -31 +31 @@
     die "GSDLOS not set\n" unless defined $ENV{'GSDLOS'};
     unshift (@INC, "$ENV{'GSDLHOME'}/perllib");
-    unshift (@INC, "$ENV{'GSDLHOME'}/perllib/cpan");
-    unshift (@INC, "$ENV{'GSDLHOME'}/perllib/plugins");
-    unshift (@INC, "$ENV{'GSDLHOME'}/perllib/classify");
 }
 
+use strict;
 use util;
 
-sub full_indexdir 
-{
-    my ($col_name,$indexdir) = @_;
 
-    my $full_indexdir
-    = &util::filename_cat($ENV{'GSDLHOME'},"collect",$col_name,"index",
-                  $indexdir);
-
-    return $full_indexdir;
-}
+my $PROGNAME = $0;
+$PROGNAME =~ s/^.*\/(.*)$/$1/;
 
 
@@ -53 +44 @@
 {
     my $full_indexdir = shift(@_);
-    my $sort_field = 0;
-    my $dco = 0;
-    my $out_file = 0;
-    for ($i = 0; $i < scalar(@_); $i++)
-      {
-        if ($_[$i] eq "-sort")
-          {
-            $i++;
-            $sort_field = $_[$i];
-          }
-        elsif ($_[$i] eq "-dco")
-          {
-            $i++;
-            $dco = $_[$i];
-          }
-        else
-          {
-            $out_file = $_[$i];
-          }
-      }
+    my $fuzzy = shift(@_);
+    my $sort_field = shift(@_);
+    my $dco = shift(@_);
+    my $out_file = shift(@_);
 
+    my $classpath = &util::filename_cat($ENV{'GSDLHOME'}, "bin", "java", "LuceneWrap.jar");
+    my $java_lucene = "java -classpath \"$classpath\" org.nzdl.gsdl.LuceneWrap.GS2LuceneQuery";
 
-    my $bin_java = &util::filename_cat($ENV{'GSDLHOME'},"bin","java");
-    my $classpath = &util::filename_cat($bin_java,"LuceneWrap.jar");
-
-    my $java_lucene = "java -classpath \"$classpath\" org.nzdl.gsdl.LuceneWrap.GS2LuceneQuery";
-    my $java_cmd = "$java_lucene";
-
+    my $cmd = "| " . $java_lucene . " \"" . $full_indexdir . "\"";
+    if (defined($fuzzy)) {
+        $cmd .= " -fuzzy";
+    }
+    if (defined($sort_field)) {
+        $cmd .= " -sort " . $sort_field;
+    }
+    if (defined($dco)) {
+        $cmd .= " -dco " . $dco;
+    }
     if (defined($out_file)) {
-    $out_file = " > \"".$out_file. "\"";
-    } else {
-    $out_file = "";
+    $cmd .= " > \"" . $out_file . "\"";
     }
-
-    my $cmd = "| " . $java_cmd . " \"" . $full_indexdir . "\"";
-    if ($sort_field)
-      {
-        $cmd .= " -sort " . $sort_field;
-      }
-    if ($dco)
-      {
-        $cmd .= " -dco " . $dco;
-      }
-
-    print STDERR $cmd . "\n";
+    # print STDERR $cmd . "\n";
 
     if (!open (PIPEOUT, $cmd)) {
-    die "$PROGNAME - couldn't run $java_cmd\n";
+    die "$PROGNAME - couldn't run $cmd\n";
     }
 }
@@ -113 +81 @@
     my (@argv) = @_;
     my $argc = scalar(@argv);
-
-    my $full_indexdir;
-    my $query = undef;
-    my $sort_field = undef;
-    my $out_file = undef;
     if ($argc == 0) {
-    print STDERR "Usage: $PROGNAME full-index-dir [query] [sort_field] [outfile]\n";
+    print STDERR "Usage: $PROGNAME full-index-dir [query] [-fuzzy] [-sort sort_field] [-dco AND|OR] [-out out_file]\n";
     exit 1;
     }
-    if ($argc >= 1) {
-    $full_indexdir = $argv[0];
+
+    my $full_indexdir = shift(@argv);
+    my $query = undef;
+    my $fuzzy = undef;
+    my $sort_field = undef;
+    my $dco = undef;
+    my $out_file = undef;
+    for (my $i = 0; $i < scalar(@argv); $i++)
+    {
+    if ($argv[$i] eq "-fuzzy") {
+        $fuzzy = 1;
+    }
+        elsif ($argv[$i] eq "-sort") {
+            $i++;
+            $sort_field = $argv[$i];
+    }
+        elsif ($argv[$i] eq "-dco") {
+            $i++;
+            $dco = $argv[$i];
+    }
+        elsif ($argv[$i] eq "-out") {
+            $i++;
+            $out_file = $argv[$i];
+    }
+        else {
+            $query = $argv[$i];
+    }
     }
-    if ($argc >= 2) {
-    $query = $argv[1];
-    }
-    if ($argc >= 3) {
-    $sort_field = $argv[2];
-    }
-    if ($argc >= 4) {
-    $out_file = $argv[3];
-    }
-    open_java_lucene($full_indexdir, $sort_field, $out_file);
+
+    open_java_lucene($full_indexdir, $fuzzy, $sort_field, $dco, $out_file);
 
     if (defined $query) {
@@ -148 +128 @@
 }
 
-$PROGNAME = $0;
-$PROGNAME =~ s/^.*\/(.*)$/$1/;
-
 &main(@ARGV);
-