Changeset 25957 for main/trunk/greenstone2/perllib/plugins/PrintInfo.pm

Timestamp:

2012-07-17T15:17:30+12:00 (12 years ago)

Author:

kjdon

Message:

adding in support for plugins knowing what version of greenstone (2/3) they are running in. gs_version now passed in when loading plugins, and '-gs_version 2/3' will be added to input args. base plugin class PrintInfo defines the gs_version arg

File:

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

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

@@ -47 +47 @@
 use printusage;
 
-my $arguments = [];
+my $arguments = [
+    { 'name' => "gs_version",
+      'desc' => "{PrintInfo.gs_version}",
+      'type' => "string",
+      'reqd' => "no",
+      'hiddengli' => "yes" }
+
+];
 
 my $options = { 'name'     => "PrintInfo",
@@ -62 +69 @@
     my $plugin_name = (defined $pluginlist->[0]) ? $pluginlist->[0] : $class;
 
-    if ($plugin_name eq $class) {
+   if ($plugin_name eq $class) {
     push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});
     push(@{$hashArgOptLists->{"OptList"}},$options);
-    }
+   }
     my $self = {};
     $self->{'outhandle'} = STDERR;
     $self->{'option_list'} = $hashArgOptLists->{"OptList"};
     $self->{"info_only"} = 0;
-
+    $self->{'gs_version'} = "2";
     # Check if gsdlinfo is in the argument list or not - if it is, don't parse 
-    # the args, just return the object.  
+    # the args, just return the object. 
+    # gsdlinfo must come before gs_version. both are set by plugin.pm
+    my $v=0;
     foreach my $strArg (@{$args})
     {
-    if($strArg eq "-gsdlinfo")
+    if ($v) {
+        $self->{'gs_version'} = $strArg;
+        last;
+    }
+    elsif($strArg eq "-gsdlinfo")
     {
         $self->{"info_only"} = 1;
-        return bless $self, $class;
-    }
-    }
-    
+        #return bless $self, $class;
+    }
+    elsif ($strArg eq "-gs_version") {
+        $v = 1;     
+    }
+    }
+
+    if ($self->{"info_only"}) {
+    return bless $self, $class;
+    }
     if (defined $auxiliary) { # don't parse the args here
     return bless $self, $class;
+    }
+
+    # now that we are passed printing out info, we do need to add in this class's options so that they are available for parsing. 
+    if ($plugin_name ne $class) {
+    push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});
+    push(@{$hashArgOptLists->{"OptList"}},$options);
     }