Changeset 19313

Show
Ignore:
Timestamp:
04.05.2009 15:23:59 (10 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:
2 modified

Legend:

Unmodified
Added
Removed
  • gli/trunk/client-gli.sh

    r19305 r19313  
    190190    $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 $* 
    191191else 
    192     $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" $* 
     192    gsdlos=`uname -s | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 
     193# check for running bash under cygwin 
     194    if test "`echo $gsdlos | sed 's/cygwin//'`" != "$gsdlos" ; then 
     195    gsdlos=windows 
     196    fi 
     197    $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 $* 
    193198fi 
    194199 
  • gli/trunk/src/org/greenstone/gatherer/download/DownloadJob.java

    r19306 r19313  
    293293            prcs = rt.exec(cmd, env);  
    294294        }  
     295        else if(Gatherer.isGsdlRemote && Gatherer.isDownloadEnabled) { 
     296            // Not Windows, but running client with download panel 
     297            // Need to manually specify GSDLHOME and GSDLOS 
     298            env = new String[2]; 
     299            env[0] = "GSDLHOME=" + Configuration.gsdl_path; 
     300            env[1] = "GSDLOS=" + Gatherer.client_operating_system; 
     301            prcs = rt.exec(cmd, env);  
     302        } 
    295303        else { 
    296304            // Will inherit the GLI's environment, with GSDLHOME and GSDLOS set