Changeset 25798

Timestamp:

2012-06-19T21:37:38+12:00 (12 years ago)

Author:

ak19

Message:

Fixing bug where on CentOS Linux a call to identify returns 256 and is not the error code for when Imagemagick is not found (on Linux -1 is the error code). Oddly the same issue did not occur on the Ubuntu.

File:

• main/trunk/greenstone2/bin/script/gsConvert.pl (modified) (1 diff)

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

@@ -838 +838 @@
     $status >>= 8;
     $status = (($status & 0x80) ? -(0x100 - ($status & 0xFF)) : $status);   
-    if ($status == -1 || $status == 1) { #if ($status == -1 || $status == 256) {
+    if (($ENV{'GSDLOS'} ne "windows" && $status == -1) || ($ENV{'GSDLOS'} eq "windows" && $status == 1)) { 
+        # if ($status == -1 || $status == 1) #if ($status == -1 || $status == 256) {
         #ImageMagick is not installed, thus the convert utility is not available. 
-        print STDERR "*** ImageMagick is not installed, the convert utility is not available. Unable to convert PDF/PS to images\n";
+        print STDERR "*** ImageMagick is not installed, the convert utility is not available. Unable to convert PDF/PS to images. Status: $status\n";
         return 0;
     }