Changeset 36115 for main

Timestamp:

2022-03-15T11:00:46+13:00 (2 years ago)

Author:

kjdon

Message:

buildcol also updated to allow for passing in of oaiserver_name - when you actiavte/deactivate a collection, it does the same thing for the oaiserver

Location:

main/trunk/greenstone2

Files:

• bin/script/buildcol.pl (modified) (1 diff)
• perllib/buildcolutils.pm (modified) (2 diffs)

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

@@ -277 +277 @@
     'reqd' => "no",
     'hiddengli' => "yes" },
-      { 'name' => "indexname",
+       { 'name' => "oaiserver_name",
+    'desc' => "{buildcol.oaiserver_name}",
+    'type' => "string",
+    'reqd' => "no",
+    'hiddengli' => "yes" },
+     { 'name' => "indexname",
     'desc' => "{buildcol.index}",
     'type' => "string",

main/trunk/greenstone2/perllib/buildcolutils.pm

@@ -678 +678 @@
     # 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'});
+    my $gsserver = new servercontrol( $self->get_collection(), $self->{'site'}, $self->{'verbosity'}, $self->{'builddir'}, $self->{'indexdir'}, $self->{'collectdir'}, $self->{'library_url'}, $self->{'library_name'}, $self->{'oaiserver_name'});
 
     # when *incrementally* rebuilding a collection using any db that *doesn't* support concurrent
@@ -808 +808 @@
     push(@activate_argv, '-library_url', $self->{'library_url'}) if ($self->{'library_url'});
     push(@activate_argv, '-library_name', $self->{'library_name'}) if ($self->{'library_name'});
+    push(@activate_argv, '-oaiserver_name', $self->{'oaiserver_name'}) if ($self->{'oaiserver_name'});
+    
     push(@activate_argv, '-collectdir', $self->{'collectdir'}) if ($self->{'collectdir'});
     push(@activate_argv, '-builddir', $self->{'builddir'}) if ($self->{'builddir'});