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

Timestamp:

2017-03-09T14:35:57+13:00 (7 years ago)

Author:

kjdon

Message:

util::block_file moved to EncodingUtil::block_raw_filename

File:

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

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

@@ -647 +647 @@
 
     if ($line =~ /imgfile=\"([^\"]+)\"/) {
-        &util::block_filename($block_hash,&FileUtils::filenameConcatenate($dir,$1));
+        $self->block_raw_filename($block_hash,&FileUtils::filenameConcatenate($dir,$1));
     }
     if ($line =~ /txtfile=\"([^\"]+)\"/) {
-        &util::block_filename($block_hash,&FileUtils::filenameConcatenate($dir,$1));
+        $self->block_raw_filename($block_hash,&FileUtils::filenameConcatenate($dir,$1));
     }
     }
@@ -677 +677 @@
     # find the image file if there is one
     if (defined $imgname && $imgname ne "") {
-        &util::block_filename($block_hash, &FileUtils::filenameConcatenate( $dir,$imgname));
+        $self->block_raw_filename($block_hash, &FileUtils::filenameConcatenate( $dir,$imgname));
     }
     # find the text file if there is one
     if (defined $txtname && $txtname ne "") {
-        &util::block_filename($block_hash, &FileUtils::filenameConcatenate($dir,$txtname));
+        $self->block_raw_filename($block_hash, &FileUtils::filenameConcatenate($dir,$txtname));
     }
     }