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

Timestamp:

2012-05-10T21:32:52+12:00 (12 years ago)

Author:

ak19

Message:

Adding in the new activate.pl script to be called at the end of the build process. It moves building to index after first deactivating the collection on the server (if this is running and a persistent server). After the move operation, it then activates the collection on the server again, if the server is still running and is a persistent server.

File:

• main/trunk/greenstone2/bin/script/full-rebuild.pl (modified) (8 diffs)

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

@@ -32 +32 @@
 # (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 {
@@ -43 +46 @@
 
 
+# This subroutine has been replaced by a call to activate.pl in sub main
 sub full_replace
 {
@@ -119 +123 @@
     my @import_argv = ();
     my @buildcol_argv = ();
+    my @activate_argv = ();
 
     my $site        = undef;
@@ -130 +135 @@
         push(@import_argv,$arg,$site);
         push(@buildcol_argv,$arg,$site);
+        push(@activate_argv,$arg,$site);
     }
     elsif ($arg eq "-collectdir") {
@@ -135 +141 @@
         push(@import_argv,$arg,$collect_dir);
         push(@buildcol_argv,$arg,$collect_dir);
+        push(@activate_argv,$arg,$collect_dir);
     }
     elsif ($arg eq "-importdir") {
@@ -142 +149 @@
     }
     elsif ($arg eq "-builddir") {
-        # only makes sense in buildcol.pl
+        # only makes sense in buildcol.pl and activate.pl
         $build_dir = shift @argv;
         push(@buildcol_argv,$arg,$build_dir);
+        push(@activate_argv,$arg,$build_dir);
     }
     elsif ($arg eq "-indexdir") {
-        # only makes sense in buildcol.pl
+        # only makes sense in buildcol.pl and activate.pl
         $index_dir = shift @argv;
         push(@buildcol_argv,$arg,$index_dir);
+        push(@activate_argv,$arg,$index_dir);
     }
     else {
         push(@import_argv,$arg);
         push(@buildcol_argv,$arg);
+        push(@activate_argv,$arg);
     }
     }
@@ -160 +170 @@
     my $quoted_import_argv = join(" ", map { "\"$_\"" } @import_argv);
     my $quoted_buildcol_argv = join(" ", map { "\"$_\"" } @buildcol_argv);
+    my $quoted_activate_argv = join(" ", map { "\"$_\"" } @activate_argv);
     
     my $final_status = 0;
@@ -186 +197 @@
     if ($buildcol_status == 0) {
 
-        full_replace($site,$collect_dir,$collect,$build_dir,$index_dir);
+        #full_replace($site,$collect_dir,$collect,$build_dir,$index_dir);
+        my $activatecol_cmd = $launch_cmd . "activate.pl $quoted_activate_argv \"$collect\"";
+        my $activatecol_status = system($activatecol_cmd)/256;
     }
     else {