Changeset 26206 for main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

Timestamp:

2012-09-18T18:10:37+12:00 (12 years ago)

Author:

ak19

Message:

Fixes to get Remote Greenstone 3 working with client-gli: 1. client-GLI should not start the local GS3 server, since client-GLI will be running against a remote server. 2. The encryption process for authentication had been changed for GS3, so now Authentication.java has a main function which is invoked by gliserver's gsdlCGI.pm to encrypt the password. 4. UsersDB when converted to txt for parsing by gliserver.pl has a different structure, so gliserver.pl needs to take that into account. 5. util.pm's functions for prepending and appending to environment variables needs to use an OS dependant path separator. This was not noticed when testing the remote GS server on 32 bit linux so far, but the windows style path separator (semicolon) used so far didn't work on the 64 bit linux test machine.

File:

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

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

@@ -372 +372 @@
                     isLocalLibrary = LocalLibraryServer.start(gsdl_path, local_library_path);
                 }
-                else {
+                else if (!isGsdlRemote) { // local GS3, start the local tomcat
                     GS3ServerThread thread = new GS3ServerThread(gsdl3_src_path, "restart");
                     thread.start();