Changeset 25957 for main/trunk/greenstone2/bin/script

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/bin/script/pluginfo.pl (modified) (8 diffs)

main/trunk/greenstone2/bin/script/pluginfo.pl

@@ -77 +77 @@
     'type' => "string",
     'reqd' => "no" },
+      { 'name' => "gs_version",
+    'desc' => "{pluginfo.gs_version}",
+    'type' => "string",
+    'reqd' => "no",
+    'hiddengli' => "yes" },
       { 'name' => "xml",
     'desc' => "{scripts.xml}",
@@ -107 +112 @@
     my $site = "";
     my $collection = "";
+    my $gs_version = "";
     my $xml = 0;
     my $listall = 0;
@@ -121 +127 @@
     die "\n";
     }
-    
     foreach my $strVariable (keys %$hashParsingResult)
     {
@@ -188 +193 @@
     if ($site ne "") {
     # assume Greenstone 3
+    $gs_version = "3" if $gs_version eq "";
     if ($collection ne "") {
         $ENV{'GSDLCOLLECTDIR'} = &util::filename_cat ($ENV{'GSDL3HOME'}, "sites", $site, "collect", $collection);
@@ -196 +202 @@
     }
     else {
+    $gs_version = "2" if $gs_version eq "";
     if ($collection ne "") {
         $ENV{'GSDLCOLLECTDIR'} = &util::filename_cat ($ENV{'GSDLHOME'}, "collect", $collection);
@@ -247 +254 @@
     foreach my $plugin (@plugin_list) {
         $plugin =~ s/\.pm$//;
-        my $plugobj = &plugin::load_plugin_for_info ($plugin);
+        my $plugobj = &plugin::load_plugin_for_info ($plugin, $gs_version);
         push (@plugobj_list, $plugobj);
     }
@@ -267 +274 @@
     }
     else {
-    &print_single_plugin($plugin, $xml, 1);
+    &print_single_plugin($plugin, $gs_version, $xml, 1);
     }
 }
@@ -273 +280 @@
 
 sub print_single_plugin {
-    my ($plugin, $xml, $header) = @_;
-    my $plugobj = &plugin::load_plugin_for_info ($plugin);
+    my ($plugin, $gs_version, $xml, $header) = @_;
+    my $plugobj = &plugin::load_plugin_for_info ($plugin, $gs_version);
     if ($xml) {
     &gsprintf::set_print_xml_tags();