Changeset 27306 for main/trunk/greenstone2/perllib/basebuildproc.pm
- Timestamp:
- 2013-05-06T15:29:38+12:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
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 }
Note:
See TracChangeset
for help on using the changeset viewer.