Changeset 28563
- Timestamp:
- 2013-10-31T11:29:37+13:00 (10 years ago)
- Location:
- main/trunk/greenstone2/perllib/plugins
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/plugins/ArchivesInfPlugin.pm
r27697 r28563 133 133 print $outhandle "Removing $doc_dirname\n" if ($verbosity>2); 134 134 135 & util::rm_r($doc_dirname);135 &FileUtils::removeFilesRecursive($doc_dirname); 136 136 137 137 -
main/trunk/greenstone2/perllib/plugins/CONTENTdmPlugin.pm
r23352 r28563 263 263 my ($page,$page_num,$tmp_dirname,$txt_file) = @_; 264 264 265 my $txt_filename = & util::filename_cat($tmp_dirname,$txt_file);265 my $txt_filename = &FileUtils::filenameConcatenate($tmp_dirname,$txt_file); 266 266 267 267 open(TOUT,">$txt_filename") … … 319 319 } 320 320 else { 321 $imgfile = & util::filename_cat("..","import",$imgfile);321 $imgfile = &FileUtils::filenameConcatenate("..","import",$imgfile); 322 322 } 323 323 … … 356 356 } 357 357 else { 358 $imgfile = & util::filename_cat("..","import",$imgfile);358 $imgfile = &FileUtils::filenameConcatenate("..","import",$imgfile); 359 359 } 360 360 … … 501 501 # softlink to collection tmp dir 502 502 my $tmp_dirname 503 = & util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "tmp");504 & util::mk_dir($tmp_dirname) if (!-e $tmp_dirname);503 = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'}, "tmp"); 504 &FileUtils::makeDirectory($tmp_dirname) if (!-e $tmp_dirname); 505 505 506 506 # derive tmp filename from input filename … … 517 517 $tailname = $self->SUPER::filepath_to_utf8($tailname) unless &unicode::check_is_utf8($tailname); 518 518 $suffix = lc($suffix); 519 my $tmp_filename = & util::filename_cat($tmp_dirname, "$tailname$suffix");520 521 & util::soft_link($input_filename, $tmp_filename);519 my $tmp_filename = &FileUtils::filenameConcatenate($tmp_dirname, "$tailname$suffix"); 520 521 &FileUtils::softLink($input_filename, $tmp_filename); 522 522 my $verbosity = $self->{'verbosity'}; 523 523 if ($verbosity > 0) { … … 525 525 } 526 526 527 my $errlog = & util::filename_cat($tmp_dirname, "err.log");527 my $errlog = &FileUtils::filenameConcatenate($tmp_dirname, "err.log"); 528 528 529 529 # call xml_area_convert_file rather than gsConvert.pl 530 530 531 my $output_root = & util::filename_cat($tmp_dirname, "$tailname");531 my $output_root = &FileUtils::filenameConcatenate($tmp_dirname, "$tailname"); 532 532 533 533 my ($output_type,$item_files) … … 535 535 536 536 537 my $fakeimg_filename = & util::filename_cat($dirname, "empty.jpg");538 my $fakeimg_tmp_filename = & util::filename_cat($tmp_dirname, "empty.jpg");537 my $fakeimg_filename = &FileUtils::filenameConcatenate($dirname, "empty.jpg"); 538 my $fakeimg_tmp_filename = &FileUtils::filenameConcatenate($tmp_dirname, "empty.jpg"); 539 539 540 540 print STDERR "***** No source image identified with item\n"; … … 542 542 print STDERR "***** Using default \"no image available\" $fakeimg_filename -> $fakeimg_tmp_filename\n"; 543 543 544 & util::soft_link($fakeimg_filename, $fakeimg_tmp_filename);544 &FileUtils::softLink($fakeimg_filename, $fakeimg_tmp_filename); 545 545 546 546 # continue as before ... 547 547 548 548 # remove symbolic link to original file 549 & util::rm($tmp_filename);549 &FileUtils::removeFiles($tmp_filename); 550 550 551 551 # Check STDERR here … … 563 563 close ERRLOG; 564 564 } 565 & util::rm("$errlog") if (-e "$errlog");565 &FileUtils::removeFiles("$errlog") if (-e "$errlog"); 566 566 return []; 567 567 } -
main/trunk/greenstone2/perllib/plugins/ConvertToRogPlugin.pm
r24362 r28563 32 32 no strict 'refs'; # allow filehandles to be variables and viceversa 33 33 use util; 34 use FileUtils; 34 35 35 36 sub BEGIN { … … 96 97 # softlink to collection tmp dir 97 98 my $tmp_dirname 98 = & util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "tmp");99 & util::mk_dir($tmp_dirname) if (!-e $tmp_dirname);99 = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'}, "tmp"); 100 &FileUtils::makeDirectory($tmp_dirname) if (!-e $tmp_dirname); 100 101 101 102 # derive tmp filename from input filename … … 108 109 $tailname = $self->SUPER::filepath_to_utf8($tailname) unless &unicode::check_is_utf8($tailname); 109 110 110 my $tmp_filename = & util::filename_cat($tmp_dirname, "$tailname$suffix");111 112 & util::soft_link($input_filename, $tmp_filename);111 my $tmp_filename = &FileUtils::filenameConcatenate($tmp_dirname, "$tailname$suffix"); 112 113 &FileUtils::softLink($input_filename, $tmp_filename); 113 114 114 115 my $verbosity = $self->{'verbosity'}; … … 117 118 } 118 119 119 my $errlog = & util::filename_cat($tmp_dirname, "err.log");120 my $errlog = &FileUtils::filenameConcatenate($tmp_dirname, "err.log"); 120 121 121 122 # Execute the conversion command and get the type of the result, … … 126 127 127 128 # remove symbolic link to original file 128 & util::rm($tmp_filename);129 &FileUtils::removeFiles($tmp_filename); 129 130 130 131 # Check STDERR here … … 142 143 close ERRLOG; 143 144 } 144 & util::rm("$errlog") if (-e "$errlog");145 &FileUtils::removeFiles("$errlog") if (-e "$errlog"); 145 146 return ""; 146 147 } … … 166 167 167 168 my $tmp_dirname 168 = & util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "tmp");169 & util::rm_r($tmp_dirname);170 & util::mk_dir($tmp_dirname);169 = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'}, "tmp"); 170 &FileUtils::removeFilesRecursive($tmp_dirname); 171 &FileUtils::makeDirectory($tmp_dirname); 171 172 } 172 173 … … 444 445 # associate original file with doc object 445 446 my $cursection = $doc_obj->get_top_section(); 446 my $filename = & util::filename_cat($base_dir, $file);447 my $filename = &FileUtils::filenameConcatenate($base_dir, $file); 447 448 $doc_obj->associate_file($filename, "doc.$doc_ext", undef, $cursection); 448 449 -
main/trunk/greenstone2/perllib/plugins/DSpacePlugin.pm
r24971 r28563 51 51 use plugin; 52 52 use util; 53 use FileUtils; 53 54 use XMLParser; 54 55 use strict; … … 148 149 149 150 my ($tailname, $contents_basedir, $suffix) = &File::Basename::fileparse($filename_full_path, "\\.[^\\.]+\$"); 150 my $handle_filename = & util::filename_cat($contents_basedir,"handle");151 152 if (& util::fd_exists($handle_filename)) {151 my $handle_filename = &FileUtils::filenameConcatenate($contents_basedir,"handle"); 152 153 if (&FileUtils::fileTest($handle_filename)) { 153 154 &util::block_filename($block_hash,$handle_filename); 154 155 } … … 164 165 my @assocmime_list = (); 165 166 166 my $content_fname = & util::filename_cat($dir,"contents");167 my $content_fname = &FileUtils::filenameConcatenate($dir,"contents"); 167 168 168 169 open(CIN,"<$content_fname") … … 274 275 my $outhandle = $self->{'outhandle'}; 275 276 276 my $filename = & util::filename_cat($base_dir, $file);277 my $filename = &FileUtils::filenameConcatenate($base_dir, $file); 277 278 # return 0 if $self->{'block_exp'} ne "" && $filename =~ /$self->{'block_exp'}/; 278 279 … … 302 303 if ($only_first_doc || $first_inorder_ext || $first_inorder_mime) { 303 304 foreach my $afm ( @$assoc_file_mimes ) { 304 my $full_af = & util::filename_cat($dir,$afm->{'file'});305 my $full_af = &FileUtils::filenameConcatenate($dir,$afm->{'file'}); 305 306 $self->{'extra_blocks'}->{$full_af} = 1; 306 307 } … … 334 335 335 336 my @gsdlassocfile_tobe 336 = map { & util::filename_cat($dir,$_->{'file'}) .":".$_->{'mimetype'}.":" } @$assoc_file_mimes if @$assoc_file_mimes;337 = map { &FileUtils::filenameConcatenate($dir,$_->{'file'}) .":".$_->{'mimetype'}.":" } @$assoc_file_mimes if @$assoc_file_mimes; 337 338 $self->{'saved_metadata'}->{'gsdlassocfile_tobe'} = \@gsdlassocfile_tobe; 338 339 … … 355 356 356 357 # Block all files except contents 357 my $filename = & util::filename_cat($base_dir, $file);358 my $filename = &FileUtils::filenameConcatenate($base_dir, $file); 358 359 return 0 if $self->{'block_exp'} ne "" && $filename =~ /$self->{'block_exp'}/; 359 360 -
main/trunk/greenstone2/perllib/plugins/EmailPlugin.pm
r25741 r28563 74 74 75 75 use sorttools; 76 use util;76 use FileUtils; 77 77 78 78 sub BEGIN { … … 458 458 foreach my $tmp_file_path (@{$self->{'tmp_file_paths'}}) { 459 459 if (-e $tmp_file_path) { 460 & util::rm($tmp_file_path);460 &FileUtils::removeFiles($tmp_file_path); 461 461 } 462 462 } … … 806 806 $encoding=$1; $encoding =~ tr/A-Z/a-z/; 807 807 } 808 my $tmpdir=& util::filename_cat($ENV{'GSDLHOME'}, "tmp");808 my $tmpdir=&FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, "tmp"); 809 809 my $save_filename=$filename; 810 810 … … 821 821 $assoc_files->{$filename}=1; 822 822 } 823 my $tmp_filename = & util::filename_cat($tmpdir, $save_filename);823 my $tmp_filename = &FileUtils::filenameConcatenate($tmpdir, $save_filename); 824 824 open (SAVE, ">$tmp_filename") || 825 825 warn "EMAILPlug: Can't save attachment as $tmp_filename: $!"; -
main/trunk/greenstone2/perllib/plugins/HTMLImagePlugin.pm
r24600 r28563 365 365 if ( $self->{'aggressiveness'} >=5 && $self->{'aggressiveness'} != 9 ) { 366 366 $self->{'stopwords'} = (); 367 $filepath = & util::filename_cat($ENV{'GSDLHOME'}, "etc", "packages", "phind", "stopword", "en", "brown.sw");367 $filepath = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, "etc", "packages", "phind", "stopword", "en", "brown.sw"); 368 368 if ( open STOPWORDS, "<$filepath" ) { 369 369 while ( <STOPWORDS> ) { … … 407 407 $base_dir =~ /(.*)\/.*/; 408 408 $tndir = "$1/archives/thumbnails"; # TODO: this path shouldn't be hardcoded? 409 & util::mk_all_dir($tndir) unless -e "$tndir";409 &FileUtils::makeAllDirectories($tndir) unless -e "$tndir"; 410 410 411 411 $imgs = \%{$self->{'imglist'}}; -
main/trunk/greenstone2/perllib/plugins/ISISPlugin.pm
r27502 r28563 32 32 use SplitTextFile; 33 33 use MetadataRead; 34 use FileUtils; 34 35 35 36 use strict; … … 448 449 449 450 # Delete the FDT and XRF files too 450 & util::rm($self->{'fdt_file_path'});451 & util::rm($self->{'xrf_file_path'});451 &FileUtils::removeFiles($self->{'fdt_file_path'}); 452 &FileUtils::removeFiles($self->{'xrf_file_path'}); 452 453 } 453 454 -
main/trunk/greenstone2/perllib/plugins/TextPlugin.pm
r17739 r28563 163 163 $tmp_dirname = $ENV{'GSDLHOME'}; 164 164 } 165 $tmp_dirname = & util::filename_cat($tmp_dirname, "tmp");166 & util::mk_dir($tmp_dirname) if (!-e $tmp_dirname);165 $tmp_dirname = &FileUtils::filenameConcatenate($tmp_dirname, "tmp"); 166 &FileUtils::makeDirectory($tmp_dirname) if (!-e $tmp_dirname); 167 167 168 168 # convert to utf-8 otherwise we have problems with the doc.xml file … … 171 171 172 172 $suffix = lc($suffix); 173 my $tmp_filename = & util::filename_cat($tmp_dirname, "$tailname$suffix");173 my $tmp_filename = &FileUtils::filenameConcatenate($tmp_dirname, "$tailname$suffix"); 174 174 175 175 # Make sure we have the absolute path to the input file … … 181 181 # Now make the softlink, so we don't accidentally damage the input file 182 182 # softlinking creates a symbolic link to (or, if that's not possible, it makes a copy of) the original 183 & util::soft_link($input_filename, $tmp_filename, $ensure_path_absolute);183 &FileUtils::softLink($input_filename, $tmp_filename, $ensure_path_absolute); 184 184 185 185 my $verbosity = $self->{'verbosity'}; … … 191 191 192 192 #my $output_filename = $tailname$output_ext; #output_ext has to be html! 193 my $output_filename = & util::filename_cat($tmp_dirname, $tailname.".html");193 my $output_filename = &FileUtils::filenameConcatenate($tmp_dirname, $tailname.".html"); 194 194 195 195 # Read contents of text file line by line into an array … … 227 227 228 228 # remove the copy of the original file/remove the symbolic link to original file 229 & util::rm($tmp_filename);229 &FileUtils::removeFiles($tmp_filename); 230 230 231 231 return $output_filename; # return the output file path -
main/trunk/greenstone2/perllib/plugins/WordPlugin.pm
r24176 r28563 310 310 my @wmz_files = grep( /\.wmz$/, readdir(DIN)); 311 311 foreach my $f (@wmz_files) { 312 my $full_f = & util::filename_cat($html_files_dir,$f);313 & util::rm($full_f);312 my $full_f = &FileUtils::filenameConcatenate($html_files_dir,$f); 313 &FileUtils::removeFiles($full_f); 314 314 } 315 315 closedir(DIN);
Note:
See TracChangeset
for help on using the changeset viewer.