Changeset 32539 for main/trunk

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)

Location:

main/trunk/greenstone2/perllib

Files:

• basebuilder.pm (modified) (1 diff)
• inexport.pm (modified) (1 diff)
• plugin.pm (modified) (2 diffs)
• plugins/PrintInfo.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/basebuilder.pm

@@ -214 +214 @@
     push @global_opts, "-separate_cjk";
     }
-    $self->{'pluginfo'} = &plugin::load_plugins ($plugins, $self->{'verbosity'}, $outhandle, $failhandle, \@global_opts, $self->{'incremental_mode'}, $gs_version);
+    $self->{'pluginfo'} = &plugin::load_plugins ($plugins, $self->{'verbosity'}, $outhandle, $failhandle, \@global_opts, $self->{'incremental_mode'}, $gs_version, $self->{'site'});
    
     if (scalar(@{$self->{'pluginfo'}}) == 0) {

main/trunk/greenstone2/perllib/inexport.pm

@@ -583 +583 @@
     my @global_opts = ();
 
-    my $pluginfo = &plugin::load_plugins ($plugins, $verbosity, $out, $faillog, \@global_opts, $plugin_incr_mode, $gs_version);
+    my $pluginfo = &plugin::load_plugins ($plugins, $verbosity, $out, $faillog, \@global_opts, $plugin_incr_mode, $gs_version, $self->{'site'});
     if (scalar(@$pluginfo) == 0) {
     &gsprintf($out, "{import.no_plugins_loaded}\n");

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) {

main/trunk/greenstone2/perllib/plugins/PrintInfo.pm

@@ -50 +50 @@
     { 'name' => "gs_version",
       'desc' => "{PrintInfo.gs_version}",
+      'type' => "string",
+      'reqd' => "no",
+      'hiddengli' => "yes" },
+    { 'name' => "site_name",
+      'desc' => "{PrintInfo.site_name}",
       'type' => "string",
       'reqd' => "no",
@@ -81 +86 @@
     # the args, just return the object. 
     # gsdlinfo must come before gs_version. both are set by plugin.pm
+    # The optional -site_name <site> (present only for GS3 and when not doing gsdlinfo),
+    # if it is there, also appears before gs_version and is also set by plugin.pm
     my $v=0;
     foreach my $strArg (@{$args})
     {
-    if ($v) {
+    if($v eq "-site_name") {
+        $self->{'site_name'} = $strArg;
+    }
+    elsif($v eq "-gs_version") {
         $self->{'gs_version'} = $strArg;
         last;
@@ -93 +103 @@
         #return bless $self, $class;
     }
-    elsif ($strArg eq "-gs_version") {
-        $v = 1;     
+    elsif ($strArg eq "-gs_version" || $strArg eq "-site_name") {       
+        $v = $strArg;
     }
     }