Changeset 22658

Show
Ignore:
Timestamp:
17.08.2010 17:30:28 (9 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:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/plugins/ImageConverter.pm

    r22655 r22658  
    244244 
    245245    $doc_obj->add_metadata ($section, "srclink_file", "[Image]");  
    246     $doc_obj->add_metadata ($section, "srcicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/$assocfilemeta/[Image]\" width=\"[ImageWidth]\" height=\"[ImageHeight]\">"); 
     246    $doc_obj->add_metadata ($section, "srcicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/$assocfilemeta/[srclink_file]\" width=\"[ImageWidth]\" height=\"[ImageHeight]\">"); 
    247247 
    248248    # Add the image as an associated file 
  • main/trunk/greenstone2/perllib/plugins/ImagePlugin.pm

    r22655 r22658  
    133133    $doc_obj->add_metadata ($section, "srclink_file", "[SourceFile]");  
    134134    # We don't know the size of the image, but the browser should display it at full size 
    135     $doc_obj->add_metadata ($section, "srcicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[SourceFile]\">"); 
     135    $doc_obj->add_metadata ($section, "srcicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[srclink_file]\">"); 
    136136 
    137137    # Add a fake thumbnail icon with the full-sized image scaled down by the browser 
    138     $doc_obj->add_metadata ($section, "thumbicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[SourceFile]\" width=\"" . $self->{'thumbnailsize'} . "\">"); 
     138    $doc_obj->add_metadata ($section, "thumbicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[srclink_file]\" width=\"" . $self->{'thumbnailsize'} . "\">"); 
    139139    } 
    140140    #we have no text - adds dummy text and NoText metadata