Changeset 22772

Show
Ignore:
Timestamp:
24.08.2010 20:47:17 (9 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:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gli/src/org/greenstone/gatherer/cdm/CollectionConfiguration.java

    r22771 r22772  
    410410        
    411411    // If we're using the Local Library we must release the collection before writing to the collect.cfg file 
    412     String collection_name = CollectionManager.getLoadedCollectionName (false); // url style slash 
     412    String collection_name = CollectionManager.getLoadedCollectionName (true); // url style slash 
    413413    boolean collection_released = false; 
    414414    if (Gatherer.c_man.built () && LocalLibraryServer.isRunning () == true) { 
  • main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

    r22771 r22772  
    426426    // If we're using the Local Library we must release the collection before writing to the collect.cfg file 
    427427    if(Gatherer.isLocalLibrary) {        
    428         LocalLibraryServer.releaseCollection(getLoadedCollectionName()); // URL style slash //collection.getName()); 
     428        LocalLibraryServer.releaseCollection(getLoadedCollectionName(true)); // URL style slash //collection.getName()); 
    429429    } 
    430430     
     
    18501850        // Ensure that the local library has released this collection so we can delete the index directory 
    18511851        if (LocalLibraryServer.isRunning() == true) { 
    1852         LocalLibraryServer.releaseCollection(getLoadedCollectionName()); // URL style slash //collection.getName()); 
     1852        LocalLibraryServer.releaseCollection(getLoadedCollectionName(true)); // URL style slash //collection.getName()); 
    18531853        } 
    18541854        // deactivate it in tomcat so that windows will release the index files