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

Timestamp:

2010-10-15T20:33:43+13:00 (14 years ago)

Author:

ak19

Message:

More changes to making collectdir movable: 1. When not working with a remote GS or server.exe: if the collecthome set in GLI is not the same as the one in gsdlsite.cfg used by the apache web server, then a dialog pops up on exiting GLI allowing the user to set the collecthome value for both GLI (in the user's GLI config.xml) and the server (in gsdlsite.cfg). 2. Collecthome line in gsdlsite.cfg is removed if it is the default GS collect folder. (Just as a recent commit stores an empty string for the open_collection element in the GLI config.xml file if no collection is left open on exiting GLI and the collect folder is the default GS collect directory.) 3. Some bug fixes.

File:

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

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

@@ -70 +70 @@
     static private boolean isPersistentServer = false;
 
+    static public boolean isPersistentServer() {
+        return isPersistentServer;
+    }
+    
     static public void addCollection(String collection_name)
     {
@@ -395 +399 @@
     if (isPersistentServer) {
         config(QUIT_COMMAND);
-    } else {
+    } else {        
         boolean success = sendMessageToServer("QUIT\n");
         try {
@@ -697 +701 @@
         // Set the correct collectdir (from last time) before the server is started up
         
-        //String collectDir = Configuration.getString("general.open_collection_gs2", true);
         String orig_collection_path = Configuration.getString("general.open_collection_gs2", true);
-        String collectDir = Gatherer.getCollectDirectoryPath();
+        String collectDir = Gatherer.getCollectDirectoryPath();                 // Gatherer would've set this up
         String defaultColDir = Gatherer.getDefaultGSCollectDirectoryPath(true); // with file separator at end
-        
-        // If opening a collection outside the standard GS collect folder, need
-        // to open the non-standard collect folder that the collection resides in.
-        // Also, would have been forced to change the loaded collection--and hence collectDir--
-        // to the default coldir if orig_col_path was "" or led to a collectdir that didn't exist
-        // (in the last case, gsdlsite.cfg already corrected in Gatherer if coldir was changed).    
-        
+                
         if(orig_collection_path.equals("")) { // default GS collect dir path
             return;
         }
         
-        if (Gatherer.open_collection_file_path != null // may be null if no_load was specified on GLI startup           
-            && (!orig_collection_path.startsWith(collectDir) // if coldir would've been changed on startup OR if coldir is non-standard collect folder
-                || !collectDir.equals(defaultColDir))) 
+        if (!orig_collection_path.startsWith(collectDir) // if coldir would've been changed on startup OR if coldir is non-standard collect folder
+                || !collectDir.equals(defaultColDir))
         {           
             // if we're running *server.exe* and if the current collect dir at Local Lib's startup is
@@ -720 +716 @@
             // 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
             if (isPersistentServer) { // server.exe, so we're dealing with a local GS2          
                 put(COLLECTHOME, collectDir);