Changeset 25579 for main/trunk/greenstone2/perllib/util.pm

Timestamp:

2012-05-11T19:23:42+12:00 (12 years ago)

Author:

ak19

Message:

1. Introduced the verbosity flag into activate.pl to print out debugging statements depending on verbosity, and this is passed in from buildcol.pl and full-rebuild.pl too now. 2. Cleaned up some debugging code.

File:

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

main/trunk/greenstone2/perllib/util.pm

@@ -190 +190 @@
     opendir(DIR, "$src_dir");
     my @files= readdir(DIR); 
-    close(DIR); 
+    close(DIR);
     
     my @full_path_files = ();
@@ -197 +197 @@
         unless($file eq "." || $file eq "..") {
             
-            my $dest_subdir = &filename_cat($dest_dir, $file); # $file still relative path
+            my $dest_subdir = &filename_cat($dest_dir, $file); # $file is still a relative path
         
             # construct absolute paths
@@ -206 +206 @@
             # 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";
+                #print STDERR "**** $file is a directory also existing in target, its contents to be copied to $dest_subdir\n";
                 &mv_dir_contents($file, $dest_subdir);
                 
@@ -212 +212 @@
                 if(&is_dir_empty($file)) {
                     if (!rmdir $file) {
-                        print STDERR "util::mv_dir_contents couldn't remove directory $file\n";
+                        print STDERR "ERROR. util::mv_dir_contents couldn't remove directory $file\n";
                     } 
                 } else { # error