Changeset 10586

Timestamp:

2005-08-31T11:55:37+12:00 (19 years ago)

Author:

mdewsnip

Message:

Now handles mkcol.pl cancels a lot better -- no longer get multiple error dialog boxes.

File:

• trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java (modified) (1 diff)

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

@@ -322 +322 @@
         ProgressMonitor progress = new ProgressMonitor(Gatherer.g_man, Dictionary.get("CollectionManager.Creating_New"), "mkcol.pl", 0, 4);
 
-        // Create the new collection.
+        // Create the new collection
         makeCollection(name, email);
         progress.setProgress(1);
-        
-        // *******************
-        //check that this creation has worked - simply by checking for the existence of the collect.cfg file
+
+        // Check that the collection has been created successfully
         String collection_directory_path = getCollectionDirectoryPath(name);
+        if (!new File(collection_directory_path).exists()) {
+        // If there is no collection directory then the creation was unsuccessful, or cancelled
+        System.err.println("No collection directory...");
+        progress.close();
+        return;
+        }
+
+        // Check for the existence of the collect.cfg file
         File collect_cfg_file = new File(collection_directory_path + "etc" + File.separator + "collect.cfg");
         if (!collect_cfg_file.exists()) {
-        // no point continuing
         System.err.println("Error: no collect.cfg file has been created!");
         JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CollectionManager.Cannot_Create_Collection_With_Reason", Dictionary.get("CollectionManager.No_Config_File")), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);