Changeset 25963

Timestamp:

2012-07-17T17:27:46+12:00 (11 years ago)

Author:

ak19

Message:

Kathy asked me to adjust the code used to launch pluginfo.pl from GLI to take a new cmd line option called gs_version that should be accompanied by the value 3 for gs3mode. I'm setting this flag and an appropriate value for Greenstone 2 as well. Have also updated the gliserver.pl file for RemoteGreenstone, to similarly launch pluginfo.pl with the new gs_version flag.

Location:

main/trunk

Files:

• gli/src/org/greenstone/gatherer/greenstone/Plugins.java (modified) (3 diffs)
• greenstone2/common-src/cgi-bin/gliserver.pl (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/greenstone/Plugins.java

@@ -142 +142 @@
         args.add("-S");
         args.add(LocalGreenstone.getBinScriptDirectoryPath() + "pluginfo.pl");
+        args.add("-gs_version");
+        if (Gatherer.GS3) {
+            args.add("3");
+        } else {
+            args.add("2");
+        }
         if (collection_specific) {
             args.add("-collection");
@@ -150 +156 @@
         args.add(Configuration.getLanguage());
         args.add(plugin.getName());
-
         // Run the pluginfo.pl process
         Runtime runtime = Runtime.getRuntime();
@@ -204 +209 @@
         args.add("-S");     
         args.add(LocalGreenstone.getBinScriptDirectoryPath() + "pluginfo.pl");
+        args.add("-gs_version");
+        if (Gatherer.GS3) {
+            args.add("3");
+        } else {
+            args.add("2");
+        }
         if (collection_name != null) {
             args.add("-collection");

main/trunk/greenstone2/common-src/cgi-bin/gliserver.pl

@@ -825 +825 @@
     if ($script eq "pluginfo.pl") {
     $perl_args = $gsdl_cgi->clean_param("plugin") || "";
+    $perl_args = "-gs_version ".$gsdl_cgi->greenstone_version()." ".$perl_args;
     $gsdl_cgi->delete("plugin");
     }