Changeset 24148

Show
Ignore:
Timestamp:
10.06.2011 14:25:01 (8 years ago)
Author:
ak19
Message:

Yitzchak Schaffer and Prof Witten noticed that when XML item files (but not text item files) were used in PagedImagePlugin?, images and text files weren't being blocked so that ImagePlugin? and TextPlugin? ended up reprocessing them. Pretty annoying when Imageplugin ends up redoing generation of screen and thumb images when PagedImagePlugin? had already done all the hard work for the same.

Files:
1 modified

Legend:

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

    r24056 r24148  
    583583 
    584584    if ($line =~ /imgfile=\"([^\"]+)\"/) { 
    585         &util::block_filename($block_hash,$dir.$1); 
     585        &util::block_filename($block_hash,&util::filename_cat($dir,$1)); 
    586586    } 
    587587    if ($line =~ /txtfile=\"([^\"]+)\"/) { 
    588         &util::block_filename($block_hash,$dir.$1); 
     588        &util::block_filename($block_hash,&util::filename_cat($dir,$1)); 
    589589    } 
    590590    }