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

Timestamp:

2012-05-01T15:53:54+12:00 (12 years ago)

Author:

ak19

Message:

Correction to previous commit: could not call a subroutine from a BEGIN block (in this case, could not call the new get_java_command() subroutine). But as subroutines in other files that are included can be called from BEGIN, I've added get_java_command as a utility function in GS' perllib/util.pm and this now gets called instead.

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 $java = &get_java_command();     
+        my $java = &util::get_java_command();
+            
         my $cmd = "$java -version";
         if ($ENV{'GSDLOS'} =~ /^windows/i) {
@@ -122 +123 @@
     my $gextpb_home = $ENV{'GEXT_PDFBOX'};
     my $pbajar = &util::filename_cat($gextpb_home,"lib","java","pdfbox-app.jar");
-    my $java = &get_java_command();
+    my $java = &util::get_java_command();
     my $launch_cmd = "$java -cp \"$pbajar\" -Dline.separator=\"<br />\" org.apache.pdfbox.ExtractText";
     
@@ -238 +239 @@
 }
 
-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;
-}
-
 
 1;