Changeset 24499 for main

Timestamp:

2011-08-26T21:45:40+12:00 (13 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.

File:

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

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

@@ -664 +664 @@
     private long lastModified = 0;
     
-    static final private String AUTOENTER = "autoenter";
+    static final private String GLI_PREFIX = "gli";
+    static final private String GSI_AUTOENTER = "autoenter";
+    static final private String AUTOENTER = GLI_PREFIX+"."+"autoenter";
     static final private String COLON = ":";
     static final private String ENTERLIB = "enterlib";
@@ -675 +677 @@
     static final private String SEPARATOR = "/";
     static final private String SPECIFIC_CONFIG = "--config=";
-    static final private String STARTBROWSER = "start_browser";
+    static final private String STARTBROWSER = GLI_PREFIX+"."+"start_browser";
+    static final private String GSI_STARTBROWSER = "start_browser";
     static final private String TRUE = "1";
     static final private String URL = "url";
     static final private String COLLECTHOME = "collecthome";
-    static final private String GLIMODE = "--mode=gli";
+    static final private String GLIMODE = "--mode="+GLI_PREFIX;
     
     static final public String URL_PENDING = "URL_pending";
@@ -967 +970 @@
             // if the server is using llssite.cfg, don't overwrite its default
             // autoenter and startbrowser values
-            if(configFile == llssite_cfg && (key == AUTOENTER || key == STARTBROWSER)) {
-                if(key == AUTOENTER) {
+            if(configFile == llssite_cfg && (key == GSI_AUTOENTER || key == GSI_STARTBROWSER)) {
+                if(key == GSI_AUTOENTER) {
                 out.write(autoenter_initial, 0, autoenter_initial.length());
-                } else { // STARTBROWSER
+                } else { // GSI_STARTBROWSER
                 out.write(start_browser_initial, 0, start_browser_initial.length());
                 }