Changeset 5996

Timestamp:

2003-11-25T16:23:23+13:00 (20 years ago)

Author:

jmt12

Message:

Made several changes to the way collections are opened - thus to create a more consistant state when things go wrong. For instance opening a collection with a corrupt or missing collect.cfg no longer provides the user with a seemingly working gli bar a title of #ERROR... oh and a nasty trick of crashing when you try to save your past hours worth of work ;P

File:

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

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

@@ -544 +544 @@
     return Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator + collection.getName() + ".col";
     }
+    /** Constructs the absolute filename of the collection images directory, which should resemble "$GSDLHOME/collect/<col_name>/images/"
+     * @return A <strong>String</strong> containing the filename.
+     * @see org.greenstone.gatherer.Configuration
+     * @see org.greenstone.gatherer.Gatherer
+     * @see org.greenstone.gatherer.collection.Collection
+     * @see org.greenstone.gatherer.util.Utility
+     */
+    public String getCollectionImages() {
+    return Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator + StaticStrings.IMAGES_FOLDER;
+    }
     /** Constructs the absolute filename of the collection import directory, which should resemble "$GSDLHOME/collect/&lt;col_name&gt;/import/"
      * @return A <strong>String</strong> containing the filename.
@@ -717 +727 @@
         return false;
     }
+    // Check that there is the collection configuration file available
+
     File collection_file = new File(location);
     // Ensure that the directory exists.
@@ -761 +773 @@
         // Open the collection file
         collection = new Collection(collection_file);
+        if(collection.getTitle().equals(StaticStrings.ERROR_STR)) {
+        collection = null;
+        // Remove lock file
+        if(lock_file.exists()) {
+            lock_file.delete();
+        }
+        throw(new Exception(Dictionary.get("CollectionManager.Missing_Config")));
+        }
+
         collection.msm = new MetadataSetManager();
         msm = collection.msm; // Legacy
@@ -807 +828 @@
         // There is obviously no existing collection present.
         Gatherer.printStackTrace(error);
-        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CollectionManager.Cannot_Open", args2), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+        if(error.getMessage() != null) {
+        String[] args = new String[2];
+        args[0] = args2[0];
+        args[1] = error.getMessage();
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CollectionManager.Cannot_Open_With_Reason", args), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+        }
+        else {
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CollectionManager.Cannot_Open", args2), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+        }
     }
     
@@ -1023 +1052 @@
     // If we were running an import, now run a build.
     if(event.getType() == GShell.IMPORT && event.getStatus() != GShell.ERROR) {
-                // Finish import.
+        // Finish import.
         collection.setImported(true);
         buildCollection();
@@ -1029 +1058 @@
     // If we were running a build, now is when we move files across.
     else if(event.getType() == GShell.BUILD && event.getStatus() != GShell.ERROR) {
-                ///ystem.err.println("Installing collection.");
-        installCollection();
-        // If we have a local library running (that we know about) then we ask it to add our newly create collection
-        ///ystem.err.println("Check if we should reset local server.");
-        if(Gatherer.config.exec_file != null) {
-        ///ystem.err.println("Local Library Found!");
-        //Gatherer.g_man.preview_pane.configServer(GSDLSiteConfig.ADD_COMMAND + collection.getName());
-        Gatherer.self.configServer(GSDLSiteConfig.ADD_COMMAND + collection.getName());
-        }
-        //else {
-        ///ystem.err.println("GLI can't recognize a local library.");
-        //}
-        // Signal collection changed.
-        // workspace_model = null;
-        Gatherer.g_man.collectionChanged(ready());
-        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CollectionManager.Preview_Ready"), Dictionary.get("CollectionManager.Preview_Ready_Title"), JOptionPane.INFORMATION_MESSAGE);
+        ///ystem.err.println("Installing collection.");
+        if(installCollection()) {
+        // If we have a local library running (that we know about) then we ask it to add our newly create collection
+        ///ystem.err.println("Check if we should reset local server.");
+        if(Gatherer.config.exec_file != null) {
+            ///ystem.err.println("Local Library Found!");
+            //Gatherer.g_man.preview_pane.configServer(GSDLSiteConfig.ADD_COMMAND + collection.getName());
+            Gatherer.self.configServer(GSDLSiteConfig.ADD_COMMAND + collection.getName());
+        }
+        //else {
+        ///ystem.err.println("GLI can't recognize a local library.");
+        //}
+        // Signal collection changed.
+        // workspace_model = null;
+        Gatherer.g_man.collectionChanged(ready());
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CollectionManager.Preview_Ready"), Dictionary.get("CollectionManager.Preview_Ready_Title"), JOptionPane.INFORMATION_MESSAGE);
+        }
+        else {
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CollectionManager.Preview_Ready_Failed"), Dictionary.get("CollectionManager.Preview_Ready_Title"), JOptionPane.ERROR_MESSAGE);
+        Gatherer.g_man.collectionChanged(ready());
+        }
     }
     else if(event.getStatus() == GShell.ERROR) {
@@ -1197 +1231 @@
      * @see org.greenstone.gatherer.util.Utility
      */
-    private void installCollection() {
+    private boolean installCollection() {
     Gatherer.println("Build complete. Moving files.");
 
@@ -1268 +1302 @@
     catch (Exception exception) {
         JOptionPane.showMessageDialog(Gatherer.g_man, "Exception detected during collection install.\nMost likely caused by Windows or Local Library holding locks on files:\n" + exception.getMessage(), "Error", JOptionPane.ERROR_MESSAGE);
-    }
+        return false;
+    }
+    return true;
     }