Changeset 24601 for main/trunk/greenstone2/perllib

Timestamp:

2011-09-15T18:28:42+12:00 (13 years ago)

Author:

ak19

Message:

Dr Bainbridge suggested corrections to commits of revision 24600: 1. gs-magick.pl: close call on Pipe only if successfully opened. 2. Command_status always needs to be shifted and turned into its signed value for display in convertutil.pm. 3. giget calls to imagemagick more eficient: doesn't call identify twice, but just once since the exit code and output to STDOUT can both be inspected after just one call. Moreover, exit code needed to be tested for equality against 0, not whether it is greater than 0, so no shifting and converting to signed value required.

Location:

main/trunk/greenstone2/perllib

Files:

• convertutil.pm (modified) (1 diff)
• giget.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/convertutil.pm

@@ -176 +176 @@
         $had_error = 1;
         
-        # for imagemagick commands that go via gs-magick.pl, need to shift exit code by 8 and then 
-        # convert to its signed value to get the actual exit code that imagemagick had emitted.
-        my $signed_cmd_status = $command_status;
-        $signed_cmd_status >>= 8;
-        $signed_cmd_status = (($signed_cmd_status & 0x80) ? -(0x100 - ($signed_cmd_status & 0xFF)) : $signed_cmd_status);   
-
-        print $outhandle "Error: processing command failed.  Exit status $command_status (signed value: $signed_cmd_status)\n";
+        # for commands that go via an intermediate layer (like commands to imagemagick go 
+        # through gs-magick.pl), need to shift exit code by 8 and then convert to its 
+        # signed value to get the actual exit code that imagemagick had emitted.
+        $command_status >>= 8;
+        $command_status = (($command_status & 0x80) ? -(0x100 - ($command_status & 0xFF)) : $command_status);   
+
+        print $outhandle "Error: processing command failed.  Exit status $command_status\n";
 
         if ($verbosity >= 3) {

main/trunk/greenstone2/perllib/giget.pm

@@ -152 +152 @@
         }
         else {
+        my $command = "\"".&util::get_perl_exec()."\" -S gs-magick.pl identify \"$output_fname\" 2>&1";
+        my $result = `$command`;
+        
+        my $status = $?;
         # need to shift the $? exit code returned by system() by 8 bits and
         # then convert it to a signed value to work out whether it is indeed > 0
-        my $status = system("\"".&util::get_perl_exec()."\" -S gs-magick.pl identify \"$output_fname\"");
-        $status >>= 8;
-        $status = (($status & 0x80) ? -(0x100 - ($status & 0xFF)) : $status);
-
-        if($status > 0 ) {
+        #$status >>= 8;
+        #$status = (($status & 0x80) ? -(0x100 - ($status & 0xFF)) : $status);
+        #if($status > 0 ) {
+        if($status != 0 ) { 
             print STDERR "**** NOT JPEG: output_fname \n";
             unlink $output_fname;
         } 
         else {
-            my $command = "\"".&util::get_perl_exec()."\" -S gs-magick.pl identify \"$output_fname\" 2>&1";
-            my $result = `$command`;
             
             my $type =   'unknown';