Changeset 28566

Show
Ignore:
Timestamp:
31.10.2013 11:34:01 (6 years ago)
Author:
kjdon
Message:

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

Location:
main/trunk/greenstone2/perllib
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/buildcolutils.pm

    r28087 r28566  
    506506    &FileUtils::makeAllDirectories($realarchivedir); 
    507507    &FileUtils::makeAllDirectories($realbuilddir); 
    508     &util::cachedir($archivedir, $realarchivedir, $verbosity); 
     508    &FileUtils::synchronizeDirectory($archivedir, $realarchivedir, $verbosity); 
    509509  } 
    510510  else 
     
    703703      &gsprintf::gsprintf($out, "{buildcol.copying_back_cached_build}\n"); 
    704704    } 
    705     &util::rm_r($self->{'builddir'}); 
    706     &util::cp_r($self->{'realbuilddir'}, $self->{'builddir'}); 
     705    &FileUtils::removeFilesRecursive($self->{'builddir'}); 
     706    &FileUtils::copyFilesRecursive($self->{'realbuilddir'}, $self->{'builddir'}); 
    707707  } 
    708708 
  • main/trunk/greenstone2/perllib/lucenebuildproc.pm

    r28035 r28566  
    3838 
    3939use IncrementalBuildUtils; 
     40use FileUtils; 
    4041 
    4142sub BEGIN { 
     
    626627    if ($edit_mode eq "delete") { 
    627628    # if we are deleting the doc, then also delete the lucene text  version 
    628     my $assoc_dir = &util::filename_cat($self->{'build_dir'},"text", $archivedir); 
     629    my $assoc_dir = &FileUtils::filenameConcatenate($self->{'build_dir'},"text", $archivedir); 
    629630    if (-d $assoc_dir) { 
    630         &util::rm_r($assoc_dir); 
     631        &FileUtils::removeFilesRecursive($assoc_dir); 
    631632    }  
    632633    }