Changeset 29144


Ignore:
Timestamp:
07/16/14 21:22:44 (7 years ago)
Author:
ak19
Message:

Part of port from lucene3.3.0 to lucene4.7.2. LuceneWrapper related. Changes to gs2build/greenstone 2's perllib and bin/script lucene related perl scripts, to switch over from using Lucene3Wrapper to Lucene4Wrapper

Location:
main/trunk/greenstone2
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/bin/script/lucene_passes.pl

    r28461 r29144  
    4242  my ($doc_tag_level,$full_builddir,$indexdir,$java_lucene_options) = @_;
    4343
    44   # Is there a collection-specific bin/java/LuceneWrapper3.jar file?
     44  # Is there a collection-specific bin/java/LuceneWrapper4.jar file?
    4545  my $bin_java = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'},"bin","java");
    46   my $classpath = &FileUtils::javaFilenameConcatenate($bin_java,"LuceneWrapper3.jar");
     46  my $classpath = &FileUtils::javaFilenameConcatenate($bin_java,"LuceneWrapper4.jar");
    4747  if (!-f $classpath)
    4848  {
    4949      # No, so use the Greenstone one
    5050      $bin_java = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"bin","java");
    51       $classpath = &FileUtils::javaFilenameConcatenate($bin_java,"LuceneWrapper3.jar");
     51      $classpath = &FileUtils::javaFilenameConcatenate($bin_java,"LuceneWrapper4.jar");
    5252      if(!-f $classpath) {
    5353      die "***** ERROR: $classpath does not exist\n";     
     
    5757  $full_builddir = &util::makeFilenameJavaCygwinCompatible($full_builddir);
    5858
    59   my $java_lucene = "java -classpath \"$classpath\" org.greenstone.LuceneWrapper3.GS2LuceneIndexer";
     59  my $java_lucene = "java -classpath \"$classpath\" org.greenstone.LuceneWrapper4.GS2LuceneIndexer";
    6060  my $java_cmd = "$java_lucene $java_lucene_options $doc_tag_level \"$full_builddir\" $indexdir";
    6161
  • main/trunk/greenstone2/bin/script/lucene_query.pl

    r27331 r29144  
    6666
    6767    my $java = &get_java_path();
    68     my $classpath = &util::filename_cat($ENV{'GSDLHOME'}, "bin", "java", "LuceneWrapper3.jar");
    69     my $java_lucene = "\"$java\" -classpath \"$classpath\" org.greenstone.LuceneWrapper3.GS2LuceneQuery";
     68    my $classpath = &util::filename_cat($ENV{'GSDLHOME'}, "bin", "java", "LuceneWrapper4.jar");
     69    my $java_lucene = "\"$java\" -classpath \"$classpath\" org.greenstone.LuceneWrapper4.GS2LuceneQuery";
    7070
    7171    my $cmd = "| " . $java_lucene . " \"" . $full_indexdir . "\"";
  • main/trunk/greenstone2/perllib/lucenebuilder.pm

    r28954 r29144  
    6565    # If ENABLE_LUCENE was turned off during GS compilation, then we won't be able to
    6666    # continue. Check for existence of LuceneWrapper to see if Lucene was disabled.
    67     my $lucene = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"bin","java","LuceneWrapper3.jar");
     67    my $lucene = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"bin","java","LuceneWrapper4.jar");
    6868    if (! -f $lucene) {
    6969    die "***** ERROR: $lucene does not exist\n";     
Note: See TracChangeset for help on using the changeset viewer.