Changeset 24346 for main/trunk/greenstone2

Timestamp:

2011-07-29T13:11:40+12:00 (13 years ago)

Author:

davidb

Message:

With added support for orthogonal indexes (i.e. audioDB index in addition to a text-based one like mg) the Image Magick warning appears for each orthogonal index. This change limits it to print it out just once

File:

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

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

@@ -37 +37 @@
     @ImageConverter::ISA = ('BaseMediaConverter');
 }
+
+# When used with multiple builder+buildproc, plugins loaded multiple times
+# => use this 'our' var to ensure only see the warning about ImageMagick once
+our $given_image_conversion_warning = 0;
 
 my $arguments = [
@@ -139 +143 @@
 
     if ($self->{'image_conversion_available'} == 0) {
-    my $outhandle = $self->{'outhandle'};
-    &gsprintf($outhandle, "ImageConverter: {ImageConverter.noconversionavailable} ({ImageConverter.".$self->{'no_image_conversion_reason'}."})\n");
+    if (!$given_image_conversion_warning) {
+        my $outhandle = $self->{'outhandle'};
+        &gsprintf($outhandle, "ImageConverter: {ImageConverter.noconversionavailable} ({ImageConverter.".$self->{'no_image_conversion_reason'}."})\n");
+        $given_image_conversion_warning = 1;
+    }
     }