Changeset 27354

Show
Ignore:
Timestamp:
16.05.2013 15:12:27 (6 years ago)
Author:
kjdon
Message:

changed some deprecated util methods for FileUtils? methods

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/plugins/ImageConverter.pm

    r26866 r27354  
    207207 
    208208    my ($unused_fefp,$filename_encoded_no_path) 
    209     = util::get_full_filenames("",$filename_encoded_full_path); 
     209    = &util::get_full_filenames("",$filename_encoded_full_path); 
    210210 
    211211    # The following is potentially very muddled thinking (but currently seems to work) 
     
    464464    $image_root .= "_$convert_id" if ($convert_id ne ""); 
    465465    my $image_file = "$image_root.$target_file_type"; 
    466     $target_file_path = &util::filename_cat($cached_image_dir,$image_file); 
     466    $target_file_path = &FileUtils::filenameConcatenate($cached_image_dir,$image_file); 
    467467    } 
    468468    else { 
     
    529529    $image_root .= "_$aspectpad_id" if ($aspectpad_id ne ""); 
    530530    my $image_file = "$image_root.$target_file_type"; 
    531     $target_file_path = &util::filename_cat($cached_image_dir,$image_file); 
     531    $target_file_path = &FileUtils::filenameConcatenate($cached_image_dir,$image_file); 
    532532    } 
    533533    else { 
     
    637637    foreach my $tmp_file_path (@{$self->{'tmp_file_paths'}}) { 
    638638    if (-e $tmp_file_path) { 
    639         &util::rm($tmp_file_path); 
     639        &FileUtils::removeFiles($tmp_file_path); 
    640640    } 
    641641    }