Changeset 25579 for main/trunk/greenstone2/bin/script/full-rebuild.pl

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/bin/script/full-rebuild.pl (modified) (4 diffs)

main/trunk/greenstone2/bin/script/full-rebuild.pl

@@ -31 +31 @@
 # Followed by: full-buildcol.pl -removeold ...
 # (assumming import.pl did not end with an error)
-
-# The -keepold argument can be passed into this script since this calls activate.pl
-# And activate.pl allows the contents of a src dir to be moved into the dest_dir
-# without destroying other (uniquely-named) contents of dest_dir.
 
 BEGIN {
@@ -129 +125 @@
     my $build_dir   = undef;
     my $index_dir   = undef;
+    my $verbosity   = 2; # same as the default in buildcol.pl
 
     while (my $arg = shift @argv) {
@@ -160 +157 @@
         push(@activate_argv,$arg,$index_dir);
     }
+    elsif ($arg eq "-verbosity") {      
+        $verbosity = shift @argv;
+        push(@import_argv,$arg,$verbosity);
+        push(@buildcol_argv,$arg,$verbosity);
+        push(@activate_argv,$arg,$verbosity);
+    }
     else {
         push(@import_argv,$arg);
         push(@buildcol_argv,$arg);
-        push(@activate_argv,$arg);
+        push(@activate_argv,$arg);
     }
     }
@@ -198 +201 @@
 
         #full_replace($site,$collect_dir,$collect,$build_dir,$index_dir);
-        my $activatecol_cmd = $launch_cmd . "activate.pl $quoted_activate_argv \"$collect\"";
+        
+        # run activate with -removeold, just like full-buildcol.pl called above runs buildcol.pl
+        my $activatecol_cmd = $launch_cmd . "activate.pl -removeold $quoted_activate_argv \"$collect\"";
         my $activatecol_status = system($activatecol_cmd)/256;
     }