Changeset 22772 for main/trunk

Timestamp:

2010-08-24T20:47:17+12:00 (14 years ago)

Author:

ak19

Message:

Corrected error in previous accidental commit: To tell the local library server to release a collection, need to pass a URL style slash

Location:

main/trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/CollectionConfiguration.java (modified) (1 diff)
• collection/CollectionManager.java (modified) (2 diffs)

main/trunk/gli/src/org/greenstone/gatherer/cdm/CollectionConfiguration.java

@@ -410 +410 @@
        
     // If we're using the Local Library we must release the collection before writing to the collect.cfg file
-    String collection_name = CollectionManager.getLoadedCollectionName (false); // url style slash
+    String collection_name = CollectionManager.getLoadedCollectionName (true); // url style slash
     boolean collection_released = false;
     if (Gatherer.c_man.built () && LocalLibraryServer.isRunning () == true) {

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

@@ -426 +426 @@
     // If we're using the Local Library we must release the collection before writing to the collect.cfg file
     if(Gatherer.isLocalLibrary) {       
-        LocalLibraryServer.releaseCollection(getLoadedCollectionName()); // URL style slash //collection.getName());
+        LocalLibraryServer.releaseCollection(getLoadedCollectionName(true)); // 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(getLoadedCollectionName()); // URL style slash //collection.getName());
+        LocalLibraryServer.releaseCollection(getLoadedCollectionName(true)); // URL style slash //collection.getName());
         }
         // deactivate it in tomcat so that windows will release the index files