Changeset 24508 for main/trunk/gli/src/org/greenstone/gatherer/greenstone/LocalLibraryServer.java

Timestamp:

2011-08-27T20:54:15+12:00 (13 years ago)

Author:

ak19

Message:

All comments referring to glisite.cfg edited to refer to llssite.cfg alone as necessary

File:

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

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

@@ -593 +593 @@
         return false; // don't need to launch the server, one has been independently launched
         } else {
-        // else we try using the glisite configfile
+        // else we try using the "gli." prefix to access the url property in the config file
         llssite_cfg_file.useGLImode();
             //llssite_cfg_file.set();
@@ -703 +703 @@
             // first test if server was started independently of GLI
             // if so, the config file we'd be using would be llssite.cfg
-            if(!usingGSImode()) { // if we were using llssite_cfg, this would have loaded it in
-                // else we try using the glisite configfile
+            if(!usingGSImode()) { // this step will try to access the url and other 
+                // special properties in the config file using the "gli." prefix.
                 useGLImode();
             }
@@ -734 +734 @@
             // dir because the non-standard collectDir didn't exist/wasn't specified in the GLI config
             // file, then write out the new collectDir (minus file separator at end) to the lls site conf in use
-            // Regardless of what collecthome value was in the llssite/glisite file, we end up resetting it here
+            // Regardless of what collecthome value was in the llssite file, we end up resetting it here
             if (isPersistentServer) { // server.exe, so we're dealing with a local GS2          
                 put(COLLECTHOME, collectDir);
@@ -743 +743 @@
     }
 
-    /** Tries to get a glisite.cfg file and then loads it, setting it as the configFile */
+    /** Changes the mode to GLI mode (since GSI was not launched independently but by GLI): in this
+    * mode, the "gli." prefix is used to access GLI specific properties from the config file */
     public void useGLImode()
     {
@@ -755 +756 @@
      * (in which case the server URL would be URL_PENDING).
      * This method returns true if the server interface has already started
-     * and, if so, it would have loaded in the llssite_cfg configFile.
+     * and, if so, it would have loaded in the configFile. It sets the mode to 
+     * GSI Mode (meaning GSI was launched independently): no prefix is used to 
+     * access properties from the config file.
      */
     public boolean usingGSImode() {
@@ -807 +810 @@
 
     /** @return the cmd-line parameter for the configfile used to launch
-     * the server through GLI: --config <glisite.cfg/llssite.cfg file path>. */
+     * the server through GLI: --config=<llssite.cfg file path>. */
     public String getSiteConfigFilename() {
         return SPECIFIC_CONFIG + configFile.getAbsolutePath();