Changeset 36114 for main

Timestamp:

2022-03-15T10:43:32+13:00 (2 years ago)

Author:

kjdon

Message:

allow passing in of oaiserver_name to activate.pl, which then gets passed to servercontrol - use this instead of 'oaiserver' to activate/deactivate a collection in the oai sevrer

Location:

main/trunk/greenstone2

Files:

• bin/script/activate.pl (modified) (3 diffs)
• perllib/servercontrol.pm (modified) (4 diffs)

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

@@ -144 +144 @@
     
     my $library_name = undef;
+    my $oaiserver_name = undef;
     
     while (my $arg = shift @argv) {
@@ -176 +177 @@
         $library_name = shift @argv;
     }
+        elsif ($arg eq "-oaiserver_name") {
+            $oaiserver_name = shift @argv;
+        }
     elsif ($arg eq "-verbosity") { 
         $default_verbosity = shift @argv; # global variable
@@ -200 +204 @@
     my $solr_conf_dir = &FileUtils::filenameConcatenate($collection_dir, "etc", "conf");
     
-    my $gsserver = new servercontrol($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, $oaiserver_name);
 
     $gsserver->print_task_msg("Running  Collection  Activation  Stage");

main/trunk/greenstone2/perllib/servercontrol.pm

@@ -53 +53 @@
   my $class = shift(@_);
 
-  my ($qualified_collection, $site, $verbosity, $build_dir, $index_dir, $collect_dir, $library_url, $library_name) = @_;
+  my ($qualified_collection, $site, $verbosity, $build_dir, $index_dir, $collect_dir, $library_url, $library_name, $oaiserver_name) = @_;
 
   # library_url: to be specified on the cmdline if not using a GS-included web server
@@ -65 +65 @@
           #'is_persistent_server' => undef,
               'library_url' => $library_url || $ENV{'GSDL_LIBRARY_URL'} || undef, # to be specified on the cmdline if not using a GS-included web server
-              'library_name' => $library_name,
+                  'library_name' => $library_name,
+                  'oaiserver_name' => $oaiserver_name || "oaiserver",
           #'gs_mode' => "gs2",
           'verbosity' => $verbosity || 2
@@ -292 +293 @@
     $DEACTIVATE_COMMAND = "?deactivate=";
     $check_message_against_regex = "(collection\: $qualified_collection deactivated|collection\: $qualified_collection is not enabled for OAI.)";
-    $self->config($DEACTIVATE_COMMAND.$qualified_collection, $check_message_against_regex, undef, undef, "oaiserver");
+    $self->config($DEACTIVATE_COMMAND.$qualified_collection, $check_message_against_regex, undef, undef, $self->{'oaiserver_name'});
     }   
 }
@@ -318 +319 @@
     $ACTIVATE_COMMAND = "?activate=";
     $check_message_against_regex = "(collection\: $qualified_collection activated|collection\: $qualified_collection is not enabled for OAI.)";
-    $self->config($ACTIVATE_COMMAND.$qualified_collection, $check_message_against_regex, undef, undef, "oaiserver");
+    $self->config($ACTIVATE_COMMAND.$qualified_collection, $check_message_against_regex, undef, undef, $self->{'oaiserver_name'});
     }   
 }