Changeset 25554 for main/trunk/greenstone2/perllib

Timestamp:

2012-05-09T14:33:01+12:00 (12 years ago)

Author:

ak19

Message:

Added mv_dir_contents subroutine (which is called from activate.pl) for moving the contents of src dir into target dir, so these can exist alongside of non-identically named items already existing in target dir, rather replacing target dir with src dir.

File:

• main/trunk/greenstone2/perllib/util.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/util.pm

@@ -179 +179 @@
 }
 
+# Move the contents of source directory into target directory
+# (as opposed to merely replacing target dir with the src dir)
+# This can overwrite any files with duplicate names in the target
+# but other files and folders in the target will continue to exist
+sub mv_dir_contents {
+    my ($src_dir, $dest_dir) = @_;
+    
+    # Obtain listing of all files within src_dir
+    # Note that readdir lists relative paths, as well as . and ..
+    opendir(DIR, "$src_dir");
+    my @files= readdir(DIR); 
+    close(DIR); 
+    
+    # construct absolute paths
+    foreach my $file (@files) { 
+        # process all except . and ..
+        unless($file eq "." || $file eq "..") {         
+            $file = &util::filename_cat($src_dir, $file); # this is sufficient to overwrite this file's name in @files
+                    # don't seem to need a separate array to keep the updated absolute path versions of the filenames
+        }       
+    }
+    &util::mv(@files, $dest_dir);
+}
+
 
 # copies a file or a group of files