Changeset 27509 for main/trunk/greenstone2/perllib/plugins/ConvertBinaryFile.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/ConvertBinaryFile.pm (modified) (10 diffs)

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

@@ -45 +45 @@
 no strict 'subs';
 use util;
+use FileUtils;
 
 
@@ -108 +109 @@
     my $colplugname = undef;
     if (defined $ENV{'GSDLCOLLECTDIR'}) {
-        $colplugname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},
+        $colplugname = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'},
                            "perllib","plugins", 
                            $plugin_package);
     }
 
-    my $mainplugname = &util::filename_cat($ENV{'GSDLHOME'},
+    my $mainplugname = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},
                            "perllib","plugins", 
                            $plugin_package);
@@ -255 +256 @@
 
     my $lc_suffix = lc($suffix);
-    my $tmp_filename = &util::filename_cat($tmp_dirname, "$utf8_tailname$lc_suffix");
+    my $tmp_filename = &FileUtils::filenameConcatenate($tmp_dirname, "$utf8_tailname$lc_suffix");
     
     # If gsdl is remote, we're given relative path to input file, of the form import/tailname.suffix
@@ -261 +262 @@
     # the input_filename is the absolute path, see http://perldoc.perl.org/File/Spec.html
     my $ensure_path_absolute = 1; # true
-    &util::soft_link($input_filename, $tmp_filename, $ensure_path_absolute);
+    &FileUtils::softLink($input_filename, $tmp_filename, $ensure_path_absolute);
     my $verbosity = $self->{'verbosity'};
     if ($verbosity > 0) {
@@ -267 +268 @@
     }
 
-    my $errlog = &util::filename_cat($tmp_dirname, "err.log");
+    my $errlog = &FileUtils::filenameConcatenate($tmp_dirname, "err.log");
     
     # Execute the conversion command and get the type of the result,
@@ -290 +291 @@
     
     # remove symbolic link to original file
-    &util::rm($tmp_filename);
+    &FileUtils::removeFiles($tmp_filename);
     
     # Check STDERR here
@@ -307 +308 @@
         close ERRLOG;
     }
-    &util::rm("$errlog") if (-e "$errlog");
+    &FileUtils::removeFiles("$errlog") if (-e "$errlog");
     return "";
     }
@@ -364 +365 @@
     }
     else {
-        &util::mv("${conv_filename}.tmp", $conv_filename);
+        &FileUtils::moveFiles("${conv_filename}.tmp", $conv_filename);
     }   
     }
@@ -460 +461 @@
     # associate original file with doc object
     my $cursection = $doc_obj->get_top_section();
-    my $filename = &util::filename_cat($base_dir, $file);
+    my $filename = &FileUtils::filenameConcatenate($base_dir, $file);
     my $assocfilename = "doc.$doc_ext";
     if ($self->{'keep_original_filename'} == 1) {
@@ -489 +490 @@
      if (defined $tmp_dir && -d $tmp_dir) {
      ##print STDERR "**** Suppressing clean up of tmp dir\n";
-     &util::rm_r($tmp_dir);
+     &FileUtils::removeFilesRecursive($tmp_dir);
      $self->{'tmp_dir'} = undef;
      }