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

Timestamp:

2010-08-24T19:49:00+12:00 (14 years ago)

Author:

ak19

Message:

More changes for ticket 152: making the collectdir moveable. When using server.exe, if GLI was last shutdown when another collectdir was active, this needs to be read in from the user config.xml by GLI, and server.exe needs to use it.

File:

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

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

@@ -425 +425 @@
 
     // If we're using the Local Library we must release the collection before writing to the collect.cfg file
-    if(Gatherer.isLocalLibrary) {
-        LocalLibraryServer.releaseCollection(collection.getName());
+    if(Gatherer.isLocalLibrary) {       
+        LocalLibraryServer.releaseCollection(getLoadedCollectionName()); // URL style slash //collection.getName());
     }
     
@@ -1850 +1850 @@
         // Ensure that the local library has released this collection so we can delete the index directory
         if (LocalLibraryServer.isRunning() == true) {
-        LocalLibraryServer.releaseCollection(collection.getName());
+        LocalLibraryServer.releaseCollection(getLoadedCollectionName()); // URL style slash //collection.getName());
         }
         // deactivate it in tomcat so that windows will release the index files