Changeset 25957 for main/trunk/greenstone2/perllib/plugin.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/plugin.pm (modified) (4 diffs)

main/trunk/greenstone2/perllib/plugin.pm

@@ -143 +143 @@
 
 sub load_plugin_for_info {
-    my ($pluginname) = shift @_;
+    my ($pluginname, $gs_version) = (@_);
     $pluginname = &get_valid_pluginname($pluginname);
     load_plugin_require($pluginname);
@@ -149 +149 @@
     # create a plugin object
     my ($plugobj);
-    my $options = "-gsdlinfo";
+    my $options = "-gsdlinfo,-gs_version,$gs_version";
     
     eval ("\$plugobj = new \$pluginname([],[$options])");
@@ -159 +159 @@
 sub load_plugins {
     my ($plugin_list) = shift @_;
-    my $incremental_mode;
-    ($verbosity, $outhandle, $failhandle, $globaloptions, $incremental_mode) = @_; # globals
+    my ($incremental_mode, $gs_version);
+    ($verbosity, $outhandle, $failhandle, $globaloptions, $incremental_mode, $gs_version) = @_; # globals
     my @plugin_objects = ();
     $verbosity = 2 unless defined $verbosity;
@@ -182 +182 @@
     # put quotes around each option to the plugin, unless the option is already quoted
     map { $_ = "\"$_\"" unless ($_ =~ m/^\s*\".*\"\s*$/) ; } @$pluginoptions;
-    my $options = join (",", @$pluginoptions);
+    my $options = "-gs_version,$gs_version,".join (",", @$pluginoptions);
     if ($globals) {
         if (@$pluginoptions) {