Changeset 25511 for gs2-extensions/pdf-box/trunk/java

Timestamp:

2012-05-01T14:29:29+12:00 (12 years ago)

Author:

ak19

Message:

When running the java -version test, first try to use the JRE included in the greenstone binary before attempting to use a system java, because those who install GS from binary may not have their own JDK or JRE installed. Thanks to Helen Bucksey for finding this bug.

File:

• gs2-extensions/pdf-box/trunk/java/perllib/plugins/PDFBoxConverter.pm (modified) (3 diffs)

gs2-extensions/pdf-box/trunk/java/perllib/plugins/PDFBoxConverter.pm

@@ -66 +66 @@
         # If `java -version` is run however, %ERRORLEVEL% returned is 0 if java is 
         # installed, regardless of whether the JDK version is 1.6* or 1.7*.
-        my $cmd = "java -version";
+        my $java = &get_java_command();     
+        my $cmd = "$java -version";
         if ($ENV{'GSDLOS'} =~ /^windows/i) {
         $cmd .= " >nul 2>&1"; # java 2>&1 >null or java >null 2>&1 both work (%ERRORLEVEL% is 0)
@@ -120 +121 @@
     if ($pdfbox_conversion_available) {
     my $gextpb_home = $ENV{'GEXT_PDFBOX'};
-    my $pbajar = &util::filename_cat($gextpb_home,"lib","java","pdfbox-app.jar");   
-    my $launch_cmd = "java -cp \"$pbajar\" -Dline.separator=\"<br />\" org.apache.pdfbox.ExtractText";
+    my $pbajar = &util::filename_cat($gextpb_home,"lib","java","pdfbox-app.jar");
+    my $java = &get_java_command();
+    my $launch_cmd = "$java -cp \"$pbajar\" -Dline.separator=\"<br />\" org.apache.pdfbox.ExtractText";
     
     $self->{'pdfbox_launch_cmd'} = $launch_cmd;
@@ -236 +238 @@
 }
 
+sub get_java_command {
+    my $java = "java";
+    if(defined $ENV{'GSDLHOME'}) { # should be, as this script would be launched from the cmd line 
+                               # after running setup.bat or from GLI which also runs setup.bat
+    my $java_bin = &util::filename_cat($ENV{'GSDLHOME'},"packages","jre","bin");
+    if(-d $java_bin) {
+        $java = &util::filename_cat($java_bin,"java");
+    }
+    }
+    return $java;
+}