Changeset 25578 for main/trunk

Timestamp:

2012-05-11T18:36:54+12:00 (12 years ago)

Author:

ak19

Message:

Modifying recently introduced mv_dir_contents method again: recursion call to mv_dir_contents on any directory need only happen if the same directory (with the same sub path) also exists in the target directory. For regular files and any directories not duplicated in target, a straightforward call to mv is sufficient. Reducing the amount of recursion would make it more efficient.

File:

• main/trunk/greenstone2/perllib/util.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/util.pm

@@ -192 +192 @@
     close(DIR); 
     
-    # construct absolute paths
     my @full_path_files = ();
     foreach my $file (@files) { 
         # process all except . and ..
         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));
+            
+            my $dest_subdir = &filename_cat($dest_dir, $file); # $file still relative path
+        
+            # construct absolute paths
+            $file = &filename_cat($src_dir, $file); # $file is now an absolute path
+            
+            # Recurse on directories which have an equivalent in target dest_dir
+            # If $file is a directory that already exists in target $dest_dir, 
+            # then a simple move operation will fail (definitely on Windows).
+            if(-d $file && -d $dest_subdir) { 
+                print STDERR "**** $file is a directory also existing in target, to be copied to $dest_subdir\n";
+                &mv_dir_contents($file, $dest_subdir);
                 
                 # now all content is moved across, delete empty dir in source folder
@@ -212 +217 @@
                     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
+            } else { # process files and any directories that don't already exist with a simple move
                 push(@full_path_files, $file);
             }