- Timestamp:
- 2013-05-29T20:41:13+12:00 (11 years ago)
- Location:
- main/trunk/greenstone2
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/bin/script/gsConvert.pl
r25798 r27509 53 53 use parsargv; 54 54 use util; 55 use FileUtils; 55 56 use Cwd; 56 57 … … 149 150 my ($tailname,$dirname,$suffix) 150 151 = File::Basename::fileparse($input_filename, "\\.[^\\.]+\$"); 151 my $output_filestem = & util::filename_cat($dirname, "$tailname");152 my $output_filestem = &FileUtils::filenameConcatenate($dirname, "$tailname"); 152 153 153 154 if ($input_type eq "") … … 383 384 $ppt_convert_type = "-p"; 384 385 } 385 my $vbScript = & util::filename_cat($ENV{'GSDLHOME'}, "bin",386 my $vbScript = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, "bin", 386 387 $ENV{'GSDLOS'}, "pptextract"); 387 388 $vbScript = "pptextract" if ($ENV{'GSDLOS'} =~ m/^windows$/i); … … 539 540 540 541 # build up the path to the doc-to-html conversion tool we're going to use 541 my $vbScript = & util::filename_cat($ENV{'GSDLHOME'}, "bin", $ENV{'GSDLOS'});542 my $vbScript = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, "bin", $ENV{'GSDLOS'}); 542 543 543 544 if ($ENV{'GSDLOS'} =~ m/^windows$/i) { … … 547 548 if($input_filename =~ m/docx$/i) { # need to use full path to docx2html script, 548 549 # else script launch fails when there are error msgs 549 $vbScript = & util::filename_cat($vbScript, "docx2html.vbs");550 $vbScript = &FileUtils::filenameConcatenate($vbScript, "docx2html.vbs"); 550 551 $vbScript = "CScript //Nologo \"$vbScript\""; # launche with CScript for error output in STDERR 551 552 # //Nologo flag avoids Microsoft's opening/logo msgs … … 555 556 else { # old doc versions. use the usual VB executable word2html for the 556 557 # conversion. Doesn't need full path, since bin\windows is on PATH 557 $vbScript = "word2html"; #$vbScript = "\"".& util::filename_cat($vbScript, "word2html")."\"";558 $vbScript = "word2html"; #$vbScript = "\"".&FileUtils::filenameConcatenate($vbScript, "word2html")."\""; 558 559 } 559 560 } 560 561 else { # not windows 561 $vbScript = "\"".& util::filename_cat($vbScript, "word2html")."\"";562 $vbScript = "\"".&FileUtils::filenameConcatenate($vbScript, "word2html")."\""; 562 563 } 563 564 … … 616 617 close(TMP); 617 618 if ($line && $line =~ m/html/i) { 618 & util::rm("$output_filestem.err") if -e "$output_filestem.err";619 &FileUtils::removeFiles("$output_filestem.err") if -e "$output_filestem.err"; 619 620 return 1; 620 621 } … … 622 623 623 624 # If here, an error of some sort occurred 624 & util::rm("$output_filestem.html") if -e "$output_filestem.html";625 &FileUtils::removeFiles("$output_filestem.html") if -e "$output_filestem.html"; 625 626 if (-e "$output_filestem.err") { 626 627 if ($faillogfile ne "" && defined(open(FAILLOG,">>$faillogfile"))) { … … 630 631 close ERRLOG; 631 632 } 632 & util::rm("$output_filestem.err");633 &FileUtils::removeFiles("$output_filestem.err"); 633 634 } 634 635 return 0; … … 684 685 685 686 if ($was_successful) { 686 & util::rm("$output_filestem.err")687 &FileUtils::removeFiles("$output_filestem.err") 687 688 if (-e "$output_filestem.err"); 688 689 # insert the (modified) table of contents, if it exists. 689 690 if (-e "${output_filestem}_ToC.html") { 690 & util::mv("$output_filestem.html","$output_filestem.src");691 &FileUtils::moveFiles("$output_filestem.html","$output_filestem.src"); 691 692 my $open_failed=0; 692 693 open HTMLSRC, "$output_filestem.src" || ++$open_failed; … … 698 699 close TOC; 699 700 close HTML; 700 & util::mv("$output_filestem.src","$output_filestem.html");701 &FileUtils::moveFiles("$output_filestem.src","$output_filestem.html"); 701 702 return 1; 702 703 } … … 726 727 close HTML; 727 728 728 & util::rm("${output_filestem}_ToC.html");729 & util::rm("${output_filestem}.src");729 &FileUtils::removeFiles("${output_filestem}_ToC.html"); 730 &FileUtils::removeFiles("${output_filestem}.src"); 730 731 } 731 732 # we don't yet do anything with footnotes ($output_filestem_fn.html) :( … … 744 745 close FAILLOG; 745 746 } 746 & util::rm("$output_filestem.err");747 } 748 749 & util::rm("$output_filestem.html") if (-e "$output_filestem.html");747 &FileUtils::removeFiles("$output_filestem.err"); 748 } 749 750 &FileUtils::removeFiles("$output_filestem.html") if (-e "$output_filestem.html"); 750 751 751 752 return 0; … … 787 788 if ($retval!=0 || ! -s "$output_filestem.html") 788 789 { 789 & util::rm("$output_filestem.out") if (-e "$output_filestem.out");790 &FileUtils::removeFiles("$output_filestem.out") if (-e "$output_filestem.out"); 790 791 # print out the converter's std err, if any 791 792 if (-s "$output_filestem.err") { … … 798 799 } 799 800 #print STDERR "***********output filestem $output_filestem.html\n"; 800 & util::rm("$output_filestem.html") if (-e "$output_filestem.html");801 &FileUtils::removeFiles("$output_filestem.html") if (-e "$output_filestem.html"); 801 802 if (-e "$output_filestem.err") { 802 803 if ($faillogfile ne "" && defined(open(FAILLOG,">>$faillogfile"))) … … 807 808 close FAILLOG; 808 809 } 809 & util::rm("$output_filestem.err");810 &FileUtils::removeFiles("$output_filestem.err"); 810 811 } 811 812 return 0; 812 813 } 813 814 814 & util::rm("$output_filestem.err") if (-e "$output_filestem.err");815 & util::rm("$output_filestem.out") if (-e "$output_filestem.out");815 &FileUtils::removeFiles("$output_filestem.err") if (-e "$output_filestem.err"); 816 &FileUtils::removeFiles("$output_filestem.out") if (-e "$output_filestem.out"); 816 817 return 1; 817 818 } … … 873 874 if ($retval !=0) 874 875 { 875 & util::rm("$output_filestem.out") if (-e "$output_filestem.out");876 &FileUtils::removeFiles("$output_filestem.out") if (-e "$output_filestem.out"); 876 877 #print out the converter's std err, if any 877 878 if (-s "$output_filestem.err") { … … 883 884 close ERRLOG; 884 885 } 885 #& util::rm("$output_filestem.html") if (-e "$output_filestem.html");886 #&FileUtils::removeFiles("$output_filestem.html") if (-e "$output_filestem.html"); 886 887 if (-e "$output_filestem.err") { 887 888 if ($faillogfile ne "" && defined(open(FAILLOG,">>$faillogfile"))) … … 892 893 close FAILLOG; 893 894 } 894 & util::rm("$output_filestem.err");895 &FileUtils::removeFiles("$output_filestem.err"); 895 896 } 896 897 return 0; 897 898 } 898 & util::rm("$output_filestem.err") if (-e "$output_filestem.err");899 & util::rm("$output_filestem.out") if (-e "$output_filestem.out");899 &FileUtils::removeFiles("$output_filestem.err") if (-e "$output_filestem.err"); 900 &FileUtils::removeFiles("$output_filestem.out") if (-e "$output_filestem.out"); 900 901 return 1; 901 902 } … … 917 918 { 918 919 print STDERR "Error executing $cmd: $!\n"; 919 & util::rm("$output_filestem.text") if (-e "$output_filestem.text");920 &FileUtils::removeFiles("$output_filestem.text") if (-e "$output_filestem.text"); 920 921 } 921 922 … … 932 933 if ($seen_text==0) { # no text was extracted 933 934 print STDERR "Error: pdftotext found no text\n"; 934 & util::rm("$output_filestem.text");935 &FileUtils::removeFiles("$output_filestem.text"); 935 936 } 936 937 } … … 949 950 } 950 951 # does this converter create a .out file? 951 & util::rm("$output_filestem.out") if (-e "$output_filestem.out");952 & util::rm("$output_filestem.text") if (-e "$output_filestem.text");952 &FileUtils::removeFiles("$output_filestem.out") if (-e "$output_filestem.out"); 953 &FileUtils::removeFiles("$output_filestem.text") if (-e "$output_filestem.text"); 953 954 if (-e "$output_filestem.err") { 954 955 if ($faillogfile ne "" && defined(open(FAILLOG,">>$faillogfile"))) … … 959 960 close FAILLOG; 960 961 } 961 & util::rm("$output_filestem.err");962 &FileUtils::removeFiles("$output_filestem.err"); 962 963 } 963 964 return 0; 964 965 } 965 & util::rm("$output_filestem.err") if (-e "$output_filestem.err");966 &FileUtils::removeFiles("$output_filestem.err") if (-e "$output_filestem.err"); 966 967 return 1; 967 968 } … … 1013 1014 { 1014 1015 print STDERR "Warning: Error executing gs: $error\n"; 1015 & util::rm("$output_filestem.text") if (-e "$output_filestem.text");1016 &FileUtils::removeFiles("$output_filestem.text") if (-e "$output_filestem.text"); 1016 1017 1017 1018 if ("$faillogfile" ne "" && defined(open (FAILLOG, ">>$faillogfile"))) … … 1025 1026 close FAILLOG; 1026 1027 } 1027 & util::rm("$output_filestem.err") if (-e "$output_filestem.err");1028 &FileUtils::removeFiles("$output_filestem.err") if (-e "$output_filestem.err"); 1028 1029 1029 1030 … … 1112 1113 # wrap the text - use a minimum length. ie, first space after this length. 1113 1114 my $wrap_length=72; 1114 & util::mv("$output_filestem.text", "$output_filestem.text.tmp");1115 &FileUtils::moveFiles("$output_filestem.text", "$output_filestem.text.tmp"); 1115 1116 open INFILE, "$output_filestem.text.tmp" || 1116 1117 die "Couldn't open file: $!"; … … 1131 1132 close INFILE; 1132 1133 close OUTFILE; 1133 & util::rm("$output_filestem.text.tmp");1134 1135 & util::rm("$output_filestem.err") if (-e "$output_filestem.err");1134 &FileUtils::removeFiles("$output_filestem.text.tmp"); 1135 1136 &FileUtils::removeFiles("$output_filestem.err") if (-e "$output_filestem.err"); 1136 1137 return 1; 1137 1138 } … … 1171 1172 close TEXT; 1172 1173 1173 & util::rm("$output_filestem.text") if (-e "$output_filestem.text");1174 &FileUtils::removeFiles("$output_filestem.text") if (-e "$output_filestem.text"); 1174 1175 return 1; 1175 1176 } … … 1224 1225 } 1225 1226 1226 & util::rm("$output_filestem.text");1227 &FileUtils::removeFiles("$output_filestem.text"); 1227 1228 return 0; 1228 1229 -
main/trunk/greenstone2/perllib/plugins/BaseMediaConverter.pm
r24350 r27509 117 117 } 118 118 119 my $base_output_dir = & util::filename_cat($collect_dir,"cached",$dirname);119 my $base_output_dir = &FileUtils::filenameConcatenate($collect_dir,"cached",$dirname); 120 120 121 121 if (!-e $base_output_dir ) { … … 123 123 if ($verbosity>2); 124 124 125 & util::mk_all_dir($base_output_dir);126 } 127 128 my $output_dir = & util::filename_cat($base_output_dir,$file_root);125 &FileUtils::makeAllDirectories($base_output_dir); 126 } 127 128 my $output_dir = &FileUtils::filenameConcatenate($base_output_dir,$file_root); 129 129 130 130 if (!-e $output_dir) { … … 132 132 if ($verbosity>2); 133 133 134 & util::mk_dir($output_dir);134 &FileUtils::makeAllDirectories($output_dir); 135 135 } 136 136 -
main/trunk/greenstone2/perllib/plugins/ConvertBinaryFile.pm
r26893 r27509 45 45 no strict 'subs'; 46 46 use util; 47 use FileUtils; 47 48 48 49 … … 108 109 my $colplugname = undef; 109 110 if (defined $ENV{'GSDLCOLLECTDIR'}) { 110 $colplugname = & util::filename_cat($ENV{'GSDLCOLLECTDIR'},111 $colplugname = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'}, 111 112 "perllib","plugins", 112 113 $plugin_package); 113 114 } 114 115 115 my $mainplugname = & util::filename_cat($ENV{'GSDLHOME'},116 my $mainplugname = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, 116 117 "perllib","plugins", 117 118 $plugin_package); … … 255 256 256 257 my $lc_suffix = lc($suffix); 257 my $tmp_filename = & util::filename_cat($tmp_dirname, "$utf8_tailname$lc_suffix");258 my $tmp_filename = &FileUtils::filenameConcatenate($tmp_dirname, "$utf8_tailname$lc_suffix"); 258 259 259 260 # If gsdl is remote, we're given relative path to input file, of the form import/tailname.suffix … … 261 262 # the input_filename is the absolute path, see http://perldoc.perl.org/File/Spec.html 262 263 my $ensure_path_absolute = 1; # true 263 & util::soft_link($input_filename, $tmp_filename, $ensure_path_absolute);264 &FileUtils::softLink($input_filename, $tmp_filename, $ensure_path_absolute); 264 265 my $verbosity = $self->{'verbosity'}; 265 266 if ($verbosity > 0) { … … 267 268 } 268 269 269 my $errlog = & util::filename_cat($tmp_dirname, "err.log");270 my $errlog = &FileUtils::filenameConcatenate($tmp_dirname, "err.log"); 270 271 271 272 # Execute the conversion command and get the type of the result, … … 290 291 291 292 # remove symbolic link to original file 292 & util::rm($tmp_filename);293 &FileUtils::removeFiles($tmp_filename); 293 294 294 295 # Check STDERR here … … 307 308 close ERRLOG; 308 309 } 309 & util::rm("$errlog") if (-e "$errlog");310 &FileUtils::removeFiles("$errlog") if (-e "$errlog"); 310 311 return ""; 311 312 } … … 364 365 } 365 366 else { 366 & util::mv("${conv_filename}.tmp", $conv_filename);367 &FileUtils::moveFiles("${conv_filename}.tmp", $conv_filename); 367 368 } 368 369 } … … 460 461 # associate original file with doc object 461 462 my $cursection = $doc_obj->get_top_section(); 462 my $filename = & util::filename_cat($base_dir, $file);463 my $filename = &FileUtils::filenameConcatenate($base_dir, $file); 463 464 my $assocfilename = "doc.$doc_ext"; 464 465 if ($self->{'keep_original_filename'} == 1) { … … 489 490 if (defined $tmp_dir && -d $tmp_dir) { 490 491 ##print STDERR "**** Suppressing clean up of tmp dir\n"; 491 & util::rm_r($tmp_dir);492 &FileUtils::removeFilesRecursive($tmp_dir); 492 493 $self->{'tmp_dir'} = undef; 493 494 } -
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 } -
main/trunk/greenstone2/perllib/util.pm
r27374 r27509 27 27 28 28 use strict; 29 use FileUtils; 29 30 30 31 use Encode; … … 238 239 239 240 $tmp_dirname = &FileUtils::filenameConcatenate($tmp_dirname, "tmp"); 240 & util::mk_dir($tmp_dirname) if (!-e $tmp_dirname);241 &FileUtils::makeDirectory($tmp_dirname) if (!-e $tmp_dirname); 241 242 242 243 # add the timestamp into the path otherwise we can run into problems … … 250 251 $i++; 251 252 } 252 & util::mk_dir($tmp_dirname);253 &FileUtils::makeDirectory($tmp_dirname); 253 254 254 255 return $tmp_dirname;
Note:
See TracChangeset
for help on using the changeset viewer.