Changeset 1454 for trunk/gsdl/perllib/util.pm

Timestamp:

2000-08-27T23:04:47+12:00 (24 years ago)

Author:

stefan

Message:

Lots of changes to perl building code for collectoraction

File:

• trunk/gsdl/perllib/util.pm (modified) (5 diffs)

trunk/gsdl/perllib/util.pm

@@ -166 +166 @@
 
 # recursively copies a file or group of files
-# syntax: cp_r (sourcefiles, destination file or directory)
+# syntax: cp_r (sourcefiles, destination directory)
+# destination must be a directory - to copy one file to
+# another use cp instead
 sub cp_r {
     my $dest = pop (@_);
     my (@srcfiles) = @_;
 
-    # remove trailing slashes from source and destination files
-    $dest =~ s/[\\\/]+$//;
-    map {$_ =~ s/[\\\/]+$//;} @srcfiles;
-
     # a few sanity checks
     if (scalar (@srcfiles) == 0) {
-    print STDERR "util::cp no destination directory given\n";
-    return;
-    } elsif ((scalar (@srcfiles) > 1) && (!-d $dest)) {
-    print STDERR "util::cp if multiple source files are given the ".
-        "destination must be a directory\n";
+    print STDERR "util::cp_r no destination directory given\n";
+    return;
+    } elsif (-f $dest) {
+    print STDERR "util::cp_r destination must be a directory\n";
     return;
     }
     
+    # create destination directory if it doesn't exist already
+    if (! -d $dest) {
+    my $store_umask = umask(0002);
+    mkdir ($dest, 0777);
+    umask($store_umask);
+    } 
+
     # copy the files
     foreach $file (@srcfiles) {
-    # copy the file to within dest if dest is a directory
-    # exception: if there is only one source file and that
-    # source file is a directory
-    my $tempdest = $dest;
-    if (-d $tempdest && !(scalar(@srcfiles) == 1 && -d $file)) {
-        my ($filename) = $file =~ /([^\\\/]+)$/;
-        $tempdest .= "/$filename";
-    }
 
     if (!-e $file) {
-        print STDERR "util::cp $file does not exist\n";
+        print STDERR "util::cp_r $file does not exist\n";
 
     } elsif (-d $file) {
-        # make a new directory (if needed)
-        unless (-e $tempdest)
-        {
-        my $store_umask = umask(0002);
-        mkdir ($tempdest, 0777);
-        umask($store_umask);
-        }
+        print STDERR "directory: $file\n";
 
         # get the contents of this directory
@@ -212 +202 @@
         print STDERR "util::cp_r could not open directory $file\n";
         } else {
-        my @filedir = grep (!/^\.\.?$/, readdir (INDIR));
+        my @filedir = readdir (INDIR);
         closedir (INDIR);
-
-        # copy all the files in this directory
-        &cp_r (map {$_="$file/$_";} @filedir, $tempdest);
+        my $olddest = $dest;
+        foreach $f (@filedir) {
+            next if $f =~ /^\.\.?$/;
+            # copy all the files in this directory
+            my $ff = &util::filename_cat ($file, $f); 
+            if (-d $ff) {
+            # make the new directory
+            $dest = &util::filename_cat ($dest, $f);
+            my $store_umask = umask(0002);
+            mkdir ($dest, 0777);
+            umask($store_umask);
+            }
+            print STDERR "dest: $dest\n";
+            &cp_r ($ff, $dest);
+            $dest = $olddest;
+        }
         }
 
     } else {
-        &cp($file, $tempdest);
+        print STDERR "ordinary file: $file --> $dest\n";
+        &cp($file, $dest);
     }
     }
@@ -504 +508 @@
 }
 
+# returns 1 if filename1 and filename2 point to the same
+# file or directory
+sub filenames_equal {
+    my ($filename1, $filename2) = @_;
+
+    # use filename_cat to clean up trailing slashes and 
+    # multiple slashes
+    $filename1 = filename_cat ($filename1);
+    $filename1 = filename_cat ($filename1);
+
+    # filenames not case sensitive on windows
+    if ($ENV{'GSDLOS'} =~ /^windows$/i) {
+    $filename1 =~ tr/[A-Z]/[a-z]/;
+    $filename2 =~ tr/[A-Z]/[a-z]/;
+    }
+    return 1 if $filename1 eq $filename2;
+    return 0;
+}
+
 sub get_os_dirsep {
 
@@ -535 +558 @@
 # will return the collection name if successful, "" otherwise
 sub use_collection {
-    my ($collection) = @_;
+    my ($collection, $collectdir) = @_;
+
+    if (!defined $collectdir || $collectdir eq "") {
+    $collectdir = &filename_cat ($ENV{'GSDLHOME'}, "collect");
+    }
 
     # get and check the collection
@@ -555 +582 @@
     # are defined
     $ENV{'GSDLCOLLECTION'} = $collection unless defined $ENV{'GSDLCOLLECTION'};
-    $ENV{'GSDLCOLLECTDIR'} = &filename_cat ($ENV{'GSDLHOME'}, "collect", $collection);
+    $ENV{'GSDLCOLLECTDIR'} = &filename_cat ($collectdir, $collection);
 
     # make sure this collection exists