Changeset 9585

Timestamp:

2005-04-07T15:05:10+12:00 (19 years ago)

Author:

mdewsnip

Message:

Now provides a message through to the GLI on why files are not processed, if running on Windows 95/98 or if ImageMagick isn't installed.

File:

• trunk/gsdl/perllib/plugins/ImagePlug.pm (modified) (4 diffs)

trunk/gsdl/perllib/plugins/ImagePlug.pm

@@ -145 +145 @@
     my $outhandle = $self->{'outhandle'};
 
-    # None of this works very well on Windows 95/98...
-    if ($ENV{'GSDLOS'} eq "windows" && !Win32::IsWinNT()) {
-    print $outhandle "ImagePlug: Windows 95/98 not supported\n" if ($verbosity > 1);
-    return undef;
-    }
-
-    # None of this is going to work very well without ImageMagick...
-    if ($self->{'imagemagick_not_installed'}) {
-    print $outhandle "ImagePlug: ImageMagick not installed\n" if ($verbosity > 1);
-    return undef;
-    }
-
     # check the filename is okay
     return 0 if ($file eq "" || $filename eq "");
@@ -388 +376 @@
         if $self->{'verbosity'} > 1;
 
+    # None of this works very well on Windows 95/98...
+    if ($ENV{'GSDLOS'} eq "windows" && !Win32::IsWinNT()) {
+    if ($gli) {
+        print STDERR "<ProcessingError n='$file' r='Windows 95/98 not supported'>\n";
+    }
+    else {
+        print $outhandle "ImagePlug: Windows 95/98 not supported\n";
+    }
+    return -1;
+    }
+
+    # None of this is going to work very well without ImageMagick...
+    if ($self->{'imagemagick_not_installed'}) {
+    if ($gli) {
+        print STDERR "<ProcessingError n='$file' r='ImageMagick not installed'>\n";
+    }
+    else {
+        print $outhandle "ImagePlug: ImageMagick not installed\n";
+    }
+    return -1;
+    }
+
     #if there's a leading directory name, eat it...
     $file =~ s/^.*[\/\\]//;
@@ -401 +411 @@
     if (!defined $result)
     {
-    print "ImagePlug: couldn't process \"$filename\"\n";
+    if ($gli) {
+        print STDERR "<ProcessingError n='$file'>\n";
+    }
+    else {
+        print $outhandle "ImagePlug: couldn't process \"$filename\"\n";
+    }
     return -1; # error during processing
     }
@@ -413 +428 @@
 
     # do plugin specific processing of doc_obj
-    return -1 unless defined ($self->process (\$text, $pluginfo, $base_dir, 
-                         $file, $metadata, $doc_obj));
+    unless (defined ($self->process(\$text, $pluginfo, $base_dir, $file, $metadata, $doc_obj))) {
+    print STDERR "<ProcessingError n='$file'>\n" if ($gli);
+    return -1;
+    }
 
     # do any automatic metadata extraction