Changeset 25573 for main/trunk

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.

Location:

main/trunk/greenstone2

Files:

• bin/script/activate.pl (added)
• bin/script/buildcol.pl (modified) (3 diffs)
• bin/script/full-rebuild.pl (modified) (8 diffs)
• perllib/strings.properties (modified) (1 diff)

main/trunk/greenstone2/bin/script/buildcol.pl

@@ -238 +238 @@
     'reqd' => "no",
     'hiddengli' => "yes" },
+      { 'name' => "activate",
+    'desc' => "{buildcol.activate}",
+    'type' => "flag",
+    'reqd' => "no",
+    'hiddengli' => "yes" },
       ];
 
@@ -301 +306 @@
     $no_strip_html, $store_metadata_coverage,
     $no_text, $faillog, $gli, $index, $language,
-    $sections_index_document_metadata, $maxnumeric);
-
+    $sections_index_document_metadata, $maxnumeric, $activate);
+    
     my $xml = 0;
     my $hashParsingResult = {};
@@ -682 +687 @@
     }
 
+    # if buildcol.pl was run with -activate, need to run activate.pl 
+    # now that building's complete  
+    if($activate) {
+    
+        #my $quoted_argv = join(" ", map { "\"$_\"" } @ARGV);
+        
+        my @activate_argv = ();
+        push(@activate_argv,"-collectdir","$collectdir") if($collectdir);
+        push(@activate_argv,"-builddir","$builddir") if($builddir);
+        push(@activate_argv,"-site","$site") if($site);
+        push(@activate_argv,"-removeold") if($removeold);
+        push(@activate_argv,"-keepold") if($keepold);
+        my $quoted_argv = join(" ", map { "\"$_\"" } @activate_argv);
+        
+        my $activatecol_cmd = "\"".&util::get_perl_exec()."\" -S activate.pl $quoted_argv \"$collection\"";
+        
+        my $activatecol_status = system($activatecol_cmd)/256;
+
+        if ($activatecol_status != 0) {
+            print STDERR "Error: Failed to run: $activatecol_cmd\n";
+            print STDERR "       $!\n" if ($! ne "");
+            exit(-1);
+        }
+    }
+    
     close OUT if $close_out;
     close FAILLOG;

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 {

main/trunk/greenstone2/perllib/strings.properties

@@ -72 +72 @@
 
 # -- buildcol.pl --
+
+buildcol.activate:Run activate.pl after buildcol has finished, which will move building to index.
 
 buildcol.archivedir:Where the archives live.