Changeset 31187 for main

Timestamp:

2016-12-09T21:21:29+13:00 (7 years ago)

Author:

ak19

Message:

Useful changes not specifically related to upcoming oaiinfo db related commit.

Location:

main/trunk/greenstone2/perllib

Files:

• FileUtils.pm (modified) (1 diff)
• arcinfo.pm (modified) (4 diffs)
• util.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/FileUtils.pm

@@ -43 +43 @@
 # util::cp_r_nosvn()           => FileUtils::copyFilesRecursiveNoSVN()
 # util::cp_r_toplevel()        => FileUtils::copyFilesRecursiveTopLevel()
-# util::differentfiles()      => FileUtils::differentFiles()
+# util::differentfiles()       => FileUtils::differentFiles()
 # util::dir_exists()           => FileUtils::directoryExists()
 # util::fd_exists()            => FileUtils::fileTest()

main/trunk/greenstone2/perllib/arcinfo.pm

@@ -79 +79 @@
     my ($filename) = @_;
 
-    if (defined $filename && -e $filename) {
+    if (defined $filename && &FileUtils::fileExists($filename)) {
     open (INFILE, $filename) || 
         die "arcinfo::load_info couldn't read $filename\n";
@@ -125 +125 @@
     $self->{'info'} = {};
 
-    if ((defined $filename) && (-e $filename)) {
+    if ((defined $filename) && &FileUtils::fileExists($filename)) {
     if ($filename =~ m/\.inf$/) {
         $self->_load_info_txt($filename);
@@ -158 +158 @@
     $self->{'import-filelist'} = {};
 
-    if ((defined $filename) && (-e $filename)) {
+    if ((defined $filename) && &FileUtils::fileExists($filename)) {
     if ($filename =~ m/\.inf$/) {
         # e.g. 'archives-src.inf' (which includes complete list of file
@@ -186 +186 @@
 
     foreach my $OID ($vals =~ m/^<oid>(.*)$/gm) {
-        $self->add_revinfo($srcfile,$OID);
+        $self->add_reverseinfo($srcfile,$OID);
     }
     }

main/trunk/greenstone2/perllib/util.pm

@@ -340 +340 @@
 
     return $tmp_dirname;
+}
+
+sub get_parent_folder
+{
+    my ($path) = @_;
+    my ($tailname, $dirname, $suffix)
+    = &File::Basename::fileparse($path, "\\.[^\\.]+\$");
+
+    return &FileUtils::sanitizePath($dirname);
 }