Changeset 23419 for main/trunk/greenstone2/perllib/plugins/PagedImagePlugin.pm

Timestamp:

2010-12-09T00:10:10+13:00 (13 years ago)

Author:

max

Message:

Setting the values to store as block files is now done through an API call to BasePlugin. This way, anything uniform requirement (such as putting in both C:\... and c:\... entries for Windows) can be done in one place.

File:

• main/trunk/greenstone2/perllib/plugins/PagedImagePlugin.pm (modified) (2 diffs)

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

@@ -576 +576 @@
 
     if ($line =~ /imgfile=\"([^\"]+)\"/) {
-        $block_hash->{'file_blocks'}->{$dir.$1} = 1;
+        $self->block_filename($block_hash,$dir.$1);
     }
     if ($line =~ /txtfile=\"([^\"]+)\"/) {
-        $block_hash->{'file_blocks'}->{$dir.$1} = 1;
+        $self->block_filename($block_hash,$dir.$1);
     }
     }
@@ -605 +605 @@
     # find the image file if there is one
     if (defined $imgname && $imgname ne "") {
-        $block_hash->{'file_blocks'}->{$dir.$imgname}=1;
+        $self->block_filename($block_hash,$dir.$imgname);
     }
     # find the text file if there is one
     if (defined $txtname && $txtname ne "") {
-        $block_hash->{'file_blocks'}->{$dir.$txtname} = 1;
+        $self->block_filename($block_hash,$dir.$txtname);
     }
     }