Changeset 19361 for gsdl/trunk/perllib/plugins/ImagePlugin.pm

Timestamp:

2009-05-11T13:01:13+12:00 (15 years ago)

Author:

mdewsnip

Message:

Removed the width=100 bit from srcicon (which is meant to be the full sized image), and added a thumbicon metadata value.

File:

• gsdl/trunk/perllib/plugins/ImagePlugin.pm (modified) (2 diffs)

gsdl/trunk/perllib/plugins/ImagePlugin.pm

@@ -112 +112 @@
     my ($filename_full_path, $filename_no_path) = &util::get_full_filenames($base_dir, $file);
 
-    if ($self->{'image_conversion_available'} == 1) {
+    if ($self->{'image_conversion_available'} == 1)
+    {
     my $utf8_filename_no_path = $self->filepath_to_utf8($filename_no_path);
     my $url_encoded_filename = &util::rename_file($utf8_filename_no_path, $self->{'file_rename_method'});
     $self->generate_images($filename_full_path, $url_encoded_filename, $doc_obj, $doc_obj->get_top_section()); # should we check the return value?
-    } else {
+    }
+    else
+    {
     if ($gli) {
         &gsprintf(STDERR, "<Warning p='ImagePlugin' r='{ImageConverter.noconversionavailable}: {ImageConverter.".$self->{'no_image_conversion_reason'}."}'>");
@@ -128 +131 @@
     $doc_obj->add_metadata ($section, "srclink", "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[SourceFile]\">");
     $doc_obj->add_metadata ($section, "/srclink", "</a>");
-    $doc_obj->add_metadata ($section, "srcicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[SourceFile]\" width=\"100\">");
+    # We don't know the size of the image, but the browser should display it at full size
+    $doc_obj->add_metadata ($section, "srcicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[SourceFile]\">");
 
+    # Add a fake thumbnail icon with the full-sized image scaled down by the browser
+    $doc_obj->add_metadata ($section, "thumbicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[SourceFile]\" width=\"" . $self->{'thumbnailsize'} . "\">");
     }
     #we have no text - adds dummy text and NoText metadata