Changeset 28563 for main/trunk/greenstone2/perllib/plugins/TextPlugin.pm

Timestamp:

2013-10-31T11:29:37+13:00 (10 years ago)

Author:

kjdon

Message:

changing some util:: methods to FileUtils:: methods

File:

• main/trunk/greenstone2/perllib/plugins/TextPlugin.pm (modified) (5 diffs)

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

@@ -163 +163 @@
     $tmp_dirname = $ENV{'GSDLHOME'};
     }
-    $tmp_dirname = &util::filename_cat($tmp_dirname, "tmp");
-    &util::mk_dir($tmp_dirname) if (!-e $tmp_dirname);
+    $tmp_dirname = &FileUtils::filenameConcatenate($tmp_dirname, "tmp");
+    &FileUtils::makeDirectory($tmp_dirname) if (!-e $tmp_dirname);
 
     # convert to utf-8 otherwise we have problems with the doc.xml file
@@ -171 +171 @@
 
     $suffix = lc($suffix);
-    my $tmp_filename = &util::filename_cat($tmp_dirname, "$tailname$suffix"); 
+    my $tmp_filename = &FileUtils::filenameConcatenate($tmp_dirname, "$tailname$suffix"); 
     
     # Make sure we have the absolute path to the input file
@@ -181 +181 @@
     # Now make the softlink,  so we don't accidentally damage the input file
     # softlinking creates a symbolic link to (or, if that's not possible, it makes a copy of) the original
-    &util::soft_link($input_filename, $tmp_filename, $ensure_path_absolute);
+    &FileUtils::softLink($input_filename, $tmp_filename, $ensure_path_absolute);
      
     my $verbosity = $self->{'verbosity'};
@@ -191 +191 @@
 
     #my $output_filename = $tailname$output_ext; #output_ext has to be html!
-    my $output_filename = &util::filename_cat($tmp_dirname, $tailname.".html");
+    my $output_filename = &FileUtils::filenameConcatenate($tmp_dirname, $tailname.".html");
     
     # Read contents of text file line by line into an array
@@ -227 +227 @@
 
     # remove the copy of the original file/remove the symbolic link to original file
-    &util::rm($tmp_filename);
+    &FileUtils::removeFiles($tmp_filename);
 
     return $output_filename; # return the output file path