Changeset 28402 for main/trunk/greenstone2/bin

Timestamp:

2013-10-14T10:12:55+13:00 (11 years ago)

Author:

davidb

Message:

Changes to support running these scripts from Cygwin

Location:

main/trunk/greenstone2/bin/script

Files:

• jdb2txt.pl (modified) (1 diff)
• lucene_passes.pl (modified) (2 diffs)

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

@@ -63 +63 @@
 my $jdbmwrapper_jar = &util::filename_cat($ENV{'GSDLHOME'},"bin","java","JDBMWrapper.jar");
 
-&util::envvar_prepend("CLASSPATH",$jdbm_jar);
-&util::envvar_prepend("CLASSPATH",$jdbmwrapper_jar);
 
-my $cmd = "java Jdb2Txt " . join(" ", map {$_ = "\"$_\""} @ARGV);
+my $classpath = &util::pathname_cat($jdbmwrapper_jar,$jdbm_jar);
+
+if ($^O eq "cygwin") {
+    # Away to run a java program, using a binary that is native to Windows, so need
+    # Windows directory and path separators
+    
+    $classpath = `cygpath -wp "$classpath"`;
+    chomp($classpath);
+    $classpath =~ s%\\%\\\\%g;    
+}
+
+#&util::envvar_prepend("CLASSPATH",$jdbm_jar);
+#&util::envvar_prepend("CLASSPATH",$jdbmwrapper_jar);
+
+my $cmd = "java -cp \"$classpath\" Jdb2Txt " . join(" ", map {$_ = "\"$_\""} @ARGV);
 
 if (system($cmd)!=0) {

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

@@ -44 +44 @@
   # 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");
+  my $classpath = &FileUtils::javaFilenameConcatenate($bin_java,"LuceneWrapper3.jar");
   if (!-f $classpath)
   {
       # No, so use the Greenstone one
       $bin_java = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"bin","java");
-      $classpath = &FileUtils::filenameConcatenate($bin_java,"LuceneWrapper3.jar");
+      $classpath = &FileUtils::javaFilenameConcatenate($bin_java,"LuceneWrapper3.jar");
       if(!-f $classpath) {
       die "***** ERROR: $classpath does not exist\n";     
@@ -57 +57 @@
   my $java_lucene = "java -classpath \"$classpath\" org.greenstone.LuceneWrapper3.GS2LuceneIndexer";
   my $java_cmd = "$java_lucene $java_lucene_options $doc_tag_level \"$full_builddir\" $indexdir";
+
+##  print STDERR "**** lucene java cmd = $java_cmd\n";
 
   open (PIPEOUT, "| $java_cmd") or die "lucene_passes.pl - couldn't run $java_cmd\n";