Changeset 27354 for main/trunk/greenstone2
- Timestamp:
- 2013-05-16T15:12:27+12:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/plugins/ImageConverter.pm
r26866 r27354 207 207 208 208 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); 210 210 211 211 # The following is potentially very muddled thinking (but currently seems to work) … … 464 464 $image_root .= "_$convert_id" if ($convert_id ne ""); 465 465 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); 467 467 } 468 468 else { … … 529 529 $image_root .= "_$aspectpad_id" if ($aspectpad_id ne ""); 530 530 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); 532 532 } 533 533 else { … … 637 637 foreach my $tmp_file_path (@{$self->{'tmp_file_paths'}}) { 638 638 if (-e $tmp_file_path) { 639 & util::rm($tmp_file_path);639 &FileUtils::removeFiles($tmp_file_path); 640 640 } 641 641 }
Note:
See TracChangeset
for help on using the changeset viewer.