Changeset 27757 for main/trunk/greenstone2/bin

Timestamp:

2013-07-04T17:09:30+12:00 (11 years ago)

Author:

ak19

Message:

Using FileUtils subroutines instead of deprecated calls to util package

File:

• main/trunk/greenstone2/bin/script/pdftohtml.pl (modified) (8 diffs)

main/trunk/greenstone2/bin/script/pdftohtml.pl

@@ -39 +39 @@
 use parsargv;
 use util;
+use FileUtils;
 use Cwd;
 use File::Basename;
@@ -108 +109 @@
 
     # formulate the command
-    my $cmd = &util::filename_cat($ENV{'GSDLHOME'}, "bin", $ENV{'GSDLOS'}, "pdftohtml");
+    my $cmd = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, "bin", $ENV{'GSDLOS'}, "pdftohtml");
 
     # don't include path on windows (to avoid having to play about
@@ -127 +128 @@
     print STDERR "pdftohtml error for $input_filename $!\n";
     # leave these for gsConvert.pl...
-    #&util::rm("$output_filestem.text") if (-e "$output_filestem.text");
-    #&util::rm("$output_filestem.err") if (-e "$output_filestem.err");
+    #&FileUtils::removeFiles("$output_filestem.text") if (-e "$output_filestem.text");
+    #&FileUtils::removeFiles("$output_filestem.err") if (-e "$output_filestem.err");
     return 1;
     }
@@ -139 +140 @@
 # words, screwing up indexing and searching.
 # At the same time, check that our .html file has some textual content.
-    &util::mv("$output_filestem.html","$output_filestem.html.tmp");
+    &FileUtils::moveFiles("$output_filestem.html","$output_filestem.html.tmp");
     $!=0;
     open INFILE, "$output_filestem.html.tmp" ||
@@ -203 +204 @@
     close INFILE;
     close OUTFILE;
-    &util::rm("$output_filestem.html.tmp");
+    &FileUtils::removeFiles("$output_filestem.html.tmp");
 
     # Need to convert images from PPM format to PNG format
@@ -217 +218 @@
     }
     close IMAGES;
-    &util::rm("${directory}image.log") if (-e "${directory}image.log");
+    &FileUtils::removeFiles("${directory}image.log") if (-e "${directory}image.log");
 
     }
@@ -227 +228 @@
     for $image (@images) {
         chomp($image);
-        &util::rm("${directory}$image");
+        &FileUtils::removeFiles("${directory}$image");
     }
     return 1;
@@ -257 +258 @@
         }
     }
-    &util::rm($image);
+    &FileUtils::removeFiles($image);
     }