- Timestamp:
- 2013-05-06T15:29:38+12:00 (11 years ago)
- Location:
- main/trunk/greenstone2/perllib
- Files:
-
- 1 added
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/basebuilder.pm
r27192 r27306 35 35 use plugin; 36 36 use util; 37 use FileUtils; 37 38 38 39 … … 248 249 if (!$self->{'debug'} && !$self->{'keepold'}) { 249 250 # remove any old builds 250 & util::rm_r($self->{'build_dir'});251 & util::mk_all_dir($self->{'build_dir'});251 &FileUtils::removeFilesRecursive($self->{'build_dir'}); 252 &FileUtils::makeAllDirectories($self->{'build_dir'}); 252 253 253 254 # make the text directory 254 255 my $textdir = "$self->{'build_dir'}/text"; 255 & util::mk_all_dir($textdir);256 &FileUtils::makeAllDirectories($textdir); 256 257 } 257 258 … … 404 405 print STDERR "BuildDir: $self->{'build_dir'}\n"; 405 406 406 my $textdir = & util::filename_cat($self->{'build_dir'}, "text");407 my $assocdir = & util::filename_cat($self->{'build_dir'}, "assoc");408 & util::mk_all_dir($textdir);409 & util::mk_all_dir($assocdir);407 my $textdir = &FileUtils::filenameConcatenate($self->{'build_dir'}, "text"); 408 my $assocdir = &FileUtils::filenameConcatenate($self->{'build_dir'}, "assoc"); 409 &FileUtils::makeAllDirectories ($textdir); 410 &FileUtils::makeAllDirectories ($assocdir); 410 411 411 412 # Get info database file path … … 541 542 542 543 # get the text directory 543 & util::mk_all_dir($self->{'build_dir'});544 &FileUtils::makeAllDirectories ($self->{'build_dir'}); 544 545 545 546 # store the build date … … 596 597 597 598 # write out the earliestDatestamp information needed for OAI 598 my $archivedir = & util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "archives");599 my $archivedir = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'}, "archives"); 599 600 if(!-d $archivedir) { 600 $archivedir = & util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "export");601 } 602 my $earliestDatestampFile = & util::filename_cat($archivedir, "earliestDatestamp");601 $archivedir = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'}, "export"); 602 } 603 my $earliestDatestampFile = &FileUtils::filenameConcatenate($archivedir, "earliestDatestamp"); 603 604 my $earliestDatestamp = 0; 604 605 if (open(FIN,"<$earliestDatestampFile")) { … … 620 621 621 622 if ($gs_mode eq "gs2") { 622 &colcfg::write_build_cfg(& util::filename_cat($self->{'build_dir'},"build.cfg"), $build_cfg);623 &colcfg::write_build_cfg(&FileUtils::filenameConcatenate($self->{'build_dir'},"build.cfg"), $build_cfg); 623 624 } 624 625 if ($gs_mode eq "gs3") { 625 626 626 &colcfg::write_build_cfg_xml(& util::filename_cat($self->{'build_dir'}, "buildConfig.xml"), $build_cfg, $self->{'collect_cfg_preserve'});627 &colcfg::write_build_cfg_xml(&FileUtils::filenameConcatenate($self->{'build_dir'}, "buildConfig.xml"), $build_cfg, $self->{'collect_cfg_preserve'}); 627 628 } 628 629 … … 766 767 } 767 768 768 my $buildconfigfile = & util::filename_cat($self->{'build_dir'}, $buildconfigfilename);769 my $buildconfigfile = &FileUtils::filenameConcatenate($self->{'build_dir'}, $buildconfigfilename); 769 770 770 771 if (!-e $buildconfigfile) { 771 772 # try the index dir - but do we know where it is?? try here 772 $buildconfigfile = & util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "index", $buildconfigfilename);773 $buildconfigfile = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'}, "index", $buildconfigfilename); 773 774 if (!-e $buildconfigfile) { 774 775 #we cant find a config file - just ignore the field list -
main/trunk/greenstone2/perllib/basebuildproc.pm
r27188 r27306 39 39 no strict 'refs'; 40 40 use util; 41 use FileUtils; 41 42 42 43 BEGIN { … … 78 79 # For incremental building need to seed num_docs etc from values 79 80 # stored in build.cfg (if present) 80 $buildconfigfile = & util::filename_cat($build_dir, "build.cfg");81 $buildconfigfile = &FileUtils::filenameConcatenate($build_dir, "build.cfg"); 81 82 if (-e $buildconfigfile) { 82 83 $found_num_data = 1; … … 84 85 else { 85 86 # try the index dir 86 $buildconfigfile = & util::filename_cat($ENV{'GSDLCOLLECTDIR'},87 $buildconfigfile = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'}, 87 88 "index", "build.cfg"); 88 89 if (-e $buildconfigfile) { … … 835 836 # dir, otherwise it is relative to the HASH... directory 836 837 if ($assoc_file->[1] =~ m@^[/\\]@) { 837 $afile = & util::filename_cat($self->{'assocdir'}, $assoc_file->[1]);838 $afile = &FileUtils::filenameConcatenate($self->{'assocdir'}, $assoc_file->[1]); 838 839 } else { 839 $afile = & util::filename_cat($self->{'assocdir'}, $archivedir, $assoc_file->[1]);840 $afile = &FileUtils::filenameConcatenate($self->{'assocdir'}, $archivedir, $assoc_file->[1]); 840 841 } 841 842 842 & util::hard_link($assoc_file->[0], $afile, $self->{'verbosity'});843 &FileUtils::hardLink($assoc_file->[0], $afile, $self->{'verbosity'}); 843 844 } 844 845 } … … 849 850 my ($archivedir, $edit_mode) = @_; 850 851 851 my $assoc_dir = & util::filename_cat($self->{'assocdir'}, $archivedir);852 my $assoc_dir = &FileUtils::filenameConcatenate($self->{'assocdir'}, $archivedir); 852 853 if (-d $assoc_dir) { 853 & util::rm_r($assoc_dir);854 } 855 } 854 &FileUtils::removeFilesRecursive($assoc_dir); 855 } 856 } -
main/trunk/greenstone2/perllib/colcfg.pm
r27189 r27306 31 31 use cfgread; 32 32 use gsprintf 'gsprintf'; 33 use util; 34 use FileUtils; 35 33 36 use strict; 34 37 … … 268 271 # gsdl/collect/COLLECTION/custom/COLLECTION/etc/custom.cfg file. This 269 272 # customization was added for DLC by Stefan, 30/6/2007. 270 my $configfilename = & util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "custom", $ENV{'GSDLCOLLECTION'}, "etc", "custom.cfg");273 my $configfilename = &FileUtils::filenameConcatenate ($ENV{'GSDLCOLLECTDIR'}, "custom", $ENV{'GSDLCOLLECTION'}, "etc", "custom.cfg"); 271 274 272 275 if (-e $configfilename) { … … 275 278 276 279 # Check if there is a collectionConfig.xml file. If there is one, it's gs3 277 $configfilename = & util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "etc", "collectionConfig.xml");280 $configfilename = &FileUtils::filenameConcatenate ($ENV{'GSDLCOLLECTDIR'}, "etc", "collectionConfig.xml"); 278 281 if (-e $configfilename) { 279 282 return ($configfilename, "gs3"); … … 281 284 282 285 # If we get to here we check if there is a collect.cfg file in the usual place, i.e. it is gs2. 283 $configfilename = & util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "etc", "collect.cfg");286 $configfilename = &FileUtils::filenameConcatenate ($ENV{'GSDLCOLLECTDIR'}, "etc", "collect.cfg"); 284 287 if (-e $configfilename) { 285 288 return ($configfilename, "gs2"); … … 304 307 305 308 if($gs_version eq "gs2") { 306 $configfilename = & util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "custom", $ENV{'GSDLCOLLECTION'}, "etc", "custom.cfg");309 $configfilename = &FileUtils::filenameConcatenate ($ENV{'GSDLCOLLECTDIR'}, "custom", $ENV{'GSDLCOLLECTION'}, "etc", "custom.cfg"); 307 310 308 311 if (-e $configfilename) { … … 313 316 # Check if there is a collectionConfig.xml file if it's gs3 314 317 if($gs_version eq "gs3") { 315 $configfilename = & util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "etc", "collectionConfig.xml");318 $configfilename = &FileUtils::filenameConcatenate ($ENV{'GSDLCOLLECTDIR'}, "etc", "collectionConfig.xml"); 316 319 if (-e $configfilename) { 317 320 return $configfilename; … … 321 324 # Check if there is a collect.cfg file in the usual place for gs2. 322 325 if($gs_version eq "gs2") { 323 $configfilename = & util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "etc", "collect.cfg");326 $configfilename = &FileUtils::filenameConcatenate ($ENV{'GSDLCOLLECTDIR'}, "etc", "collect.cfg"); 324 327 if (-e $configfilename) { 325 328 return $configfilename; -
main/trunk/greenstone2/perllib/dbutil/gdbm.pm
r23758 r27306 29 29 use strict; 30 30 31 use util; 32 use FileUtils; 31 33 use dbutil::gdbmtxtgz; 32 34 … … 40 42 my $opt_append = shift(@_); 41 43 42 my $txt2db_exe = & util::filename_cat($ENV{'GSDLHOME'},"bin",$ENV{'GSDLOS'}, "txt2db" . &util::get_os_exe());44 my $txt2db_exe = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"bin",$ENV{'GSDLOS'}, "txt2db" . &util::get_os_exe()); 43 45 my $infodb_file_handle = undef; 44 46 my $cmd = "\"$txt2db_exe\""; … … 84 86 my $infodb_file_extension = ".gdb"; 85 87 my $infodb_file_name = &util::get_dirsep_tail($collection_name) . $infodb_file_extension; 86 return & util::filename_cat($infodb_directory_path, $infodb_file_name);88 return &FileUtils::filenameConcatenate($infodb_directory_path, $infodb_file_name); 87 89 } 88 90 -
main/trunk/greenstone2/perllib/doc.pm
r26850 r27306 37 37 use unicode; 38 38 use util; 39 use FileUtils; 39 40 use ghtml; 40 41 use File::stat; … … 89 90 $self->{'terse_source_path'} = $source_filename; 90 91 92 # Use the FileUtil library methods as they are aware of more special 93 # cases such as HDFS [jmt12] 94 ##if (&util::file_exists($source_filename)) { 91 95 if (-e $source_filename) { 92 96 # See if we can do better for Windows with a filename … … 241 245 # print STDERR "-> $srcfilename -> "; 242 246 # $srcfilename = &util::rename_file($srcfilename.$suffix, $rename_method); 243 # $source_filename = & util::filename_cat($dirname, $srcfilename);247 # $source_filename = &FileUtils::filenameConcatenate($dirname, $srcfilename); 244 248 # print STDERR "$source_filename\n"; 245 249 … … 257 261 # print STDERR "-> $srcfilename -> "; 258 262 $srcfilename = &util::rename_file($srcfilename.$suffix, $rename_method); 259 $source_filename = & util::filename_cat($dirname, $srcfilename);263 $source_filename = &FileUtils::filenameConcatenate($dirname, $srcfilename); 260 264 261 265 return $source_filename; … … 304 308 } 305 309 306 if (!& util::filename_is_absolute($filename)) {307 $filename = & util::filename_cat($ENV{'GSDLCOLLECTDIR'},$filename);310 if (!&FileUtils::isFilenameAbsolute($filename)) { 311 $filename = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'},$filename); 308 312 } 309 313 … … 367 371 my $osexe = &util::get_os_exe(); 368 372 369 my $hashfile_exe = & util::filename_cat($ENV{'GSDLHOME'},"bin",373 my $hashfile_exe = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"bin", 370 374 $ENV{'GSDLOS'},"hashfile$osexe"); 371 375 -
main/trunk/greenstone2/perllib/gsprintf.pm
r25499 r27306 32 32 use unicode; 33 33 use util; 34 use FileUtils; 34 35 35 36 @gsprintf::EXPORT_OK = qw(gsprintf); # functions we can export into namespace … … 236 237 237 238 my $primary_resourcebundlefile 238 = & util::filename_cat($bundle_base,$primary_dir,$resourcename);239 = &FileUtils::filenameConcatenate($bundle_base,$primary_dir,$resourcename); 239 240 240 241 my $resourcebundle = read_resource_bundle($primary_resourcebundlefile); … … 245 246 foreach my $e (@extensions) { 246 247 my $ext_base 247 = & util::filename_cat($bundle_base,"ext",$e);248 = &FileUtils::filenameConcatenate($bundle_base,"ext",$e); 248 249 249 250 my $ext_resourcebundlefile 250 = & util::filename_cat($ext_base,$primary_dir,$resourcename);251 = &FileUtils::filenameConcatenate($ext_base,$primary_dir,$resourcename); 251 252 252 253 # can ignore return value (will be same reference to $resourcebundle) … … 258 259 foreach my $e (@extensions) { 259 260 my $ext_base 260 = & util::filename_cat($ENV{'GSDL3SRCHOME'},"ext",$e);261 = &FileUtils::filenameConcatenate($ENV{'GSDL3SRCHOME'},"ext",$e); 261 262 262 263 my $ext_resourcebundlefile 263 = & util::filename_cat($ext_base,$primary_dir,$resourcename);264 = &FileUtils::filenameConcatenate($ext_base,$primary_dir,$resourcename); 264 265 265 266 # can ignore return value (will be same reference to $resourcebundle) -
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 } -
main/trunk/greenstone2/perllib/plugins/ArchivesInfPlugin.pm
r24351 r27306 31 31 32 32 use util; 33 use FileUtils; 33 34 use doc; 34 35 use PrintInfo; … … 120 121 my $base_dir =$self->{'base_dir'}; 121 122 122 my $doc_filename = & util::filename_cat($base_dir,$doc_file);123 my $doc_filename = &FileUtils::filenameConcatenate($base_dir,$doc_file); 123 124 124 125 my ($doc_tailname, $doc_dirname, $suffix) … … 229 230 230 231 # see if this has a archives information file within it 231 ## my $archive_info_filename = & util::filename_cat($base_dir,$file,"archives.inf");232 my $archive_info_filename = &dbutil::get_infodb_file_path($infodbtype, "archiveinf-doc", & util::filename_cat($base_dir, $file));232 ## my $archive_info_filename = &FileUtils::filenameConcatenate($base_dir,$file,"archives.inf"); 233 my $archive_info_filename = &dbutil::get_infodb_file_path($infodbtype, "archiveinf-doc", &FileUtils::filenameConcatenate($base_dir, $file)); 233 234 234 235 if (-e $archive_info_filename) { … … 254 255 last if ($maxdocs != -1 && ($total_count + $count) >= $maxdocs); 255 256 256 my $tmp = & util::filename_cat($file, $subfile->[0]);257 my $tmp = &FileUtils::filenameConcatenate($file, $subfile->[0]); 257 258 next if $tmp eq $file; 258 259 -
main/trunk/greenstone2/perllib/plugins/BasePlugin.pm
r26893 r27306 39 39 use ghtml; 40 40 use gsprintf 'gsprintf'; 41 use util; 42 use FileUtils; 41 43 42 44 use PrintInfo; … … 447 449 return if $coverfile eq $filename; 448 450 449 if (!& util::fd_exists($coverfile)) {451 if (!&FileUtils::fileExists($coverfile)) { 450 452 $coverfile =~ s/jpg$/JPG/; 451 453 } 452 if (& util::fd_exists($coverfile)) {454 if (&FileUtils::fileExists($coverfile)) { 453 455 &util::block_filename($block_hash,$coverfile); 454 456 } … … 1418 1420 my $top_section=$doc_obj->get_top_section(); 1419 1421 1420 if (& util::fd_exists($upgraded_filename)) {1422 if (&FileUtils::fileExists($upgraded_filename)) { 1421 1423 $doc_obj->associate_source_file($filename); 1422 1424 $doc_obj->associate_file($filename, "cover.jpg", "image/jpeg"); … … 1429 1431 $upgraded_upper_filename =~ s/jpg$/JPG/; 1430 1432 1431 if (& util::fd_exists($upgraded_upper_filename)) {1433 if (&FileUtils::fileExists($upgraded_upper_filename)) { 1432 1434 $doc_obj->associate_source_file($upper_filename); 1433 1435 $doc_obj->associate_file($upper_filename, "cover.jpg", -
main/trunk/greenstone2/perllib/plugins/DirectoryPlugin.pm
r26867 r27306 34 34 use plugin; 35 35 use util; 36 use FileUtils; 36 37 use metadatautil; 37 38 … … 294 295 # that it is not explicitly blocked. 295 296 my $dirname = $file; 296 $dirname = & util::filename_cat($base_dir, $file) if $base_dir =~ /\w/;297 $dirname = &FileUtils::filenameConcatenate($base_dir, $file) if $base_dir =~ /\w/; 297 298 298 299 my $directory_ok = $self->check_directory_path($dirname); … … 329 330 330 331 my $this_file_base_dir = $base_dir; 331 my $raw_file_subfile = & util::filename_cat($file, $raw_subfile);332 my $raw_file_subfile = &FileUtils::filenameConcatenate($file, $raw_subfile); 332 333 333 334 # Recursively read each $raw_subfile … … 381 382 } else { 382 383 $dirname = $file; 383 $dirname = & util::filename_cat($base_dir, $file) if $base_dir =~ /\w/;384 $dirname = &FileUtils::filenameConcatenate($base_dir, $file) if $base_dir =~ /\w/; 384 385 } 385 386 … … 412 413 # Re-order the files in the list so any directories ending with .all are moved to the end 413 414 for (my $i = scalar(@dir) - 1; $i >= 0; $i--) { 414 if (-d & util::filename_cat($dirname, $dir[$i]) && $dir[$i] =~ /\.all$/) {415 if (-d &FileUtils::filenameConcatenate($dirname, $dir[$i]) && $dir[$i] =~ /\.all$/) { 415 416 push(@dir, splice(@dir, $i, 1)); 416 417 } … … 461 462 my $raw_subfile = &unicode::url_encoded_to_raw_filename($subfile); 462 463 463 my $raw_file_subfile = & util::filename_cat($file, $raw_subfile);464 my $raw_full_filename = & util::filename_cat($this_file_base_dir, $raw_file_subfile);464 my $raw_file_subfile = &FileUtils::filenameConcatenate($file, $raw_subfile); 465 my $raw_full_filename = &FileUtils::filenameConcatenate($this_file_base_dir, $raw_file_subfile); 465 466 466 467 if ($self->file_is_blocked($block_hash,$raw_full_filename)) { … … 542 543 my $raw_subfile = &unicode::url_encoded_to_raw_filename($subfile); 543 544 544 my $raw_file_subfile = & util::filename_cat($file, $raw_subfile);545 my $raw_file_subfile = &FileUtils::filenameConcatenate($file, $raw_subfile); 545 546 my $raw_full_filename 546 = & util::filename_cat($this_file_base_dir,$raw_file_subfile);547 = &FileUtils::filenameConcatenate($this_file_base_dir,$raw_file_subfile); 547 548 548 549 if ($self->file_is_blocked($block_hash,$raw_full_filename)) { … … 554 555 if ($raw_subfile =~ /(?i)\.lnk$/ && $ENV{'GSDLOS'} =~ /^windows$/i) { 555 556 require Win32::Shortcut; 556 my $shortcut = new Win32::Shortcut(& util::filename_cat($dirname, $raw_subfile));557 my $shortcut = new Win32::Shortcut(&FileUtils::filenameConcatenate($dirname, $raw_subfile)); 557 558 if ($shortcut) { 558 559 # The file to be processed is now the target of the shortcut -
main/trunk/greenstone2/perllib/plugins/GreenstoneXMLPlugin.pm
r23753 r27306 36 36 37 37 use ReadXMLFile; 38 use util; 39 use FileUtils; 38 40 39 41 use strict; … … 118 120 119 121 my $dirname = dirname($filename_full_path); 120 my $full_gsdl_assoc_filename = & util::filename_cat($dirname,$gsdl_assoc_file);122 my $full_gsdl_assoc_filename = &FileUtils::filenameConcatenate($dirname,$gsdl_assoc_file); 121 123 if ($self->{'verbosity'}>2) { 122 124 print $outhandle " Storing block list item: $full_gsdl_assoc_filename\n"; … … 316 318 { 317 319 # And if not, append it so as to make this absolute 318 $assoc_filepath = & util::filename_cat($self->{'base_dir'}, $assoc_filepath);320 $assoc_filepath = &FileUtils::filenameConcatenate($self->{'base_dir'}, $assoc_filepath); 319 321 } 320 322 } … … 331 333 #rint STDERR "mime_type: $mime_type\n"; 332 334 #rint STDERR "dir: $dir\n"; 333 my $real_dir = & util::filename_cat($assoc_filepath, $assoc_file),335 my $real_dir = &FileUtils::filenameConcatenate($assoc_filepath, $assoc_file), 334 336 my $assoc_dir = (defined $dir && $dir ne "") 335 ? & util::filename_cat($dir, $assoc_file) : $assoc_file;337 ? &FileUtils::filenameConcatenate($dir, $assoc_file) : $assoc_file; 336 338 $self->{'doc_obj'}->associate_file($real_dir, $assoc_dir, $mime_type); 337 339 #rint STDERR "According to me the real assoc_filepath is: $real_dir\n"; -
main/trunk/greenstone2/perllib/plugins/HTMLPlugin.pm
r25673 r27306 44 44 use unicode; 45 45 use util; 46 use FileUtils; 46 47 use XMLParser; 47 48 … … 229 230 # Turn relative file path into full path 230 231 my $dirname = &File::Basename::dirname($filename_full_path); 231 $raw_link = & util::filename_cat($dirname, $raw_link);232 $raw_link = &FileUtils::filenameConcatenate($dirname, $raw_link); 232 233 } 233 234 $raw_link = $self->eval_dir_dots($raw_link); … … 336 337 337 338 # set the file to be tidied 338 $input_filename = & util::filename_cat($base_dir,$file) if $base_dir =~ m/\w/;339 $input_filename = &FileUtils::filenameConcatenate($base_dir,$file) if $base_dir =~ m/\w/; 339 340 340 341 # get the tidied file … … 386 387 } 387 388 388 my $filename = & util::filename_cat($base_dir,$file);389 my $filename = &FileUtils::filenameConcatenate($base_dir,$file); 389 390 my $upgraded_base_dir = &util::upgrade_if_dos_filename($base_dir); 390 391 my $upgraded_filename = &util::upgrade_if_dos_filename($filename); … … 709 710 if(scalar(@styleTagsText) > 0) 710 711 { 711 my $css_filename_dirname = &File::Basename::dirname(& util::filename_cat($base_dir, $file));712 my $css_filename_dirname = &File::Basename::dirname(&FileUtils::filenameConcatenate($base_dir, $file)); 712 713 foreach my $styleText (@styleTagsText) 713 714 { … … 823 824 my $directory = &File::Basename::dirname($file); 824 825 825 my $css_filename = & util::filename_cat($base_dir, $directory, $actual_link);826 my $css_filename = &FileUtils::filenameConcatenate($base_dir, $directory, $actual_link); 826 827 $self->retrieve_css_associated_files($css_filename); 827 828 } … … 943 944 $img_url =~ s/^\s*"?([^"]*)"?\s*$/$1/; 944 945 945 $self->{'css_assoc_files'}->{& util::filename_cat($css_filename_dirname, $img_url)} = $img_url;946 $self->{'css_assoc_files'}->{&FileUtils::filenameConcatenate($css_filename_dirname, $img_url)} = $img_url; 946 947 } 947 948 } … … 980 981 } 981 982 982 $filename = & util::filename_cat($base_dir, $filename);983 $filename = &FileUtils::filenameConcatenate($base_dir, $filename); 983 984 984 985 if (($self->{'use_realistic_book'}) || ($self->{'old_style_HDL'})) { … … 1035 1036 # some special processing if the intended filename was converted to utf8, but 1036 1037 # the actual file still needs to be renamed 1037 if (!&util::fd_exists($filename)) { 1038 #if (!&util::fd_exists($filename)) { 1039 if (!&FileUtils::fileExists($filename)) { 1038 1040 # try the original filename stored in map 1039 1041 if ((defined $ENV{"DEBUG_UNICODE"}) && ($ENV{"DEBUG_UNICODE"})) { … … 1131 1133 # Turn url (using /) into file name (possibly using \ on windows) 1132 1134 my @http_dir_split = split('/', $before_hash); 1133 $before_hash = & util::filename_cat(@http_dir_split);1135 $before_hash = &FileUtils::filenameConcatenate(@http_dir_split); 1134 1136 } 1135 1137 1136 1138 $before_hash = $self->eval_dir_dots($before_hash); 1137 1139 1138 my $linkfilename = & util::filename_cat($base_dir, $before_hash);1140 my $linkfilename = &FileUtils::filenameConcatenate($base_dir, $before_hash); 1139 1141 1140 1142 my $rl = 0; … … 1158 1160 my @dirs = split /[\/\\]/, $file; 1159 1161 my $domname = shift (@dirs); 1160 $before_hash = & util::filename_cat($domname, $before_hash);1162 $before_hash = &FileUtils::filenameConcatenate($domname, $before_hash); 1161 1163 $before_hash =~ s@\\@/@g; # for windows 1162 1164 } … … 1181 1183 $before_hash = "/$before_hash"; 1182 1184 1183 $before_hash = & util::filename_cat("",$before_hash);1185 $before_hash = &FileUtils::filenameConcatenate("",$before_hash); 1184 1186 $before_hash =~ s@^$base_dir/@@; 1185 1187 } … … 1188 1190 # Turn relative file path into full path 1189 1191 my $dirname = &File::Basename::dirname($file); 1190 $before_hash = & util::filename_cat($dirname, $before_hash);1192 $before_hash = &FileUtils::filenameConcatenate($dirname, $before_hash); 1191 1193 $before_hash = $self->eval_dir_dots($before_hash); 1192 1194 } 1193 1195 1194 my $linkfilename = & util::filename_cat($base_dir, $before_hash);1196 my $linkfilename = &FileUtils::filenameConcatenate($base_dir, $before_hash); 1195 1197 1196 1198 … … 1462 1464 # Need to fiddle with number of elements in @eval_dirs if the 1463 1465 # first one is the empty string. This is because of a 1464 # modification to util::filename_catthat supresses the addition1466 # modification to FileUtils::filenameConcatenate that supresses the addition 1465 1467 # of a leading '/' character (or \ if windows) (intended to help 1466 1468 # filename cat with relative paths) if the first entry in the … … 1474 1476 } 1475 1477 1476 my $evaluated_filename = (scalar @eval_dirs > 0) ? & util::filename_cat(@eval_dirs) : "";1478 my $evaluated_filename = (scalar @eval_dirs > 0) ? &FileUtils::filenameConcatenate(@eval_dirs) : ""; 1477 1479 return $evaluated_filename; 1478 1480 } … … 1756 1758 1757 1759 # softlink to collection tmp dir 1758 my $tmp_dirname = & util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "tidytmp");1760 my $tmp_dirname = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'}, "tidytmp"); 1759 1761 &util::mk_dir($tmp_dirname) if (!-e $tmp_dirname); 1760 1762 … … 1771 1773 { 1772 1774 my $folderdirname = $`; 1773 $tmp_dirname = & util::filename_cat($tmp_dirname,$folderdirname);1775 $tmp_dirname = &FileUtils::filenameConcatenate($tmp_dirname,$folderdirname); 1774 1776 &util::mk_dir($tmp_dirname) if (!-e $tmp_dirname); 1775 1777 $test_dirname = $'; #' … … 1777 1779 } 1778 1780 1779 my $tmp_filename = & util::filename_cat($tmp_dirname, "$tailname$suffix");1781 my $tmp_filename = &FileUtils::filenameConcatenate($tmp_dirname, "$tailname$suffix"); 1780 1782 1781 1783 # tidy or convert the input file if it is a HTML-like file or it is accepted by the process_exp … … 1786 1788 if ($self->{'old_style_HDL'}) 1787 1789 { 1788 $hdl_output_filename = & util::filename_cat($tmp_dirname, "$tailname$suffix");1790 $hdl_output_filename = &FileUtils::filenameConcatenate($tmp_dirname, "$tailname$suffix"); 1789 1791 $hdl_output_filename = $self->convert_to_newHDLformat($input_filename,$hdl_output_filename); 1790 1792 } … … 1797 1799 foreach my $file (@files) 1798 1800 { 1799 my $src_file = & util::filename_cat($base_dirname,$file);1800 my $dest_file = & util::filename_cat($tmp_dirname,$file);1801 my $src_file = &FileUtils::filenameConcatenate($base_dirname,$file); 1802 my $dest_file = &FileUtils::filenameConcatenate($tmp_dirname,$file); 1801 1803 if ((!-e $dest_file) && (!-d $src_file)) 1802 1804 { … … 1810 1812 if ($self->{'use_realistic_book'}) 1811 1813 { 1812 $tidy_output_filename = & util::filename_cat($tmp_dirname, "$tailname$suffix");1814 $tidy_output_filename = &FileUtils::filenameConcatenate($tmp_dirname, "$tailname$suffix"); 1813 1815 $tidy_output_filename = $self->tmp_tidy_file($hdl_output_filename,$tidy_output_filename); 1814 1816 } … … 1858 1860 1859 1861 # get the full path to the image 1860 my $img_file = & util::filename_cat($dirname,$attr->{src});1862 my $img_file = &FileUtils::filenameConcatenate($dirname,$attr->{src}); 1861 1863 1862 1864 # set the width and height attribute -
main/trunk/greenstone2/perllib/plugins/MetadataXMLPlugin.pm
r25094 r27306 95 95 use extrametautil; 96 96 use util; 97 use FileUtils; 97 98 use metadatautil; 98 99 … … 216 217 my ($pluginfo, $base_dir, $file, $block_hash, $metadata, $gli) = @_; 217 218 218 my $filename_full_path = & util::filename_cat($base_dir, $file);219 my $filename_full_path = &FileUtils::filenameConcatenate($base_dir, $file); 219 220 return undef unless $self->can_process_this_file($filename_full_path); 220 221 … … 244 245 $processor, $gli, $aux) = @_; 245 246 246 my $filename = & util::filename_cat($base_dir, $file);247 my $filename = &FileUtils::filenameConcatenate($base_dir, $file); 247 248 return undef unless $self->can_process_this_file($filename); 248 249 -
main/trunk/greenstone2/perllib/plugout.pm
r14929 r27306 31 31 32 32 require util; 33 use FileUtils; 33 34 use gsprintf 'gsprintf'; 34 35 … … 44 45 my ($verbosity, $outhandle, $failhandle, $globaloptions); 45 46 47 # - significantly rewritten to support plugouts in extensions [jmt12] 46 48 sub load_plugout{ 47 49 my ($plugout) = shift @_; 50 my $plugout_name = shift @$plugout; 51 my $plugout_suffix = &FileUtils::filenameConcatenate('perllib', 'plugouts', $plugout_name . '.pm'); 52 my $plugout_found = 0; 48 53 49 my $colplugdir = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"perllib/plugouts"); 50 unshift (@INC, $colplugdir); 51 52 my $plugoutname = shift @$plugout; 54 # add collection plugout directory to INC unless it is already there 55 my $colplugdir = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'},'perllib','plugouts'); 56 if (-d $colplugdir) 57 { 58 my $found_colplugdir = 0; 59 foreach my $path (@INC) 60 { 61 if ($path eq $colplugdir) 62 { 63 $found_colplugdir = 1; 64 last; 65 } 66 } 67 if (!$found_colplugdir) 68 { 69 unshift (@INC, $colplugdir); 70 } 71 } 53 72 54 # find the plugout 55 my $customplugname; 73 # To find the plugout we check a number of possible locations 74 # - any plugout found in the collection itself is our first choice, with 75 # those located in 'custom' having precedence 56 76 if (defined($ENV{'GSDLCOLLECTION'})) 57 77 { 58 $customplugname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "custom", $ENV{'GSDLCOLLECTION'}, 59 'perllib', 'plugouts', "${plugoutname}.pm"); 78 my $collect_dir = $ENV{'GSDLCOLLECTION'}; 79 80 # (needed for Veridian?) 81 my $custom_plugout = &FileUtils::filenameConcatenate($collect_dir, "custom", $collect_dir, $plugout_suffix); 82 if (&FileUtils::fileExists($custom_plugout)) 83 { 84 require $custom_plugout; 85 $plugout_found = 1; 86 } 87 else 88 { 89 # typical collection override 90 my $collection_plugout = &FileUtils::filenameConcatenate($collect_dir, $plugout_suffix); 91 if (&FileUtils::fileExists($collection_plugout)) 92 { 93 require $custom_plugout; 94 $plugout_found = 1; 95 } 96 } 97 } 98 # - we then search for overridden version provided by any registered GS3 99 # extensions (check in order of extension definition) 100 if (!$plugout_found && defined $ENV{'GSDL3EXTS'}) 101 { 102 my $ext_prefix = &FileUtils::filenameConcatenate($ENV{'GSDL3SRCHOME'}, "ext"); 103 my @extensions = split(/:/,$ENV{'GSDL3EXTS'}); 104 foreach my $e (@extensions) 105 { 106 my $extension_plugout = &FileUtils::filenameConcatenate($ext_prefix, $e, $plugout_suffix); 107 if (&FileUtils::fileExists($extension_plugout)) 108 { 109 require $extension_plugout; 110 $plugout_found = 1; 111 } 112 } 113 } 114 # - similar for GS2 extensions 115 if (!$plugout_found && defined $ENV{'GSDLEXTS'}) 116 { 117 my $ext_prefix = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, "ext"); 118 my @extensions = split(/:/,$ENV{'GSDLEXTS'}); 119 foreach my $e (@extensions) 120 { 121 my $extension_plugout = &FileUtils::filenameConcatenate($ext_prefix, $e, $plugout_suffix); 122 if (&FileUtils::fileExists($extension_plugout)) 123 { 124 require $extension_plugout; 125 $plugout_found = 1; 126 } 127 } 128 } 129 # - and the default is the main Greenstone version of the plugout 130 if (!$plugout_found) 131 { 132 my $main_plugout = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, $plugout_suffix); 133 if (&FileUtils::fileExists($main_plugout)) 134 { 135 require $main_plugout; 136 $plugout_found = 1; 137 } 60 138 } 61 139 62 my $colplugname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, 'perllib', 'plugouts', 63 "${plugoutname}.pm"); 64 my $mainplugname = &util::filename_cat($ENV{'GSDLHOME'}, 'perllib', 'plugouts', 65 "${plugoutname}.pm"); 66 if (defined($customplugname) && -e $customplugname) { require $customplugname; } 67 elsif (-e $colplugname) { require $colplugname; } 68 elsif (-e $mainplugname) { require $mainplugname; } 69 else { 70 gsprintf($outhandle, "{plugout.could_not_find_plugout}\n", 71 $plugoutname); 72 die "\n"; 140 # - no plugout found with this name 141 if (!$plugout_found) 142 { 143 gsprintf($outhandle, "{plugout.could_not_find_plugout}\n", $plugout_name); 144 die "\n"; 73 145 } 74 146 75 # create a plugout object147 # - create a plugout object 76 148 my ($plugobj); 77 149 78 eval ("\$plugobj = new \$plugout name([],\$plugout)");150 eval ("\$plugobj = new \$plugout_name([],\$plugout)"); 79 151 die "$@" if $@; 80 152 -
main/trunk/greenstone2/perllib/plugouts/BasePlugout.pm
r27071 r27306 36 36 use printusage; 37 37 use parse2; 38 38 use util; 39 use FileUtils; 39 40 40 41 # suppress the annoying "subroutine redefined" warning that various … … 509 510 my $output_dir = $self->get_output_dir(); 510 511 &util::mk_all_dir ($output_dir) unless -e $output_dir; 511 my $doc_file = & util::filename_cat($output_dir, $doc_dir, "doc.xml");512 my $short_doc_file = & util::filename_cat($doc_dir, "doc.xml");512 my $doc_file = &FileUtils::filenameConcatenate($output_dir, $doc_dir, "doc.xml"); 513 my $short_doc_file = &FileUtils::filenameConcatenate($doc_dir, "doc.xml"); 513 514 514 515 if ($gs_count>0) … … 590 591 591 592 if (!defined $self->{'group'} || !$self->{'group'}){ 592 & util::mk_all_dir (&util::filename_cat($working_dir, $doc_dir));593 &FileUtils::makeAllDirectories(&FileUtils::filenameConcatenate($working_dir, $doc_dir)); 593 594 } 594 595 … … 619 620 } 620 621 } while ($doc_dir_rest ne "" && 621 ((-d & util::filename_cat($working_dir, "$doc_dir.dir")) ||622 ((-d &FileUtils::filenameConcatenate($working_dir, "$doc_dir.dir")) || 622 623 ($working_info->size() >= 1024 && $doc_dir_num < 2))); 623 624 my $i = 1; 624 625 my $doc_dir_base = $doc_dir; 625 while (-d & util::filename_cat($working_dir, "$doc_dir.dir")) {626 while (-d &FileUtils::filenameConcatenate($working_dir, "$doc_dir.dir")) { 626 627 $doc_dir = "$doc_dir_base-$i"; 627 628 $i++; … … 642 643 &util::mk_all_dir ($output_dir) unless -e $output_dir; 643 644 644 my $working_dir = & util::filename_cat($output_dir, $doc_dir);645 my $working_dir = &FileUtils::filenameConcatenate($output_dir, $doc_dir); 645 646 &util::mk_all_dir ($working_dir) unless -e $working_dir; 646 647 … … 662 663 663 664 if ($source_filename !~ /^$dirsep_regexp/) { 664 $source_filename = & util::filename_cat($collect_dir, $source_filename);665 $source_filename = &FileUtils::filenameConcatenate($collect_dir, $source_filename); 665 666 } 666 667 } … … 686 687 if (-e $real_filename) { 687 688 688 $filename = & util::filename_cat($working_dir, $afile);689 690 &util::hard_link($real_filename, $filename, $self->{'verbosity'});691 689 $filename = &FileUtils::filenameConcatenate($working_dir, $afile); 690 691 &FileUtils::hardLink($real_filename, $filename, $self->{'verbosity'}); 692 692 693 $doc_obj->add_utf8_metadata ($doc_obj->get_top_section(), 693 694 "gsdlassocfile", … … 815 816 } 816 817 817 my $rss_filename = & util::filename_cat($output_dir,"rss-items.rdf");818 my $rss_filename = &FileUtils::filenameConcatenate($output_dir,"rss-items.rdf"); 818 819 if (open(RSSOUT,">>$rss_filename")) { 819 820 print RSSOUT "<item>\n"; … … 875 876 return unless defined $xslt_file and $xslt_file ne "" and -e $xslt_file; 876 877 877 my $java_class_path = & util::filename_cat($ENV{'GSDLHOME'},"bin","java","ApplyXSLT.jar");878 my $java_class_path = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"bin","java","ApplyXSLT.jar"); 878 879 879 880 my $mapping_file_path = ""; 880 881 881 882 if ($ENV{'GSDLOS'} eq "windows"){ 882 $java_class_path .=";".& util::filename_cat($ENV{'GSDLHOME'},"bin","java","xalan.jar");883 $java_class_path .=";".&FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"bin","java","xalan.jar"); 883 884 # this file:/// bit didn't work for me on windows XP 884 885 #$xslt_file = "\"file:///".$xslt_file."\""; … … 886 887 } 887 888 else{ 888 $java_class_path .=":".& util::filename_cat($ENV{'GSDLHOME'},"bin","java","xalan.jar");889 $java_class_path .=":".&FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"bin","java","xalan.jar"); 889 890 } 890 891 -
main/trunk/greenstone2/perllib/plugouts/GreenstoneXMLPlugout.pm
r22839 r27306 32 32 eval {require bytes}; 33 33 use util; 34 use FileUtils; 34 35 use BasePlugout; 35 36 use docprint; … … 72 73 &util::mk_all_dir ($output_dir) unless -e $output_dir; 73 74 74 my $working_dir = & util::filename_cat($output_dir, $doc_dir);75 my $working_dir = &FileUtils::filenameConcatenate($output_dir, $doc_dir); 75 76 &util::mk_all_dir ($working_dir) unless -e $working_dir; 76 77 … … 79 80 $self->process_metafiles_metadata ($doc_obj); 80 81 81 my $output_file = util::filename_cat($working_dir, "doc.xml");82 my $output_file = &FileUtils::filenameConcatenate($working_dir, "doc.xml"); 82 83 83 84 $self->open_xslt_pipe($output_file, $self->{'xslt_file'}); … … 107 108 } 108 109 109 $self->{'short_doc_file'} = util::filename_cat($doc_dir, "doc.xml");110 $self->{'short_doc_file'} = &FileUtils::filenameConcatenate($doc_dir, "doc.xml"); 110 111 111 112 $self->store_output_info_reference($doc_obj); -
main/trunk/greenstone2/perllib/unicode.pm
r24193 r27306 36 36 use strict; 37 37 use util; 38 use FileUtils; 38 39 use MIME::Base64; # for base64 encoding 39 40 … … 247 248 my $encodename = "$encoding-unicode"; 248 249 my $enc_info = $encodings::encodings->{$encoding}; 249 my $mapfile = & util::filename_cat($ENV{'GSDLHOME'}, "mappings",250 my $mapfile = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, "mappings", 250 251 "to_uc", $enc_info->{'mapfile'}); 251 252 if (!&loadmapencoding ($encodename, $mapfile)) { … … 499 500 500 501 my $enc_info = $encodings::encodings->{$encoding}; 501 my $mapfile = & util::filename_cat($ENV{'GSDLHOME'}, "mappings",502 my $mapfile = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, "mappings", 502 503 "from_uc", $enc_info->{'mapfile'}); 503 504 if (!&loadmapencoding ($encodename, $mapfile)) {
Note:
See TracChangeset
for help on using the changeset viewer.