Changeset 32184 for main/trunk/greenstone2/perllib/plugins/ImageConverter.pm

Timestamp:

2018-05-21T12:10:36+12:00 (6 years ago)

Author:

kjdon

Message:

change the return values of convert to match tmp_area_convert_file in AutoLoadConverters - the first return value is now a 1/0 indicating whether the conversion succeeded or not.

File:

• main/trunk/greenstone2/perllib/plugins/ImageConverter.pm (modified) (4 diffs)

main/trunk/greenstone2/perllib/plugins/ImageConverter.pm

@@ -263 +263 @@
     if ($converttotype ne "" && $filename_full_path !~ m/$converttotype$/) {
 #   #    $doc_obj->add_utf8_metadata($section, "Image", $utf8_filename_meta);
-    my ($result, $converted_filename_full_path)
+    my ($result, $result_str, $converted_filename_full_path)
         = $self->convert($filename_full_path, $converttotype, "", "CONVERTTYPE");
 
+    if (!defined $result || $result == 0) {
+        # conversion error
+        print $outhandle "ImageConverter:convert error\n";
+        print $outhandle "$@\n";
+        if (defined $result_str) {
+        print $outhandle "$result_str\n";
+        }
+        return 0;
+    }
+        
     $type = $converttotype;
     $filename_full_path = $converted_filename_full_path;
@@ -383 +393 @@
 
     # Generate the thumbnail with convert
-    my ($result,$thumbnailfile) 
+    my ($result, $result_str,$thumbnailfile) 
     = $self->convert($original_file, $thumbnailtype, "-geometry $thumbnailsize" . "x$thumbnailsize", "THUMB");
     
@@ -429 +439 @@
     
     # make the screenview image
-    my ($result,$screenviewfilename) 
+    my ($result,$result_str, $screenviewfilename) 
     = $self->convert($original_file, $screenviewtype, $scale_option, "SCREEN");    
     
@@ -507 +517 @@
     = $self->autorun_general_cmd($convert_command,$source_file_path,$target_file_path,$print_info);
 
-    return ($result,$target_file_path);
+    if ($had_error) {
+    return (0, $result, $target_file_path);
+    }
+    
+    return (1, $result,$target_file_path);
 }