Changeset 24499

Show
Ignore:
Timestamp:
26.08.2011 21:45:40 (8 years ago)
Author:
ak19
Message:

Fixed omission in previous commit where GLI does not look for gli.autoenter and gli.start_browser: it should now look exclusively for a the property prefix of gli.

Files:
1 modified

Legend:

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

    r24492 r24499  
    664664    private long lastModified = 0; 
    665665     
    666     static final private String AUTOENTER = "autoenter"; 
     666    static final private String GLI_PREFIX = "gli"; 
     667    static final private String GSI_AUTOENTER = "autoenter"; 
     668    static final private String AUTOENTER = GLI_PREFIX+"."+"autoenter"; 
    667669    static final private String COLON = ":"; 
    668670    static final private String ENTERLIB = "enterlib"; 
     
    675677    static final private String SEPARATOR = "/"; 
    676678    static final private String SPECIFIC_CONFIG = "--config="; 
    677     static final private String STARTBROWSER = "start_browser"; 
     679    static final private String STARTBROWSER = GLI_PREFIX+"."+"start_browser"; 
     680    static final private String GSI_STARTBROWSER = "start_browser"; 
    678681    static final private String TRUE = "1"; 
    679682    static final private String URL = "url"; 
    680683    static final private String COLLECTHOME = "collecthome"; 
    681     static final private String GLIMODE = "--mode=gli"; 
     684    static final private String GLIMODE = "--mode="+GLI_PREFIX; 
    682685     
    683686    static final public String URL_PENDING = "URL_pending"; 
     
    967970            // if the server is using llssite.cfg, don't overwrite its default 
    968971            // autoenter and startbrowser values 
    969             if(configFile == llssite_cfg && (key == AUTOENTER || key == STARTBROWSER)) { 
    970                 if(key == AUTOENTER) { 
     972            if(configFile == llssite_cfg && (key == GSI_AUTOENTER || key == GSI_STARTBROWSER)) { 
     973                if(key == GSI_AUTOENTER) { 
    971974                out.write(autoenter_initial, 0, autoenter_initial.length()); 
    972                 } else { // STARTBROWSER 
     975                } else { // GSI_STARTBROWSER 
    973976                out.write(start_browser_initial, 0, start_browser_initial.length()); 
    974977                }