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

Timestamp:

2013-05-29T20:41:13+12:00 (11 years ago)

Author:

ak19

Message:

Using the recommended FileUtils.pm methods in place of the deprecated utils.pm methods.

File:

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

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

@@ -425 +425 @@
     close BACKUP;
     &File::Copy::copy ($backup_filename, $filename);
-    &util::rm($backup_filename);
+    &FileUtils::removeFiles($backup_filename);
 
 }
@@ -643 +643 @@
 
     if ($line =~ /imgfile=\"([^\"]+)\"/) {
-        &util::block_filename($block_hash,&util::filename_cat($dir,$1));
+        &util::block_filename($block_hash,&FileUtils::filenameConcatenate($dir,$1));
     }
     if ($line =~ /txtfile=\"([^\"]+)\"/) {
-        &util::block_filename($block_hash,&util::filename_cat($dir,$1));
+        &util::block_filename($block_hash,&FileUtils::filenameConcatenate($dir,$1));
     }
     }
@@ -672 +672 @@
     # find the image file if there is one
     if (defined $imgname && $imgname ne "") {
-        &util::block_filename($block_hash, &util::filename_cat( $dir,$imgname));
+        &util::block_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, &util::filename_cat($dir,$txtname));
+        &util::block_filename($block_hash, &FileUtils::filenameConcatenate($dir,$txtname));
     }
     }