Changeset 22658

Timestamp:

2010-08-17T17:30:28+12:00 (14 years ago)

Author:

mdewsnip

Message:

Changed "srcicon" values in ImageConverter.pm and ImagePlugin.pm to use "[srclink_file]", for consistency.

Location:

main/trunk/greenstone2/perllib/plugins

Files:

• ImageConverter.pm (modified) (1 diff)
• ImagePlugin.pm (modified) (1 diff)

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

@@ -244 +244 @@
 
     $doc_obj->add_metadata ($section, "srclink_file", "[Image]"); 
-    $doc_obj->add_metadata ($section, "srcicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/$assocfilemeta/[Image]\" width=\"[ImageWidth]\" height=\"[ImageHeight]\">");
+    $doc_obj->add_metadata ($section, "srcicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/$assocfilemeta/[srclink_file]\" width=\"[ImageWidth]\" height=\"[ImageHeight]\">");
 
     # Add the image as an associated file

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

@@ -133 +133 @@
     $doc_obj->add_metadata ($section, "srclink_file", "[SourceFile]"); 
     # 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]\">");
+    $doc_obj->add_metadata ($section, "srcicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[srclink_file]\">");
 
     # 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'} . "\">");
+    $doc_obj->add_metadata ($section, "thumbicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[srclink_file]\" width=\"" . $self->{'thumbnailsize'} . "\">");
     }
     #we have no text - adds dummy text and NoText metadata