Changeset 19764

Timestamp:

2009-06-08T17:00:58+12:00 (15 years ago)

Author:

mdewsnip

Message:

Changed to look for a collection-specific bin/java/LuceneWrapper.jar file before using the Greenstone one.

File:

• gsdl/trunk/bin/script/lucene_passes.pl (modified) (1 diff)

gsdl/trunk/bin/script/lucene_passes.pl

@@ -42 +42 @@
   my ($doc_tag_level,$full_builddir,$indexdir,$java_lucene_options) = @_;
 
-  my $bin_java = &util::filename_cat($ENV{'GSDLHOME'},"bin","java");
+  # Is there a collection-specific bin/java/LuceneWrapper.jar file?
+  my $bin_java = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"bin","java");
   my $classpath = &util::filename_cat($bin_java,"LuceneWrapper.jar");
+  if (!-f $classpath)
+  {
+      # No, so use the Greenstone one
+      $bin_java = &util::filename_cat($ENV{'GSDLHOME'},"bin","java");
+      $classpath = &util::filename_cat($bin_java,"LuceneWrapper.jar");
+  }
 
   my $java_lucene = "java -classpath \"$classpath\" org.greenstone.LuceneWrapper.GS2LuceneIndexer";