Changeset 30523 for main/trunk/greenstone2

Timestamp:

2016-05-10T14:59:29+12:00 (8 years ago)

Author:

ak19

Message:

Renaming activate.pm to servercontrol.pm.

Location:

main/trunk/greenstone2

Files:

• bin/script/activate.pl (modified) (2 diffs)
• perllib/buildcolutils.pm (modified) (3 diffs)
• perllib/servercontrol.pm (moved) (moved from main/trunk/greenstone2/perllib/activate.pm ) (1 diff)

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

@@ -91 +91 @@
 
 # Greenstone modules
-use activate;
 use colcfg;
 use scriptutil;
+use servercontrol;
 use util;
 
@@ -189 +189 @@
     $index_dir = &FileUtils::filenameConcatenate($collection_dir, "index") unless (defined $index_dir);
 
-    my $gsserver = new activate($qualified_collection, $site, $default_verbosity, $build_dir, $index_dir, $collect_dir, $library_url, $library_name);
+    my $gsserver = new servercontrol($qualified_collection, $site, $default_verbosity, $build_dir, $index_dir, $collect_dir, $library_url, $library_name);
 
     $gsserver->print_task_msg("Running  Collection  Activation  Stage");

main/trunk/greenstone2/perllib/buildcolutils.pm

@@ -33 +33 @@
 use File::Basename;
 
-use activate;
 use colcfg;
 use dbutil;
@@ -39 +38 @@
 use FileUtils;
 use scriptutil;
+use servercontrol;
 use gsprintf;
 use printusage;
@@ -678 +678 @@
     # 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'});
+    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

main/trunk/greenstone2/perllib/servercontrol.pm

@@ -26 +26 @@
 ###############################################################################
 
-package activate;
+package servercontrol;