Changeset 34128 for main

Timestamp:

2020-05-27T20:06:24+12:00 (4 years ago)

Author:

ak19

Message:

When rebuilding the opotiki site today, had noticed that full-rebuild's call to activate was attempting to get the collection in default library to be activated, rather than the collection in the opotiki library. Although activate.pl has a library_name minus option (and one for library_url too) for this purpose when activate.pl is called directly, and although buildcol.pl is set up to pass these 2 options on to activate.pl if buildcol was called with minus-activate, full-rebuild.pl did not yet have code to allow for the library_name and library_url options to be passed through to buildcol and activate. Fixed and tested with a sample collection in the opotiki site on the machine where I built the opotiki collections today. Am committing from this svn version.

File:

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

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

@@ -127 +127 @@
         push(@activate_argv,$activate_arg,$activate_val);
     }
+    elsif ($arg eq "-library_url" || $arg eq "-library_name") {
+        # only makes sense in buildcol.pl and activate.pl
+        # we want buildcol.pl to send it to activate if running buildcol.pl with -activate
+        # And we want activate.pl to get it if running activate.pl
+        $build_dir = shift @argv;
+        push(@buildcol_argv,$arg,$build_dir);
+        push(@activate_argv,$arg,$build_dir);
+    }
     elsif ($arg =~ "-OIDtype") {
         shift @argv; # skip OIDtype (don't pass OIDtype to buildcol.pl. It's not currently accepted.)