Changeset 29144 for main/trunk/greenstone2

Timestamp:

2014-07-16T21:22:44+12:00 (10 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:

• bin/script/lucene_passes.pl (modified) (2 diffs)
• bin/script/lucene_query.pl (modified) (1 diff)
• perllib/lucenebuilder.pm (modified) (1 diff)

main/trunk/greenstone2/bin/script/lucene_passes.pl

@@ -42 +42 @@
   my ($doc_tag_level,$full_builddir,$indexdir,$java_lucene_options) = @_;
 
-  # Is there a collection-specific bin/java/LuceneWrapper3.jar file?
+  # Is there a collection-specific bin/java/LuceneWrapper4.jar file?
   my $bin_java = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'},"bin","java");
-  my $classpath = &FileUtils::javaFilenameConcatenate($bin_java,"LuceneWrapper3.jar");
+  my $classpath = &FileUtils::javaFilenameConcatenate($bin_java,"LuceneWrapper4.jar");
   if (!-f $classpath)
   {
       # No, so use the Greenstone one
       $bin_java = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"bin","java");
-      $classpath = &FileUtils::javaFilenameConcatenate($bin_java,"LuceneWrapper3.jar");
+      $classpath = &FileUtils::javaFilenameConcatenate($bin_java,"LuceneWrapper4.jar");
       if(!-f $classpath) {
       die "***** ERROR: $classpath does not exist\n";     
@@ -57 +57 @@
   $full_builddir = &util::makeFilenameJavaCygwinCompatible($full_builddir);
 
-  my $java_lucene = "java -classpath \"$classpath\" org.greenstone.LuceneWrapper3.GS2LuceneIndexer";
+  my $java_lucene = "java -classpath \"$classpath\" org.greenstone.LuceneWrapper4.GS2LuceneIndexer";
   my $java_cmd = "$java_lucene $java_lucene_options $doc_tag_level \"$full_builddir\" $indexdir";
 

main/trunk/greenstone2/bin/script/lucene_query.pl

@@ -66 +66 @@
 
     my $java = &get_java_path();
-    my $classpath = &util::filename_cat($ENV{'GSDLHOME'}, "bin", "java", "LuceneWrapper3.jar");
-    my $java_lucene = "\"$java\" -classpath \"$classpath\" org.greenstone.LuceneWrapper3.GS2LuceneQuery";
+    my $classpath = &util::filename_cat($ENV{'GSDLHOME'}, "bin", "java", "LuceneWrapper4.jar");
+    my $java_lucene = "\"$java\" -classpath \"$classpath\" org.greenstone.LuceneWrapper4.GS2LuceneQuery";
 
     my $cmd = "| " . $java_lucene . " \"" . $full_indexdir . "\"";

main/trunk/greenstone2/perllib/lucenebuilder.pm

@@ -65 +65 @@
     # If ENABLE_LUCENE was turned off during GS compilation, then we won't be able to
     # continue. Check for existence of LuceneWrapper to see if Lucene was disabled.
-    my $lucene = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"bin","java","LuceneWrapper3.jar");
+    my $lucene = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"bin","java","LuceneWrapper4.jar");
     if (! -f $lucene) {
     die "***** ERROR: $lucene does not exist\n";