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

Timestamp:

2007-01-12T17:20:20+13:00 (17 years ago)

Author:

mdewsnip

Message:

Now always downloads the collection configurations when the GLI is starting up, as nothing much works without them. This simplifies the code and means that the openCollectionFromLastTime() function works.

File:

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

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

@@ -102 +102 @@
     static private GShellProgressMonitor import_monitor = null;
 
-    /** Whether we have downloaded the collection configurations in this session, when using a remote Greenstone. */
-    static public boolean downloaded_collection_configurations = false;
-
     /** The name of the standard lock file. */
     static final public String LOCK_FILE = "gli.lck";
@@ -1067 +1064 @@
     {
     // If there was an open collection last session, reopen it
-    if (Gatherer.open_collection_file_path != null && !Gatherer.isGsdlRemote) {
-        // If we're using a remote Greenstone server we must download the collection configurations first
-        // if (Gatherer.isGsdlRemote && !CollectionManager.downloaded_collection_configurations) {
-        // if (RemoteGreenstoneServer.downloadCollectionConfigurations().equals("")) {
-            // Something went wrong downloading the collection configurations
-            // return;
-        // }
-
-        // CollectionManager.downloaded_collection_configurations = true;
-        // }
-
+    if (Gatherer.open_collection_file_path != null) {
         // Load the collection now
         loadCollection(Gatherer.open_collection_file_path);