Changeset 32186 for main

Timestamp:

2018-05-21T12:13:17+12:00 (6 years ago)

Author:

kjdon

Message:

if the eval didn't work, all the return values might be undefined, so check for this.

File:

• main/trunk/greenstone2/perllib/plugins/AutoLoadConverters.pm (modified) (1 diff)

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

@@ -158 +158 @@
         my ($result, $result_str, $new_filename) 
         = eval "\$self->${converter}::convert(\$input_filename, \$output_ext);";
-        if ($result != 0) {
+        if (defined $result && $result != 0) {
         return $new_filename;
         }
         my $outhandle=$self->{'outhandle'};
         print $outhandle "$converter Conversion error\n";
-        print $outhandle $result_str;
+        print $outhandle "$@\n";
+        if (defined $result_str) {
+        print $outhandle "$result_str\n";
+        }
         return "";
     }