Changeset 26574 for main/trunk/gli/src

Timestamp:

2012-12-11T18:13:07+13:00 (11 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.

File:

• main/trunk/gli/src/org/greenstone/gatherer/shell/GShell.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/shell/GShell.java

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