Changeset 16264

Timestamp:

2008-07-01T17:37:42+12:00 (16 years ago)

Author:

mdewsnip

Message:

Changed "-create" to "-removeold", and removed the non-functional "-remove <OID>" option.

File:

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

gsdl/trunk/bin/script/lucene_passes.pl

@@ -40 +40 @@
 sub open_java_lucene
 {
-  my ($doc_tag_level,$full_builddir,$indexdir,$create,$verbosity) = @_;
+  my ($doc_tag_level,$full_builddir,$indexdir,$java_lucene_options) = @_;
 
   my $bin_java = &util::filename_cat($ENV{'GSDLHOME'},"bin","java");
@@ -46 +46 @@
 
   my $java_lucene = "java -classpath \"$classpath\" org.greenstone.LuceneWrapper.GS2LuceneIndexer";
-  my $cmd_options = "$create -verbosity $verbosity";
-  my $java_cmd = "$java_lucene $cmd_options $doc_tag_level \"$full_builddir\" $indexdir";
+  my $java_cmd = "$java_lucene $java_lucene_options $doc_tag_level \"$full_builddir\" $indexdir";
 
   open (PIPEOUT, "| $java_cmd") or die "lucene_passes.pl - couldn't run $java_cmd\n";
@@ -142 +141 @@
 #  *  the command line of the java wrapper.
 #  *
-#  *  Do not set -create and -remove at the same time, although -create is
-#  *  required for -remove, -remove will set it it's self, if you set -create
-#  *  after -remove the create will be ignored.
-#  *
-#  *  @version 2.0 Added support for removing documents from the index by John Rowe
-#  *
 #  *  @author John Rowe, DL Consulting
 #  */
@@ -155 +148 @@
   my $argc = scalar(@argv);
 
-  my $create = "";
-  my $verbosity = 1;
-
+  my $java_lucene_options = "";
   my @filtered_argv = ();
 
@@ -166 +157 @@
       my $option = $1;
 
-      # -create causes build to be incremental
-      if ($option eq ("create")) {
-        print STDERR "\n\n-create set\n";
-        $create = "-create";
+      # -removeold causes the existing index to be overwritten
+      if ($option eq "removeold") {
+        print STDERR "\n-removeold set\n";
+        $java_lucene_options .= "-removeold ";
       }
-      # In a blinding flash of unintuitiveness -remove causes
-      # -create to be set (we don't want to remove the old indexes)
-      elsif($option eq "remove")
-      {
-        # Look at the next arg for the oid and if that doesn't exist then
-        $i++;
-        if(!defined $argv[$i])
-        {
-          print STDERR "Remove was specified but the OID was not specified";
-          die "\n\nCannot continue";
-        }
-        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 '$oid'";
-      }
-
-      # -verbosity num
+      # -verbosity <num>
       elsif ($option eq "verbosity") {
         $i++;
-        if ($i<$argc) {
-          $verbosity = $argv[$i];
+        if ($i<$argc)
+    {
+      $java_lucene_options .= "-verbosity " . $argv[$i];
         }
       }
@@ -209 +183 @@
 
   if ($filtered_argc < 4) {
-    print STDERR "Usage: lucene_passes.pl [-create|-verbosity num] \"text\"|\"index\" doc-tag-level build-dir index-name\n";
+    print STDERR "Usage: lucene_passes.pl [-removeold|-verbosity num] \"text\"|\"index\" doc-tag-level build-dir index-name\n";
     exit 1;
   }
@@ -221 +195 @@
   # 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);
+    open_java_lucene($doc_tag_level, $full_builddir, $indexdir, $java_lucene_options);
   }