Changeset 24492 for main/trunk/gli

Show
Ignore:
Timestamp:
26.08.2011 16:03:19 (8 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

Files:
1 modified

Legend:

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

    r23432 r24492  
    454454     
    455455    static private String getExtraLaunchArguments(LLSSiteConfig site_cfg_file) { 
    456     String args = " " + site_cfg_file.getSiteConfigFilename(); 
     456    String args = " " + LLSSiteConfig.GLIMODE + " " + site_cfg_file.getSiteConfigFilename(); 
    457457 
    458458    if(isPersistentServer) { 
     
    679679    static final private String URL = "url"; 
    680680    static final private String COLLECTHOME = "collecthome"; 
     681    static final private String GLIMODE = "--mode=gli"; 
    681682     
    682683    static final public String URL_PENDING = "URL_pending";