Changeset 3307

Timestamp:

2002-08-01T03:05:38+12:00 (22 years ago)

Author:

davidb

Message:

Some minor modifications to Image Plugin: filenames can now
include spaces, the images generated are interlaced (perhaps this
would be better controlled through an option) and the number of
file processes correctly stored through $self->{'num_processed'}

File:

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

trunk/gsdl/perllib/plugins/ImagePlug.pm

@@ -109 +109 @@
     return 0 if ($file eq "" || $filename eq "");
 
-    if ($filename =~ m/ /) {
-    print $outhandle "ImagePlug: \"$filename\" contains a space. choking.\n";
-    return undef;
-    }
+#    Code now extended to quote filenames in 'convert' commnads
+#    Allows spaces in filenames, but note needs spaces to be escaped in URL as well
+#    if ($filename =~ m/ /) {
+#   print $outhandle "ImagePlug: \"$filename\" contains a space. choking.\n";
+#   return undef;
+#    }
 
     my $minimumsize = $self->{'minimumsize'};
@@ -131 +133 @@
     $self->{'tmp_filename'} = $filename;
 
-    my $command = "convert -verbose $originalfilename $filename";
+    my $command = "convert -interlace plane -verbose \"$originalfilename\" \"$filename\"";
     print $outhandle "$command\n" if ($verbosity > 2);
     my $result = '';
@@ -141 +143 @@
     
     # Add the image metadata
-    $doc_obj->add_metadata ($section, "Image", "$file");
+    my $url = $file;
+    $url =~ s/ /%20/g;
+
+    $doc_obj->add_metadata ($section, "Image", $url);
     my ($image_type, $image_width, $image_height, $image_size) 
     = &identify($filename, $outhandle, $verbosity);
@@ -160 +165 @@
 
     # Generate the thumbnail with convert
-    my $command = "convert -verbose -geometry $thumbnailsize" 
-    . "x$thumbnailsize $filename $thumbnailfile";
+    my $command = "convert -interlace plane -verbose -geometry $thumbnailsize" 
+    . "x$thumbnailsize \"$filename\" \"$thumbnailfile\"";
     print $outhandle "$command\n" if ($verbosity > 2);
     my $result = '';
@@ -193 +198 @@
 
     # make the screenview image
-    my $command = "convert -verbose -geometry $screenviewsize" 
-        . "x$screenviewsize $filename $screenviewfilename";
+    my $command = "convert -interlace plane -verbose -geometry $screenviewsize" 
+        . "x$screenviewsize \"$filename\" \"$screenviewfilename\"";
     print $outhandle "$command\n" if ($verbosity > 2);
     my $result = "";
@@ -342 +347 @@
     }
 
+    $self->{'num_processed'}++;
+
     return 1;
 }