Changeset 19308 for gli/trunk

Timestamp:

2009-05-01T18:50:24+12:00 (15 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.

File:

• gli/trunk/src/org/greenstone/gatherer/Gatherer.java (modified) (2 diffs)

gli/trunk/src/org/greenstone/gatherer/Gatherer.java

@@ -283 +283 @@
         // Check we know where Perl is
         Configuration.perl_path = perl_path;
-        if (isGsdlRemote && Utility.isWindows() && Configuration.perl_path != null) {
+        if (isGsdlRemote && !isDownloadEnabled && Utility.isWindows() && Configuration.perl_path != null) {
         if (Configuration.perl_path.toLowerCase().endsWith("perl.exe")) {
             Configuration.perl_path = Configuration.perl_path.substring(0, Configuration.perl_path.length() - "perl.exe".length());
@@ -345 +345 @@
             library_url_string = remoteGreenstoneServer.getLibraryURL(Configuration.gliserver_url.toString());
         }
+        // write it into the config file
+        Configuration.setString("general.library_url", true, library_url_string);
         }
         else { // local greenstone: Start up the local library server, if that's what we want