Changeset 25572 for main/trunk/greenstone2

Timestamp:

2012-05-10T20:01:31+12:00 (12 years ago)

Author:

ak19

Message:

Newly added mv_dir_contents subroutine was not complete: it did not move the directory contents of subdirectories which I thought was implicit. Added explicit recursion on subfolders and handling of special cases where folders are empty.

File:

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

main/trunk/greenstone2/perllib/util.pm

@@ -193 +193 @@
     
     # construct absolute paths
+    my @full_path_files = ();
     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);
+        unless($file eq "." || $file eq "..") {
+            my $tailname = $file;
+            $file = &filename_cat($src_dir, $file); 
+                
+            if(-d $file) { # recursion on directories
+                #print STDERR "**** $file is a directory, to be copied to $dest_dir\\$tailname\n";
+                &mv_dir_contents($file, &filename_cat($dest_dir, $tailname));
+                
+                # now all content is moved across, delete empty dir in source folder
+                if(&is_dir_empty($file)) {
+                    &rm_r($file); 
+                } else { # error
+                    print STDERR "ERROR. util::mv_dir_contents: subfolder $file still non-empty after moving contents to $dest_dir\n";
+                }
+            } else { # process files with a simple move
+                push(@full_path_files, $file);
+            }           
+        }
+    }
+    
+    if(!&dir_exists($dest_dir)) { # create target toplevel folder or subfolders if they don't exist
+        &mk_dir($dest_dir);
+    }
+    
+    #print STDERR "@@@@@ Copying files to: $dest_dir\n";
+    if(@full_path_files) { # if non-empty, there's something to copy across
+        &mv(@full_path_files, $dest_dir);
+    }
 }