Changeset 31187 for main/trunk/greenstone2
- Timestamp:
- 2016-12-09T21:21:29+13:00 (7 years ago)
- Location:
- main/trunk/greenstone2/perllib
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/FileUtils.pm
r28565 r31187 43 43 # util::cp_r_nosvn() => FileUtils::copyFilesRecursiveNoSVN() 44 44 # util::cp_r_toplevel() => FileUtils::copyFilesRecursiveTopLevel() 45 # util::differentfiles() => FileUtils::differentFiles()45 # util::differentfiles() => FileUtils::differentFiles() 46 46 # util::dir_exists() => FileUtils::directoryExists() 47 47 # util::fd_exists() => FileUtils::fileTest() -
main/trunk/greenstone2/perllib/arcinfo.pm
r28637 r31187 79 79 my ($filename) = @_; 80 80 81 if (defined $filename && -e $filename) {81 if (defined $filename && &FileUtils::fileExists($filename)) { 82 82 open (INFILE, $filename) || 83 83 die "arcinfo::load_info couldn't read $filename\n"; … … 125 125 $self->{'info'} = {}; 126 126 127 if ((defined $filename) && (-e$filename)) {127 if ((defined $filename) && &FileUtils::fileExists($filename)) { 128 128 if ($filename =~ m/\.inf$/) { 129 129 $self->_load_info_txt($filename); … … 158 158 $self->{'import-filelist'} = {}; 159 159 160 if ((defined $filename) && (-e$filename)) {160 if ((defined $filename) && &FileUtils::fileExists($filename)) { 161 161 if ($filename =~ m/\.inf$/) { 162 162 # e.g. 'archives-src.inf' (which includes complete list of file … … 186 186 187 187 foreach my $OID ($vals =~ m/^<oid>(.*)$/gm) { 188 $self->add_rev info($srcfile,$OID);188 $self->add_reverseinfo($srcfile,$OID); 189 189 } 190 190 } -
main/trunk/greenstone2/perllib/util.pm
r30575 r31187 340 340 341 341 return $tmp_dirname; 342 } 343 344 sub get_parent_folder 345 { 346 my ($path) = @_; 347 my ($tailname, $dirname, $suffix) 348 = &File::Basename::fileparse($path, "\\.[^\\.]+\$"); 349 350 return &FileUtils::sanitizePath($dirname); 342 351 } 343 352
Note:
See TracChangeset
for help on using the changeset viewer.