Changeset 29144
- Timestamp:
- 2014-07-16T21:22:44+12:00 (10 years ago)
- Location:
- main/trunk/greenstone2
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/bin/script/lucene_passes.pl
r28461 r29144 42 42 my ($doc_tag_level,$full_builddir,$indexdir,$java_lucene_options) = @_; 43 43 44 # Is there a collection-specific bin/java/LuceneWrapper 3.jar file?44 # Is there a collection-specific bin/java/LuceneWrapper4.jar file? 45 45 my $bin_java = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'},"bin","java"); 46 my $classpath = &FileUtils::javaFilenameConcatenate($bin_java,"LuceneWrapper 3.jar");46 my $classpath = &FileUtils::javaFilenameConcatenate($bin_java,"LuceneWrapper4.jar"); 47 47 if (!-f $classpath) 48 48 { 49 49 # No, so use the Greenstone one 50 50 $bin_java = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"bin","java"); 51 $classpath = &FileUtils::javaFilenameConcatenate($bin_java,"LuceneWrapper 3.jar");51 $classpath = &FileUtils::javaFilenameConcatenate($bin_java,"LuceneWrapper4.jar"); 52 52 if(!-f $classpath) { 53 53 die "***** ERROR: $classpath does not exist\n"; … … 57 57 $full_builddir = &util::makeFilenameJavaCygwinCompatible($full_builddir); 58 58 59 my $java_lucene = "java -classpath \"$classpath\" org.greenstone.LuceneWrapper 3.GS2LuceneIndexer";59 my $java_lucene = "java -classpath \"$classpath\" org.greenstone.LuceneWrapper4.GS2LuceneIndexer"; 60 60 my $java_cmd = "$java_lucene $java_lucene_options $doc_tag_level \"$full_builddir\" $indexdir"; 61 61 -
main/trunk/greenstone2/bin/script/lucene_query.pl
r27331 r29144 66 66 67 67 my $java = &get_java_path(); 68 my $classpath = &util::filename_cat($ENV{'GSDLHOME'}, "bin", "java", "LuceneWrapper 3.jar");69 my $java_lucene = "\"$java\" -classpath \"$classpath\" org.greenstone.LuceneWrapper 3.GS2LuceneQuery";68 my $classpath = &util::filename_cat($ENV{'GSDLHOME'}, "bin", "java", "LuceneWrapper4.jar"); 69 my $java_lucene = "\"$java\" -classpath \"$classpath\" org.greenstone.LuceneWrapper4.GS2LuceneQuery"; 70 70 71 71 my $cmd = "| " . $java_lucene . " \"" . $full_indexdir . "\""; -
main/trunk/greenstone2/perllib/lucenebuilder.pm
r28954 r29144 65 65 # If ENABLE_LUCENE was turned off during GS compilation, then we won't be able to 66 66 # continue. Check for existence of LuceneWrapper to see if Lucene was disabled. 67 my $lucene = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"bin","java","LuceneWrapper 3.jar");67 my $lucene = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"bin","java","LuceneWrapper4.jar"); 68 68 if (! -f $lucene) { 69 69 die "***** ERROR: $lucene does not exist\n";
Note:
See TracChangeset
for help on using the changeset viewer.