Changeset 9219

Timestamp:

2005-03-01T12:12:03+13:00 (19 years ago)

Author:

kjdon

Message:

added a third arg - a filename to output the result of the java process too - needed for running this under windows

File:

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

trunk/gsdl/bin/script/lucene_query.pl

@@ -52 +52 @@
 sub open_java_lucene
 {
-    my ($full_indexdir) = @_;
-
+    my ($full_indexdir, $out_file) = @_;
     my $bin_java = &util::filename_cat($ENV{'GSDLHOME'},"bin","java");
     my $classpath = &util::filename_cat($bin_java,"LuceneWrap.jar");
@@ -60 +59 @@
     my $java_cmd = "$java_lucene";
 
-    if (!open (PIPEOUT, "| $java_cmd $full_indexdir")) {
+    if ($out_file =~ /\w/) {
+    $out_file = " > \"".$out_file. "\"";
+    } else {
+    $out_file = "";
+    }
+    if (!open (PIPEOUT, "| $java_cmd $full_indexdir $out_file")) {
     die "$PROGNAME - couldn't run $java_cmd\n";
     }
+
 }
 
@@ -77 +82 @@
     my $full_indexdir;
     my $query = undef;
-
+    my $out_file = undef;
     if ($argc==1) {
     $full_indexdir = $argv[0];
@@ -84 +89 @@
     $full_indexdir = $argv[0];
     $query = $argv[1];
-
-#   my $col_name = $argv[0];
-#   my $indexdir = $argv[1];
-#   $full_indexdir = full_indexdir($col_name,$indexdir);
+    }
+    elsif  ($argc==3) {
+    $full_indexdir = $argv[0];
+    $query = $argv[1];
+    $out_file = $argv[2];
     }
     else {
-    print STDERR "Usage: $PROGNAME [colname index]|[full-index-dir]\n";
+    print STDERR "Usage: $PROGNAME full-index-dir [query] [outfile]\n";
     exit 1;
     }
 
 
-    open_java_lucene($full_indexdir);
+    open_java_lucene($full_indexdir, $out_file);
 
     if (defined $query) {