Changeset 14371 for gli

Timestamp:

2007-08-14T15:28:42+12:00 (17 years ago)

Author:

qq6

Message:

if the loaded collection is not null,delete the gli.lck file when the current site is changed in the remote gli3

File:

• gli/trunk/src/org/greenstone/gatherer/gui/Preferences.java (modified) (2 diffs)

gli/trunk/src/org/greenstone/gatherer/gui/Preferences.java

@@ -894 +894 @@
         System.err.println("event occurred "+event.paramString());
         String site = (String) site_combobox.getSelectedItem();
-        System.err.println("new site = "+site);
+        System.err.println("The site changed to = "+site);
         if (!site.equals(current_site_selection)) {
         current_site_selection = site;
@@ -915 +915 @@
             // Close the current collection, remove the lock on this file, ask to login to the new site, then download collection configurations of the site.
             if (Gatherer.c_man.getCollection()!=null){
+            File lock_file = new File(Gatherer.c_man.getLoadedCollectionDirectoryPath() + "gli.lck");
+            RemoteGreenstoneServer.deleteCollectionFile(Gatherer.c_man.getLoadedCollectionName(),lock_file);
             Gatherer.g_man.closeCurrentCollection();
             }
-            File lock_file = new File(Gatherer.c_man.getLoadedCollectionDirectoryPath() + "gli.lck");
-            RemoteGreenstoneServer.deleteCollectionFile(Gatherer.c_man.getLoadedCollectionName(),lock_file);
             Configuration.site_name=site;
             RemoteGreenstoneServer.set_remote_greenstone_server_authentication_to_null();