- Timestamp:
- 2013-05-29T20:41:13+12:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/plugins/PagedImagePlugin.pm
r26222 r27509 425 425 close BACKUP; 426 426 &File::Copy::copy ($backup_filename, $filename); 427 & util::rm($backup_filename);427 &FileUtils::removeFiles($backup_filename); 428 428 429 429 } … … 643 643 644 644 if ($line =~ /imgfile=\"([^\"]+)\"/) { 645 &util::block_filename($block_hash,& util::filename_cat($dir,$1));645 &util::block_filename($block_hash,&FileUtils::filenameConcatenate($dir,$1)); 646 646 } 647 647 if ($line =~ /txtfile=\"([^\"]+)\"/) { 648 &util::block_filename($block_hash,& util::filename_cat($dir,$1));648 &util::block_filename($block_hash,&FileUtils::filenameConcatenate($dir,$1)); 649 649 } 650 650 } … … 672 672 # find the image file if there is one 673 673 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)); 675 675 } 676 676 # find the text file if there is one 677 677 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)); 679 679 } 680 680 }
Note:
See TracChangeset
for help on using the changeset viewer.