Changeset 14960

Timestamp:

2008-02-12T15:16:08+13:00 (16 years ago)

Author:

davidb

Message:

Conflict between new $self->convert method and controlling whether or not thumbnails are generated resolved

File:

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

gsdl/trunk/perllib/plugins/ImagePlug.pm

@@ -49 +49 @@
     'type' => "flag",
     'reqd' => "no" },
+      { 'name' => "nothumbnail",
+    'desc' => "{ImagePlug.generatethumbnail}",
+    'type' => "flag",
+    'reqd' => "no" },
       { 'name' => "thumbnailsize",
     'desc' => "{ImagePlug.thumbnailsize}",
@@ -59 +63 @@
     'type' => "string",
     'deft' => "gif",
+    'reqd' => "no" },
+      { 'name' => "noscreenview",
+    'desc' => "{ImagePlug.generatescreenview}",
+    'type' => "flag",
     'reqd' => "no" },
       { 'name' => "screenviewsize",
@@ -185 +193 @@
     # Also want to set filename as 'Source' metadata to be
     # consistent with other plugins
-    $doc_obj->add_metadata ($section, "Source", $url);
+    $doc_obj->add_metadata ($section, "Source", $self->filename_to_metadata($url));
 
     my ($image_type, $image_width, $image_height, $image_size) 
@@ -214 +222 @@
 
 
-    # Make the thumbnail image
-    my $thumbnailsize = $self->{'thumbnailsize'} || 100;
-    my $thumbnailtype = $self->{'thumbnailtype'} || 'gif';
+    if (!$self->{'nothumbnail'}) {
+
+    # Make the thumbnail image
+    my $thumbnailsize = $self->{'thumbnailsize'} || 100;
+    my $thumbnailtype = $self->{'thumbnailtype'} || 'gif';
+
+    # Generate the thumbnail with convert
+    my $result = $self->convert($filename, $thumbnailtype, "-geometry $thumbnailsize" . "x$thumbnailsize", "THUMB");
+    my ($thumbnailfile) = ($result =~ /=>(.*\.$thumbnailtype)/);
     
-    # Generate the thumbnail with convert
-    my $result = $self->convert($filename, $thumbnailtype, "-geometry $thumbnailsize" . "x$thumbnailsize", "THUMB");
-    my ($thumbnailfile) = ($result =~ /=>(.*\.$thumbnailtype)/);
-
-    # Add the thumbnail as an associated file ...
-    if (-e "$thumbnailfile") { 
-    $doc_obj->associate_file("$thumbnailfile", "thumbnail.$thumbnailtype", 
-                 "image/$thumbnailtype",$section);
-    $doc_obj->add_metadata ($section, "ThumbType", $thumbnailtype);
-    $doc_obj->add_metadata ($section, "Thumb", "thumbnail.$thumbnailtype");
-
-    $doc_obj->add_metadata ($section, "thumbicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[Thumb]\" width=[ThumbWidth] height=[ThumbHeight]>");
-    }
-
-    # Extract Thumnail metadata from convert output
-    if ($result =~ m/[0-9]+x[0-9]+=>([0-9]+)x([0-9]+)/) {
-    $doc_obj->add_metadata ($section, "ThumbWidth", $1);
-    $doc_obj->add_metadata ($section, "ThumbHeight", $2);
-    }
+    # Add the thumbnail as an associated file ...
+    if (-e "$thumbnailfile") { 
+        $doc_obj->associate_file("$thumbnailfile", "thumbnail.$thumbnailtype", 
+                     "image/$thumbnailtype",$section);
+        $doc_obj->add_metadata ($section, "ThumbType", $thumbnailtype);
+        $doc_obj->add_metadata ($section, "Thumb", "thumbnail.$thumbnailtype");
+        
+        $doc_obj->add_metadata ($section, "thumbicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[Thumb]\" width=[ThumbWidth] height=[ThumbHeight]>");
+    }
+
+    # Extract Thumnail metadata from convert output
+    if ($result =~ m/[0-9]+x[0-9]+=>([0-9]+)x([0-9]+)/) {
+        $doc_obj->add_metadata ($section, "ThumbWidth", $1);
+        $doc_obj->add_metadata ($section, "ThumbHeight", $2);
+    }
+
+    }
+
 
     # Make a screen-sized version of the picture if requested
-    if ($self->{'screenviewsize'}) {
+    if (!$self->{'noscreenview'}) {
 
     # To do: if the actual image smaller than the screenview size,