Changeset 30518

Timestamp:

2016-05-09T17:19:13+12:00 (8 years ago)

Author:

ak19

Message:

Related to previous commit. Need to similarly handle another case of make_infodatabase().

File:

• main/trunk/greenstone2/perllib/buildcolutils.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/buildcolutils.pm

@@ -1 @@
-###############################################################################
+##############################################################################
 #
 # buildcolutils.pm -- index and build the collection. The buildtime counterpart
@@ -675 +675 @@
     map { local $_=$_; $_->build_indexes($indexname, $indexlevel); } @builders;
 
-    # when incrementally rebuilding a collection using a gdbm database, need to 
-    # deactivate the collecitob before make_infodatabase()
+    # 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 { 
     local $_=$_; 
@@ -707 +707 @@
   elsif ($mode =~ /^infodb$/i)
   {
-    map { local $_=$_; $_->make_infodatabase(); } @builders;
+    map { 
+    local $_=$_;
+
+    # 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()
+
+    if($_->supports_make_infodatabase()) {
+        my $infodbtype = $_->{'infodbtype'};
+        my $dbSupportsConcurrentRW = &dbutil::supportsConcurrentReadAndWrite($infodbtype);
+    
+        if(!$dbSupportsConcurrentRW) {
+        $self->activate_collection("just_deactivate");      
+        }
+        $_->make_infodatabase(); 
+    }
+    } @builders;
   }
   else