Changeset 28566

Timestamp:

2013-10-31T11:34:01+13:00 (10 years ago)

Author:

kjdon

Message:

changed some util:: to FIleUtils:: methods to avoid warnings

Location:

main/trunk/greenstone2/perllib

Files:

• buildcolutils.pm (modified) (2 diffs)
• lucenebuildproc.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/buildcolutils.pm

@@ -506 +506 @@
     &FileUtils::makeAllDirectories($realarchivedir);
     &FileUtils::makeAllDirectories($realbuilddir);
-    &util::cachedir($archivedir, $realarchivedir, $verbosity);
+    &FileUtils::synchronizeDirectory($archivedir, $realarchivedir, $verbosity);
   }
   else
@@ -703 +703 @@
       &gsprintf::gsprintf($out, "{buildcol.copying_back_cached_build}\n");
     }
-    &util::rm_r($self->{'builddir'});
-    &util::cp_r($self->{'realbuilddir'}, $self->{'builddir'});
+    &FileUtils::removeFilesRecursive($self->{'builddir'});
+    &FileUtils::copyFilesRecursive($self->{'realbuilddir'}, $self->{'builddir'});
   }
 

main/trunk/greenstone2/perllib/lucenebuildproc.pm

@@ -38 +38 @@
 
 use IncrementalBuildUtils;
+use FileUtils;
 
 sub BEGIN {
@@ -626 +627 @@
     if ($edit_mode eq "delete") {
     # if we are deleting the doc, then also delete the lucene text  version
-    my $assoc_dir = &util::filename_cat($self->{'build_dir'},"text", $archivedir);
+    my $assoc_dir = &FileUtils::filenameConcatenate($self->{'build_dir'},"text", $archivedir);
     if (-d $assoc_dir) {
-        &util::rm_r($assoc_dir);
+        &FileUtils::removeFilesRecursive($assoc_dir);
     } 
     }