Changeset 24906

Timestamp:

2011-12-15T22:00:44+13:00 (12 years ago)

Author:

ak19

Message:

The original GLI LocalLibraryServer code called restore() when stopping the LLS. This would delete the configfile if it was not null. This code remained the same throughout the old changes from gsdlsite.cfg to glisite.cfg. However, the more recent change was to merge glisite.cfg with llssite.cfg, and we don't want to delete the file containing the property values. The file now retains the values that I think are important to remember, removes the URL that must be deleted when the server is stopped, additionally removes some values particular to server.exe and finally ensures that some basic defaults are retained if anything goes missing.

File:

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

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

@@ -411 +411 @@
                    + "\nto the LocalLibraryServer.\n" + e);
         }
-        if(success) {       
+        if(success) {
         Gatherer.terminateApplication(ID);
         } else {
@@ -910 +910 @@
         if(configFile != null) {
         // Delete the file
-        configFile.delete();
+        //configFile.delete();
+        
+        // Not restoring nor deleting here. Just removing the URL (which indicates a running server), 
+        // so that the file's state indicates the server has stopped, and then saving the property file.
+        // Should all properties not defined in the llssite.cfg.in template be removed below?
+        String urlPropertyName = isIndependentGSI() ? GSI_URL : URL;
+        remove(urlPropertyName);
+        
+        remove("gsdlhome");
+        remove("collecthome");
+        remove("gdbmhome");
+        remove("logfilename");
+        
+        // For some reason launching GLI with server.exe clobbers autoenter and startbrowser 
+        // values for independent GSI in llssite.cfg file, and gli.autoenter and gli.startbrowser.
+        // So set them here.
+        if(get(GSI_AUTOENTER) == null) {
+            put(GSI_AUTOENTER, "0");
+        }
+        if(get(GSI_STARTBROWSER) == null) {
+            put(GSI_STARTBROWSER, "1");
+        }
+        if(get(AUTOENTER) == null) {
+            put(AUTOENTER, "1");
+        }
+        if(get(STARTBROWSER) == null) {
+            put(STARTBROWSER, "0");
+        }       
+        save();
         }
         else {