Changeset 24492 for main/trunk/gli

Timestamp:

2011-08-26T16:03:19+12:00 (13 years ago)

Author:

ak19

Message:

The flag --mode=gli has been introduced into LocalLibraryServer.jar, and the prefix used in glisite.cfg.in, while gs2-web-server.bat makes sure these are all passed to Server2, though gs2-web-server.bat no longer parses the cmdline args itself. This commit belongs with the the Server2 of commit r24491, where Server2's main method handles messy commandline arguments of the kind where parameters are split over multiple arguments, which can happen when gs2-webserver.bat calls Server2 now. The logic of dealing with spaces in filepath (and messy parameters) is therefore moved now from gs2-webserver.bat into Server2.java

File:

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

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

@@ -454 +454 @@
     
     static private String getExtraLaunchArguments(LLSSiteConfig site_cfg_file) {
-    String args = " " + site_cfg_file.getSiteConfigFilename();
+    String args = " " + LLSSiteConfig.GLIMODE + " " + site_cfg_file.getSiteConfigFilename();
 
     if(isPersistentServer) {
@@ -679 +679 @@
     static final private String URL = "url";
     static final private String COLLECTHOME = "collecthome";
+    static final private String GLIMODE = "--mode=gli";
     
     static final public String URL_PENDING = "URL_pending";