Changeset 23143 for main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.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/collection/CollectionManager.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -1558 +1558 @@
     public void openCollectionFromLastTime() {
       // If there was an open collection last session, reopen it. 
-      // Skip if there was none or only a collect folder instead of any previously-opened collection      
-      if (Gatherer.open_collection_file_path != null 
-            && !(new File(Gatherer.open_collection_file_path).isDirectory())) {
-         // Load the collection now
-         loadCollection(Gatherer.open_collection_file_path);
-      }
+      // (this method doesn't get called if there was no open collection or only a collect folder 
+      // instead of any previously-opened collection)
+      
+        // Load the collection now
+        loadCollection(Gatherer.open_collection_file_path);      
     }