Changeset 27354 for main

Timestamp:

2013-05-16T15:12:27+12:00 (11 years ago)

Author:

kjdon

Message:

changed some deprecated util methods for FileUtils methods

File:

• main/trunk/greenstone2/perllib/plugins/ImageConverter.pm (modified) (4 diffs)

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

@@ -207 +207 @@
 
     my ($unused_fefp,$filename_encoded_no_path)
-    = util::get_full_filenames("",$filename_encoded_full_path);
+    = &util::get_full_filenames("",$filename_encoded_full_path);
 
     # The following is potentially very muddled thinking (but currently seems to work)
@@ -464 +464 @@
     $image_root .= "_$convert_id" if ($convert_id ne "");
     my $image_file = "$image_root.$target_file_type";
-    $target_file_path = &util::filename_cat($cached_image_dir,$image_file);
+    $target_file_path = &FileUtils::filenameConcatenate($cached_image_dir,$image_file);
     }
     else {
@@ -529 +529 @@
     $image_root .= "_$aspectpad_id" if ($aspectpad_id ne "");
     my $image_file = "$image_root.$target_file_type";
-    $target_file_path = &util::filename_cat($cached_image_dir,$image_file);
+    $target_file_path = &FileUtils::filenameConcatenate($cached_image_dir,$image_file);
     }
     else {
@@ -637 +637 @@
     foreach my $tmp_file_path (@{$self->{'tmp_file_paths'}}) {
     if (-e $tmp_file_path) {
-        &util::rm($tmp_file_path);
+        &FileUtils::removeFiles($tmp_file_path);
     }
     }