Changeset 29983 for main/trunk/greenstone2/bin/script

Timestamp:

2015-06-16T19:48:57+12:00 (9 years ago)

Author:

ak19

Message:

Incorporated Kathy's useful suggestion to have a separate library_name parameter to activate.pl so that collections in a different servlet can be activated. This could be done with the existing library_url parameter too by passing -activate:library_url <URL> to buildcol.pl, but if the servlet name is all that is different from the default URL it will save in typing.

File:

• main/trunk/greenstone2/bin/script/activate.pl (modified) (6 diffs)

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

@@ -302 +302 @@
     
 sub get_library_URL {
-    my $gs_mode = shift(@_); # gs3 or gs2
+    my ($gs_mode, $lib_name) = @_; # gs_mode can be gs3 or gs2, lib_name is the custom servlet name
     
     # If we get here, we are dealing with a server included with GS.
@@ -401 +401 @@
         } else {
             &print_msg("activate.pl::get_library_URL: Failed to run $perl_command to work out library URL for $gs_mode\n");
-        }       
+        }
+        if(defined $lib_name) {
+            # replace the servlet_name portion of the url found, with the given library_name
+            $url =~ s@/[^/]*$@/$lib_name@;
+        }
     }
     
@@ -479 +483 @@
         print STDERR "\n";
         print STDERR "Usage: $progname [-collectdir c -builddir b -indexdir i -site s -skipactivation -removeold -keepold -verbosity v\n";
-        print STDERR "\t-library_url URL] <[colgroup/]collection>\n";
+        print STDERR "\t-library_url URL -library_name n] <[colgroup/]collection>\n";
         print STDERR "\n";
 
@@ -502 +506 @@
         # the GSDL_LIBRARY_URL env var is useful when running cmdline buildcol.pl in the linux package manager versions of GS3
     
+    my $library_name = undef;
+
     while (my $arg = shift @argv) {
         if ($arg eq "-collectdir") {
@@ -529 +535 @@
         elsif ($arg eq "-library_url") {
             $library_url = shift @argv;
+        }
+        elsif ($arg eq "-library_name") {
+            $library_name = shift @argv;
         }
         elsif ($arg eq "-verbosity") { 
@@ -608 +617 @@
     # and apache for GS2), we work out the library URL:
     if(!$library_url) { 
-        $library_url = &get_library_URL($gs_mode); # returns undef if no server is running
+        $library_url = &get_library_URL($gs_mode, $library_name); # returns undef if no server is running
     }