Changeset 19313 for gli

Timestamp:

2009-05-04T15:23:59+12:00 (15 years ago)

Author:

ak19

Message:

To get the Downloading to work when using client-gli, needed to: 1. Pass in GSDLOS from the client-gli.sh script to gli. 2. GLI needs to pass GSDLHOME and GSDLOS as environment variables when executing the downloadfrom.pl as a process on Linux.

Location:

gli/trunk

Files:

• client-gli.sh (modified) (1 diff)
• src/org/greenstone/gatherer/download/DownloadJob.java (modified) (1 diff)

gli/trunk/client-gli.sh

@@ -190 +190 @@
     $javapath -Xmx128M -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar:lib/commons-codec-1.3.jar:lib/commons-httpclient-3.1-rc1.jar:lib/commons-logging-1.1.jar org.greenstone.gatherer.GathererProg -use_remote_greenstone $*
 else
-    $javapath -Xmx128M -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar:lib/commons-codec-1.3.jar:lib/commons-httpclient-3.1-rc1.jar:lib/commons-logging-1.1.jar org.greenstone.gatherer.GathererProg -use_remote_greenstone -gsdl "${thisdir}/gs2build" $*
+    gsdlos=`uname -s | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+# check for running bash under cygwin
+    if test "`echo $gsdlos | sed 's/cygwin//'`" != "$gsdlos" ; then
+    gsdlos=windows
+    fi
+    $javapath -Xmx128M -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar:lib/commons-codec-1.3.jar:lib/commons-httpclient-3.1-rc1.jar:lib/commons-logging-1.1.jar org.greenstone.gatherer.GathererProg -use_remote_greenstone -gsdl "${thisdir}/gs2build" -gsdlos $gsdlos $*
 fi
 

gli/trunk/src/org/greenstone/gatherer/download/DownloadJob.java

@@ -293 +293 @@
             prcs = rt.exec(cmd, env); 
         } 
+        else if(Gatherer.isGsdlRemote && Gatherer.isDownloadEnabled) {
+            // Not Windows, but running client with download panel
+            // Need to manually specify GSDLHOME and GSDLOS
+            env = new String[2];
+            env[0] = "GSDLHOME=" + Configuration.gsdl_path;
+            env[1] = "GSDLOS=" + Gatherer.client_operating_system;
+            prcs = rt.exec(cmd, env); 
+        }
         else {
             // Will inherit the GLI's environment, with GSDLHOME and GSDLOS set