Changeset 34158 for main/trunk/greenstone2/bin/script/incremental-rebuild.pl

Timestamp:

2020-06-12T23:47:19+12:00 (4 years ago)

Author:

ak19

Message:

Fixing discovery of client-gli issues with previewing a different library (e.g. /default-library instead of /library). This commit adds to Kathy's recent work on supporting other libraries when previewing especially in the remote case, where Diego had detected problems. 1. First fixed a foolish copy paste error I made last time in full-rebuild.pl, commit 34128, when I was fixing up the script to accept the library_name parameter so it could pass this to buildcol.pl calling activate and/or to activate.pl directly. Only detected the problem when I was going to copy paste it into incremental-rebuild.pl. 2. Similar solution added to incremental-rebuild.pl and tested from commandline that this script too now accepts and passes on the library_name parameter to buildcol.pl to reach activate when needed. 3. GLI now passes library_name to building process, so activate can call the correct library to activate a collection. The library_name is obtained from client-gli, where the library (servlet_path) is set when configuring the site in use.

File:

• main/trunk/greenstone2/bin/script/incremental-rebuild.pl (modified) (1 diff)

main/trunk/greenstone2/bin/script/incremental-rebuild.pl

@@ -105 +105 @@
         push(@buildcol_argv,$buildcol_arg,$buildcol_val);
     }
+    elsif ($arg eq "-library_url" || $arg eq "-library_name") {
+        # only makes sense in buildcol.pl as -activate could
+        # have been passed in then. And if so, then activate.pl will be
+        # called by buildcol.pl which will pass on library_url/library_name
+        # to activate.pl
+        my $library_info = shift @argv;
+        push(@buildcol_argv,$arg,$library_info);
+    }
     elsif ($arg =~ "-OIDtype") {
         shift @argv; # skip OIDtype (don't pass OIDtype to buildcol.pl. It's not currently accepted.)