Changeset 13600

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.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (1 diff)
• collection/CollectionManager.java (modified) (2 diffs)
• gui/GUIManager.java (modified) (3 diffs)

trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -462 +462 @@
     }
 
+    // If using a remote Greenstone we need to download the collection configurations now
+    if (Gatherer.isGsdlRemote) {
+        if (RemoteGreenstoneServer.downloadCollectionConfigurations().equals("")) {
+        // !! Something went wrong downloading the collection configurations
+        System.err.println("Error: Could not download collection configurations.");
+        System.exit(0);
+        }
+    }
+
     // If there was a collection left open last time, reopen it
     c_man.openCollectionFromLastTime();

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);

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

@@ -673 +673 @@
     public void run()
     {
-        // If using a remote Greenstone check if the collection configurations have been downloaded; do so if not
-        if (Gatherer.isGsdlRemote && !CollectionManager.downloaded_collection_configurations) {
-        if (RemoteGreenstoneServer.downloadCollectionConfigurations().equals("")) {
-            // Something went wrong downloading the collection configurations
-            return;
-        }
-
-        CollectionManager.downloaded_collection_configurations = true;
-        }
-
         String collection_file_path = showOpenCollectionDialog();
 
@@ -727 +717 @@
     public void run()
     {
-        // If using a remote Greenstone check if the collection configurations have been downloaded; do so if not
-        if (Gatherer.isGsdlRemote && !CollectionManager.downloaded_collection_configurations) {
-        if (RemoteGreenstoneServer.downloadCollectionConfigurations().equals("")) {
-            // Something went wrong downloading the collection configurations
-            return;
-        }
-
-        CollectionManager.downloaded_collection_configurations = true;
-        }
-
         // Create the collection details prompt from new collection prompt
         NewCollectionDetailsPrompt ncd_prompt = new NewCollectionDetailsPrompt();
@@ -763 +743 @@
     public void run()
     {
-        // If using a remote Greenstone check if the collection configurations have been downloaded; do so if not
-        if (Gatherer.isGsdlRemote && !CollectionManager.downloaded_collection_configurations) {
-        if (RemoteGreenstoneServer.downloadCollectionConfigurations().equals("")) {
-            // Something went wrong downloading the collection configurations
-            return;
-        }
-
-        CollectionManager.downloaded_collection_configurations = true;
-        }
-
         // The rest is handled by the DeleteCollectionPrompt
         DeleteCollectionPrompt dc_prompt = new DeleteCollectionPrompt();