Changeset 27306 for main/trunk/greenstone2/perllib/mgppbuilder.pm
- Timestamp:
- 2013-05-06T15:29:38+12:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/mgppbuilder.pm
r24460 r27306 31 31 use strict; no strict 'refs'; 32 32 use util; 33 use FileUtils; 33 34 34 35 … … 171 172 my $exedir = "$ENV{'GSDLHOME'}/bin/$ENV{'GSDLOS'}"; 172 173 my $exe = &util::get_os_exe (); 173 my $mgpp_passes_exe = & util::filename_cat($exedir, "mgpp_passes$exe");174 my $mgpp_compression_dict_exe = & util::filename_cat($exedir, "mgpp_compression_dict$exe");174 my $mgpp_passes_exe = &FileUtils::filenameConcatenate($exedir, "mgpp_passes$exe"); 175 my $mgpp_compression_dict_exe = &FileUtils::filenameConcatenate($exedir, "mgpp_compression_dict$exe"); 175 176 my $outhandle = $self->{'outhandle'}; 176 177 177 178 my $maxnumeric = $self->{'maxnumeric'}; 178 179 179 & util::mk_all_dir (&util::filename_cat($self->{'build_dir'}, "text"));180 &FileUtils::makeAllDirectories (&FileUtils::filenameConcatenate($self->{'build_dir'}, "text")); 180 181 181 182 my $collect_tail = &util::get_dirsep_tail($self->{'collection'}); 182 my $basefilename = & util::filename_cat("text",$collect_tail);183 my $fulltextprefix = & util::filename_cat($self->{'build_dir'}, $basefilename);183 my $basefilename = &FileUtils::filenameConcatenate("text",$collect_tail); 184 my $fulltextprefix = &FileUtils::filenameConcatenate($self->{'build_dir'}, $basefilename); 184 185 185 186 my $osextra = ""; … … 384 385 # get the full index directory path and make sure it exists 385 386 my $indexdir = $self->{'index_mapping'}->{$index}; 386 & util::mk_all_dir (&util::filename_cat($self->{'build_dir'}, $indexdir));387 &FileUtils::makeAllDirectories (&FileUtils::filenameConcatenate($self->{'build_dir'}, $indexdir)); 387 388 388 389 my $collect_tail = &util::get_dirsep_tail($self->{'collection'}); 389 my $fullindexprefix = & util::filename_cat($self->{'build_dir'},390 my $fullindexprefix = &FileUtils::filenameConcatenate($self->{'build_dir'}, 390 391 $indexdir, 391 392 $collect_tail); 392 my $fulltextprefix = & util::filename_cat($self->{'build_dir'}, "text",393 my $fulltextprefix = &FileUtils::filenameConcatenate($self->{'build_dir'}, "text", 393 394 $collect_tail); 394 395 … … 397 398 398 399 my $exe = &util::get_os_exe (); 399 my $mgpp_passes_exe = & util::filename_cat($exedir, "mgpp_passes$exe");400 my $mgpp_passes_exe = &FileUtils::filenameConcatenate($exedir, "mgpp_passes$exe"); 400 401 401 402 # define the section names for mgpasses … … 406 407 407 408 my $mgpp_perf_hash_build_exe = 408 & util::filename_cat($exedir, "mgpp_perf_hash_build$exe");409 &FileUtils::filenameConcatenate($exedir, "mgpp_perf_hash_build$exe"); 409 410 my $mgpp_weights_build_exe = 410 & util::filename_cat($exedir, "mgpp_weights_build$exe");411 &FileUtils::filenameConcatenate($exedir, "mgpp_weights_build$exe"); 411 412 my $mgpp_invf_dict_exe = 412 & util::filename_cat($exedir, "mgpp_invf_dict$exe");413 &FileUtils::filenameConcatenate($exedir, "mgpp_invf_dict$exe"); 413 414 my $mgpp_stem_idx_exe = 414 & util::filename_cat($exedir, "mgpp_stem_idx$exe");415 &FileUtils::filenameConcatenate($exedir, "mgpp_stem_idx$exe"); 415 416 416 417 my $maxnumeric = $self->{'maxnumeric'}; … … 595 596 596 597 # remove unwanted files 597 my $tmpdir = & util::filename_cat($self->{'build_dir'}, $indexdir);598 my $tmpdir = &FileUtils::filenameConcatenate($self->{'build_dir'}, $indexdir); 598 599 opendir (DIR, $tmpdir) || die 599 600 "mgppbuilder::build_index - couldn't read directory $tmpdir\n"; … … 604 605 # delete it! 605 606 print $outhandle "deleting $file\n" if $self->{'verbosity'} > 2; 606 #&util::rm (& util::filename_cat($tmpdir, $file));607 #&util::rm (&FileUtils::filenameConcatenate($tmpdir, $file)); 607 608 } 608 609 }
Note:
See TracChangeset
for help on using the changeset viewer.