Changeset 23452 for main/trunk

Timestamp:

2010-12-13T11:47:07+13:00 (13 years ago)

Author:

kjdon

Message:

use filename_cat when generating the full path for blocking. If teh item files use forward slash then this will turn them into back slash for windows

File:

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

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

@@ -605 +605 @@
     # find the image file if there is one
     if (defined $imgname && $imgname ne "") {
-        $self->block_filename($block_hash,$dir.$imgname);
+        $self->block_filename($block_hash, &util::filename_cat( $dir,$imgname));
     }
     # find the text file if there is one
     if (defined $txtname && $txtname ne "") {
-        $self->block_filename($block_hash,$dir.$txtname);
+        $self->block_filename($block_hash, &util::filename_cat($dir,$txtname));
     }
     }