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

Timestamp:

2011-01-13T11:49:38+13:00 (13 years ago)

Author:

kjdon

Message:

moved the block_filename from BasePlugin into util. then I don't need to duplicate it for DirectoryPlugin which doesn't inherit from BasePlugin

File:

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

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

@@ -576 +576 @@
 
     if ($line =~ /imgfile=\"([^\"]+)\"/) {
-        $self->block_filename($block_hash,$dir.$1);
+        &util::block_filename($block_hash,$dir.$1);
     }
     if ($line =~ /txtfile=\"([^\"]+)\"/) {
-        $self->block_filename($block_hash,$dir.$1);
+        &util::block_filename($block_hash,$dir.$1);
     }
     }
@@ -605 +605 @@
     # find the image file if there is one
     if (defined $imgname && $imgname ne "") {
-        $self->block_filename($block_hash, &util::filename_cat( $dir,$imgname));
+        &util::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, &util::filename_cat($dir,$txtname));
+        &util::block_filename($block_hash, &util::filename_cat($dir,$txtname));
     }
     }