Changeset 32539 for main/trunk/greenstone2/perllib/plugins/PrintInfo.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/plugins/PrintInfo.pm (modified) (3 diffs)

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;
     }
     }