Changeset 16263

Timestamp:

2008-07-01T17:13:09+12:00 (15 years ago)

Author:

mdewsnip

Message:

Added "use strict" and fixed a few really ugly things.

File:

• gsdl/trunk/bin/script/lucene_passes.pl (modified) (9 diffs)

gsdl/trunk/bin/script/lucene_passes.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;
-use ghtml;
+
 
 sub open_java_lucene
@@ -50 +49 @@
   my $java_cmd = "$java_lucene $cmd_options $doc_tag_level \"$full_builddir\" $indexdir";
 
-  open (PIPEOUT, "| $java_cmd") or die "$PROGNAME - couldn't run $java_cmd\n";
-}
+  open (PIPEOUT, "| $java_cmd") or die "lucene_passes.pl - couldn't run $java_cmd\n";
+}
+
 
 sub close_java_lucene
@@ -58 +58 @@
 }
 
+
 sub save_xml_doc
 {
     my ($full_textdir,$output_filename,$doc_xml) = @_;
-    $dir_sep = &util::get_os_dirsep();
+
+    my $dir_sep = &util::get_os_dirsep();
 
     my $full_output_filename = &util::filename_cat($full_textdir,$output_filename);
@@ -76 +78 @@
 }
 
+
 sub compress_xml_doc
 {
@@ -85 +88 @@
     `gzip $full_output_filename`;
 }
+
 
 # This appears to be the callback that gets the xml stream during the
@@ -178 +182 @@
           die "\n\nCannot continue";
         }
-        $removeoid = $argv[$i];
-        print STDERR "\n\nWe're removing the document with id: '$removeoid'\n";
+        my $oid = $argv[$i];
+        print STDERR "\n\nWe're removing the document with id: '$oid'\n";
 
         # Now, to make sure this gets through to the Java executable
-        $create = "-create -remove '$removeoid'";
+        $create = "-create -remove '$oid'";
       }
 
@@ -205 +209 @@
 
   if ($filtered_argc < 4) {
-    print STDERR "Usage: $PROGNAME [-create|-verbosity num] \"text\"|\"index\" doc-tag-level build-dir index-name\n";
+    print STDERR "Usage: lucene_passes.pl [-create|-verbosity num] \"text\"|\"index\" doc-tag-level build-dir index-name\n";
     exit 1;
   }
@@ -215 +219 @@
 ###    print STDERR "**** ARGS = ", join(" ", @argv), "\n";
 
+  # We only need the Lucene handle opened if we are indexing the documents, not if we are just storing the text
+  if ($mode eq "index") {
+    open_java_lucene($doc_tag_level,$full_builddir,$indexdir,$create,$verbosity);
+  }
+
+  print STDERR "Monitoring for input!\n";
   my $full_textdir = &util::filename_cat($full_builddir,"text");
-
-  if ($mode eq "index") {
-# don't need the lucene stuff if we are just storing the docs
-    open_java_lucene($doc_tag_level,$full_builddir,$indexdir,$create,$verbosity);
-  }
-  print STDERR "Monitoring for input!\n";
   monitor_xml_stream($mode, $full_textdir);
+
   if ($mode eq "index") {
     close_java_lucene();
@@ -228 +233 @@
 }
 
-$PROGNAME = $0;
-$PROGNAME =~ s/^.*\/(.*)$/$1/;
 
 &main(@ARGV);
-