Changeset 31753

Timestamp:

2017-06-26T16:01:43+12:00 (6 years ago)

Author:

ak19

Message:

Two fixes Kathy requested: 1. when running buildcol, ONLY deactivate a collection surrounding the lock-sensitive make_infodatabase() calls IF incremental. 2. Allow buildcol.pl to accept activate parameters like library_url (library_name and skipactivation). full-(re)build and incremental-(re)build scripts already accept additional parameters such as with -activate:skipactivation, but buildcol.pl doesn't work that way.

Location:

main/trunk/greenstone2

Files:

• bin/script/buildcol.pl (modified) (3 diffs)
• perllib/buildcolutils.pm (modified) (4 diffs)

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

@@ -256 +256 @@
     'reqd' => "no",
     'hiddengli' => "yes" },
-      { 'name' => "activate",
+      { 'name' => "activate",
     'desc' => "{buildcol.activate}",
     'type' => "flag",
+    'reqd' => "no",
+    'hiddengli' => "yes" },
+      { 'name' => "skipactivation",
+    'desc' => "{buildcol.skipactivation}",
+    'type' => "flag",
+    'reqd' => "no",
+    'hiddengli' => "yes" },
+      { 'name' => "library_url",
+    'desc' => "{buildcol.library_url}",
+    'type' => "string",
+    'reqd' => "no",
+    'hiddengli' => "yes" },
+      { 'name' => "library_name",
+    'desc' => "{buildcol.library_name}",
+    'type' => "string",
     'reqd' => "no",
     'hiddengli' => "yes" },
@@ -318 +333 @@
       elsif ($subclass ne $required_subclass)
       {
-        print STDERR "Error! You cannot specify arguments from two different extention specific buildcolutils modules: " . $subclass . " != " . $required_subclass . "\n";
+        print STDERR "Error! You cannot specify arguments from two different extension specific buildcolutils modules: " . $subclass . " != " . $required_subclass . "\n";
         exit;
       }
@@ -331 +346 @@
     $buildcolutils = new $subclass(\@ARGV, $options);
   }
-  # We don't have a overridden buildcolutils, or the above command failed
+  # We don't have an overridden buildcolutils, or the above command failed
   # somehow so load the base class
   if (!defined $buildcolutils)

main/trunk/greenstone2/perllib/buildcolutils.pm

@@ -676 +676 @@
     map { local $_=$_; $_->build_indexes($indexname, $indexlevel); } @builders;
 
-    # Need to deactivate the collection for collections whose db don't support concurrent R+W
+    # If incremental, need to deactivate the collection for collections whose db don't support concurrent R+W
     # All except the collection (1st parameter) can be empty. For GS3, also set the site parameter
     my $gsserver = new servercontrol( $self->get_collection(), $self->{'site'}, $self->{'verbosity'}, $self->{'builddir'}, $self->{'indexdir'}, $self->{'collectdir'}, $self->{'library_url'}, $self->{'library_name'});
 
-    # when incrementally rebuilding a collection using any db that doesn't support concurrent
+    # when *incrementally* rebuilding a collection using any db that *doesn't* support concurrent
     # read and write (e.g. gdbm), need to deactivate the collection before make_infodatabase()    
     map { 
@@ -689 +689 @@
         my $dbSupportsConcurrentRW = &dbutil::supportsConcurrentReadAndWrite($infodbtype);
     
-        if(!$dbSupportsConcurrentRW) {
+        if(!$dbSupportsConcurrentRW && $self->{'incremental'}) {
         $gsserver->print_task_msg("About to deactivate collection ".$self->get_collection());
         $gsserver->do_deactivate();     
@@ -713 +713 @@
     local $_=$_;
 
-    # when incrementally rebuilding a collection using any db that doesn't support concurrent
+    # when *incrementally* rebuilding a collection using any db that *doesn't* support concurrent
     # read and write (e.g. gdbm), need to deactivate the collection before make_infodatabase()
 
@@ -720 +720 @@
         my $dbSupportsConcurrentRW = &dbutil::supportsConcurrentReadAndWrite($infodbtype);
     
-        if(!$dbSupportsConcurrentRW) {
+        if(!$dbSupportsConcurrentRW && $self->{'incremental'}) {
         $gsserver->print_task_msg("About to deactivate collection ".$self->get_collection());
         $gsserver->do_deactivate();