Changeset 24148

Timestamp:

2011-06-10T14:25:01+12:00 (13 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.

File:

• main/trunk/greenstone2/perllib/plugins/PagedImagePlugin.pm (modified) (1 diff)

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

@@ -583 +583 @@
 
     if ($line =~ /imgfile=\"([^\"]+)\"/) {
-        &util::block_filename($block_hash,$dir.$1);
+        &util::block_filename($block_hash,&util::filename_cat($dir,$1));
     }
     if ($line =~ /txtfile=\"([^\"]+)\"/) {
-        &util::block_filename($block_hash,$dir.$1);
+        &util::block_filename($block_hash,&util::filename_cat($dir,$1));
     }
     }