Changeset 30522

Timestamp:

2016-05-10T14:39:41+12:00 (8 years ago)

Author:

ak19

Message:

Dr Bainbridge found a better place to instantiate the activate.pm object (hereafter to be renamed to servercontrol.pm).

Location:

main/trunk/greenstone2/perllib

Files:

• activate.pm (modified) (1 diff)
• buildcolutils.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/activate.pm

@@ -43 +43 @@
 use parse2;
 
-#use enum;
-# enumerations in perl, http://stackoverflow.com/questions/473666/does-perl-have-an-enumeration-type
-# Unfortunately, not part of perl's core
-#use enum qw(LEVEL_NONE LEVEL_ERROR LEVEL_INFO LEVEL_DEBUG); # debugging levels NONE == 0, ERROR=1 INFO=2 DEBUG=3
-
 
 sub new

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
+    # All except the collection (1st parameter) can be empty. For GS3, also set the site parameter
+    my $gsserver = new activate( $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
     # read and write (e.g. gdbm), need to deactivate the collection before make_infodatabase()    
@@ -686 +690 @@
     
         if(!$dbSupportsConcurrentRW) {
-        # all except the collection (1st parameter) can be empty. For GS3, also set the site parameter
-        my $gsserver = new activate( $self->get_collection(), $self->{'site'}, $self->{'verbosity'}, $self->{'builddir'}, $self->{'indexdir'}, $self->{'collectdir'}, $self->{'library_url'}, $self->{'library_name'});
         $gsserver->print_task_msg("About to deactivate collection ".$self->get_collection());
-        #$self->{'library_url'} = $gsserver->get_library_URL();
         $gsserver->do_deactivate();     
         }
@@ -720 +721 @@
     
         if(!$dbSupportsConcurrentRW) {
-        # all except the collection (1st parameter) can be empty. For GS3, also set the site parameter
-        my $gsserver = new activate( $self->get_collection(), $self->{'site'}, $self->{'verbosity'}, $self->{'builddir'}, $self->{'indexdir'}, $self->{'collectdir'}, $self->{'library_url'}, $self->{'library_name'});
         $gsserver->print_task_msg("About to deactivate collection ".$self->get_collection());
-        #$self->{'library_url'} = $gsserver->get_library_URL();
         $gsserver->do_deactivate();
         }