Ignore:
Timestamp:
2013-05-29T20:41:13+12:00 (9 years ago)
Author:
ak19
Message:

Using the recommended FileUtils.pm methods in place of the deprecated utils.pm methods.

File:
1 edited

Legend:

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

    r26222 r27509  
    425425    close BACKUP;
    426426    &File::Copy::copy ($backup_filename, $filename);
    427     &util::rm($backup_filename);
     427    &FileUtils::removeFiles($backup_filename);
    428428
    429429}
     
    643643
    644644    if ($line =~ /imgfile=\"([^\"]+)\"/) {
    645         &util::block_filename($block_hash,&util::filename_cat($dir,$1));
     645        &util::block_filename($block_hash,&FileUtils::filenameConcatenate($dir,$1));
    646646    }
    647647    if ($line =~ /txtfile=\"([^\"]+)\"/) {
    648         &util::block_filename($block_hash,&util::filename_cat($dir,$1));
     648        &util::block_filename($block_hash,&FileUtils::filenameConcatenate($dir,$1));
    649649    }
    650650    }
     
    672672    # find the image file if there is one
    673673    if (defined $imgname && $imgname ne "") {
    674         &util::block_filename($block_hash, &util::filename_cat( $dir,$imgname));
     674        &util::block_filename($block_hash, &FileUtils::filenameConcatenate( $dir,$imgname));
    675675    }
    676676    # find the text file if there is one
    677677    if (defined $txtname && $txtname ne "") {
    678         &util::block_filename($block_hash, &util::filename_cat($dir,$txtname));
     678        &util::block_filename($block_hash, &FileUtils::filenameConcatenate($dir,$txtname));
    679679    }
    680680    }
Note: See TracChangeset for help on using the changeset viewer.