Changeset 19764

Show
Ignore:
Timestamp:
08.06.2009 17:00:58 (10 years ago)
Author:
mdewsnip
Message:

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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/bin/script/lucene_passes.pl

    r18456 r19764  
    4242  my ($doc_tag_level,$full_builddir,$indexdir,$java_lucene_options) = @_; 
    4343 
    44   my $bin_java = &util::filename_cat($ENV{'GSDLHOME'},"bin","java"); 
     44  # Is there a collection-specific bin/java/LuceneWrapper.jar file? 
     45  my $bin_java = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"bin","java"); 
    4546  my $classpath = &util::filename_cat($bin_java,"LuceneWrapper.jar"); 
     47  if (!-f $classpath) 
     48  { 
     49      # No, so use the Greenstone one 
     50      $bin_java = &util::filename_cat($ENV{'GSDLHOME'},"bin","java"); 
     51      $classpath = &util::filename_cat($bin_java,"LuceneWrapper.jar"); 
     52  } 
    4653 
    4754  my $java_lucene = "java -classpath \"$classpath\" org.greenstone.LuceneWrapper.GS2LuceneIndexer";