Changeset 26574

Show
Ignore:
Timestamp:
11.12.2012 18:13:07 (7 years ago)
Author:
ak19
Message:

Related to commit revision 26567 and 26573. The first mandated the inclusion of the site parameter (and site_name) when building scripts are run over Greenstone 3 collections. The 2nd commit ensures the site param and value are now passed in by GLI to those scripts. This commit avoids including the site arg for the remote case, since RemoteGreenstoneServer?.java already automatically adds it in for the remote script commands.

Files:
1 modified

Legend:

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

    r26333 r26574  
    207207        for (int i = 1; i < (args.length - 1); i++) { 
    208208        // Skip arguments that won't make sense on the server 
    209         if (args[i].equals("-collectdir") || args[i].equals("-importdir") || args[i].equals("-builddir")) { 
     209        // and -site is added in RemoteGreenstonServer.java 
     210        if (args[i].equals("-collectdir") || args[i].equals("-importdir") || args[i].equals("-builddir") || args[i].equals("-site")) { 
    210211            i++; 
    211212            continue;