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

Timestamp:

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

Author:

kjdon

Message:

changing some util:: methods to FileUtils:: methods

File:

• main/trunk/greenstone2/perllib/plugins/CONTENTdmPlugin.pm (modified) (9 diffs)

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

@@ -263 +263 @@
     my ($page,$page_num,$tmp_dirname,$txt_file) = @_;
     
-    my $txt_filename = &util::filename_cat($tmp_dirname,$txt_file);
+    my $txt_filename = &FileUtils::filenameConcatenate($tmp_dirname,$txt_file);
 
     open(TOUT,">$txt_filename") 
@@ -319 +319 @@
         }
         else {
-            $imgfile = &util::filename_cat("..","import",$imgfile);
+            $imgfile = &FileUtils::filenameConcatenate("..","import",$imgfile);
         }
         
@@ -356 +356 @@
         }
         else {
-        $imgfile = &util::filename_cat("..","import",$imgfile);
+        $imgfile = &FileUtils::filenameConcatenate("..","import",$imgfile);
         }
 
@@ -501 +501 @@
     # softlink to collection tmp dir
     my $tmp_dirname 
-    = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "tmp");
-    &util::mk_dir($tmp_dirname) if (!-e $tmp_dirname);
+    = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'}, "tmp");
+    &FileUtils::makeDirectory($tmp_dirname) if (!-e $tmp_dirname);
 
     # derive tmp filename from input filename
@@ -517 +517 @@
     $tailname = $self->SUPER::filepath_to_utf8($tailname) unless &unicode::check_is_utf8($tailname);
     $suffix = lc($suffix);
-    my $tmp_filename = &util::filename_cat($tmp_dirname, "$tailname$suffix");
-
-    &util::soft_link($input_filename, $tmp_filename);
+    my $tmp_filename = &FileUtils::filenameConcatenate($tmp_dirname, "$tailname$suffix");
+
+    &FileUtils::softLink($input_filename, $tmp_filename);
     my $verbosity = $self->{'verbosity'};
     if ($verbosity > 0) {
@@ -525 +525 @@
     }
 
-    my $errlog = &util::filename_cat($tmp_dirname, "err.log");
+    my $errlog = &FileUtils::filenameConcatenate($tmp_dirname, "err.log");
     
     # call xml_area_convert_file rather than gsConvert.pl
 
-    my $output_root = &util::filename_cat($tmp_dirname, "$tailname");
+    my $output_root = &FileUtils::filenameConcatenate($tmp_dirname, "$tailname");
 
     my ($output_type,$item_files) 
@@ -535 +535 @@
 
 
-    my $fakeimg_filename = &util::filename_cat($dirname, "empty.jpg");
-    my $fakeimg_tmp_filename = &util::filename_cat($tmp_dirname, "empty.jpg");
+    my $fakeimg_filename = &FileUtils::filenameConcatenate($dirname, "empty.jpg");
+    my $fakeimg_tmp_filename = &FileUtils::filenameConcatenate($tmp_dirname, "empty.jpg");
 
     print STDERR "***** No source image identified with item\n";
@@ -542 +542 @@
     print STDERR "***** Using default \"no image available\" $fakeimg_filename -> $fakeimg_tmp_filename\n";
 
-    &util::soft_link($fakeimg_filename, $fakeimg_tmp_filename);
+    &FileUtils::softLink($fakeimg_filename, $fakeimg_tmp_filename);
    
     # continue as before ...
 
     # remove symbolic link to original file
-    &util::rm($tmp_filename);
+    &FileUtils::removeFiles($tmp_filename);
 
     # Check STDERR here
@@ -563 +563 @@
         close ERRLOG;
     }
-    &util::rm("$errlog") if (-e "$errlog");
+    &FileUtils::removeFiles("$errlog") if (-e "$errlog");
     return [];
     }