Changeset 25963


Ignore:
Timestamp:
07/17/12 17:27:46 (9 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:
2 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/gli/src/org/greenstone/gatherer/greenstone/Plugins.java

    r20924 r25963  
    142142        args.add("-S");
    143143        args.add(LocalGreenstone.getBinScriptDirectoryPath() + "pluginfo.pl");
     144        args.add("-gs_version");
     145        if (Gatherer.GS3) {
     146            args.add("3");
     147        } else {
     148            args.add("2");
     149        }
    144150        if (collection_specific) {
    145151            args.add("-collection");
     
    150156        args.add(Configuration.getLanguage());
    151157        args.add(plugin.getName());
    152 
    153158        // Run the pluginfo.pl process
    154159        Runtime runtime = Runtime.getRuntime();
     
    204209        args.add("-S");     
    205210        args.add(LocalGreenstone.getBinScriptDirectoryPath() + "pluginfo.pl");
     211        args.add("-gs_version");
     212        if (Gatherer.GS3) {
     213            args.add("3");
     214        } else {
     215            args.add("2");
     216        }
    206217        if (collection_name != null) {
    207218            args.add("-collection");
  • main/trunk/greenstone2/common-src/cgi-bin/gliserver.pl

    r24872 r25963  
    825825    if ($script eq "pluginfo.pl") {
    826826    $perl_args = $gsdl_cgi->clean_param("plugin") || "";
     827    $perl_args = "-gs_version ".$gsdl_cgi->greenstone_version()." ".$perl_args;
    827828    $gsdl_cgi->delete("plugin");
    828829    }
Note: See TracChangeset for help on using the changeset viewer.