Changeset 32539 for main/trunk/greenstone2/perllib/plugin.pm

Timestamp:

2018-10-25T18:12:59+13:00 (5 years ago)

Author:

ak19

Message:

New plugin parameter site_name (only set for GS3) that is passed to plugin::load_plugins() (but not to plugin::load_plugin_for_info()/gsdlinfo mode) by inexport.pm during import.pl and by basebuilder.pm during buildcol.pl. Like the gs_version parameter, it is parsed by plugins/PrintInfo.pm and will appear before gs_version (to preserve the way things were being parsed until now)

File:

• main/trunk/greenstone2/perllib/plugin.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/plugin.pm

@@ -179 +179 @@
 sub load_plugins {
     my ($plugin_list) = shift @_;
-    my ($incremental_mode, $gs_version);
-    ($verbosity, $outhandle, $failhandle, $globaloptions, $incremental_mode, $gs_version) = @_; # globals
+    my ($incremental_mode, $gs_version, $site);
+    ($verbosity, $outhandle, $failhandle, $globaloptions, $incremental_mode, $gs_version, $site) = @_; # globals
     my @plugin_objects = ();
     $verbosity = 2 unless defined $verbosity;
@@ -204 +204 @@
     # put quotes around each option to the plugin, unless the option is already quoted
     map { $_ = "\"$_\"" unless ($_ =~ m/^\s*\".*\"\s*$/) ; } @$pluginoptions;
-    my $options = "-gs_version,$gs_version,".join (",", @$pluginoptions);
+    my $site_option = $site ? "\"-site_name\",\"$site\"," : "";
+    my $options = "$site_option"."-gs_version,$gs_version,".join (",", @$pluginoptions);    
     if ($globals) {
         if (@$pluginoptions) {