Changeset 27331 for main/trunk/greenstone2/bin/script

Timestamp:

2013-05-14T11:19:43+12:00 (11 years ago)

Author:

kjdon

Message:

upgrading gs2 to use lucene 3 instead of lucene2

Location:

main/trunk/greenstone2/bin/script

Files:

• lucene_passes.pl (modified) (6 diffs)
• lucene_query.pl (modified) (1 diff)

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

@@ -36 +36 @@
 use strict;
 use util;
-
+use FileUtils;
 
 sub open_java_lucene
@@ -42 +42 @@
   my ($doc_tag_level,$full_builddir,$indexdir,$java_lucene_options) = @_;
 
-  # 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");
+  # Is there a collection-specific bin/java/LuceneWrapper3.jar file?
+  my $bin_java = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'},"bin","java");
+  my $classpath = &FileUtils::filenameConcatenate($bin_java,"LuceneWrapper3.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");
+      $bin_java = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"bin","java");
+      $classpath = &FileUtils::filenameConcatenate($bin_java,"LuceneWrapper3.jar");
       if(!-f $classpath) {
       die "***** ERROR: $classpath does not exist\n";     
@@ -55 +55 @@
   }
 
-  my $java_lucene = "java -classpath \"$classpath\" org.greenstone.LuceneWrapper.GS2LuceneIndexer";
+  my $java_lucene = "java -classpath \"$classpath\" org.greenstone.LuceneWrapper3.GS2LuceneIndexer";
   my $java_cmd = "$java_lucene $java_lucene_options $doc_tag_level \"$full_builddir\" $indexdir";
 
@@ -74 +74 @@
     my $dir_sep = &util::get_os_dirsep();
 
-    my $full_output_filename = &util::filename_cat($full_textdir,$output_filename);
+    my $full_output_filename = &FileUtils::filenameConcatenate($full_textdir,$output_filename);
     my ($full_output_dir) = ($full_output_filename =~ m/^(.*$dir_sep)/x);
-    &util::mk_all_dir($full_output_dir);
+    &FileUtils::makeAllDirectories($full_output_dir);
 
     open(DOCOUT,">$full_output_filename")
@@ -93 +93 @@
 
     my $full_output_filename
-    = &util::filename_cat($full_textdir,$output_filename);
+    = &FileUtils::filenameConcatenate($full_textdir,$output_filename);
 
     `gzip $full_output_filename`;
@@ -208 +208 @@
 
   print STDERR "Monitoring for input!\n";
-  my $full_textdir = &util::filename_cat($full_builddir,"text");
+  my $full_textdir = &FileUtils::filenameConcatenate($full_builddir,"text");
   monitor_xml_stream($mode, $full_textdir);
 

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

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