Changeset 19308

Show
Ignore:
Timestamp:
01.05.2009 18:50:24 (10 years ago)
Author:
ak19
Message:

1. Library_url is stored into configRemote.xml; 2. Configuration.perl_path used to store the perl directory without the perl.exe in the remote case for Windows. But if downloading is enabled in the remote client-gli case, then the perlpath is local and needs to point to perl.exe.

Files:
1 modified

Legend:

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

    r19306 r19308  
    283283        // Check we know where Perl is 
    284284        Configuration.perl_path = perl_path; 
    285         if (isGsdlRemote && Utility.isWindows() && Configuration.perl_path != null) { 
     285        if (isGsdlRemote && !isDownloadEnabled && Utility.isWindows() && Configuration.perl_path != null) { 
    286286        if (Configuration.perl_path.toLowerCase().endsWith("perl.exe")) { 
    287287            Configuration.perl_path = Configuration.perl_path.substring(0, Configuration.perl_path.length() - "perl.exe".length()); 
     
    345345            library_url_string = remoteGreenstoneServer.getLibraryURL(Configuration.gliserver_url.toString()); 
    346346        } 
     347        // write it into the config file 
     348        Configuration.setString("general.library_url", true, library_url_string); 
    347349        } 
    348350        else { // local greenstone: Start up the local library server, if that's what we want