Changeset 8214

Timestamp:

2004-10-04T15:38:50+13:00 (20 years ago)

Author:

kjdon

Message:

a few changes to do with creating collections. different error if it fails (not the coll can't be previewed error), creates the collect directory if it diesn't exist, and if makeCollection fails, don't continue with the rest of creating a collection, cos then you get the collection opened, but it has no config file

File:

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

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

@@ -327 +327 @@
 
     try {
+        // first make sure that the collect directory exists
+        File collect_dir = new File(getCollectDirectory());
+        if (!collect_dir.exists()) {
+        collect_dir.mkdirs();
+        }
         // Create a progress monitor.
         ProgressMonitor progress = new ProgressMonitor(Gatherer.g_man, Dictionary.get("CollectionManager.Creating_New"), "mkcol.pl", 0, 7);
         // Create the new collection.
         makeCollection(description, email, name, title);
-        progress.setProgress(1);
+        
         // *******************
+        //check that this creation has worked - simply by checking for the existence of the collect.cfg file
         String a_dir;
         if (Gatherer.GS3) {
@@ -339 +345 @@
         a_dir = Utility.getCollectionDir(Gatherer.config.gsdl_path, name);
         }
+        File config_file = new File(Utility.getConfigFile(a_dir));
+        if (!config_file.exists()) {
+        // no point continuing
+        Gatherer.println("The collection could not be created");
+        progress.close();
+        return;
+        }
+        progress.setProgress(1);
+        
         // ACTIVE_DIR/log/
         File log_dir_temp = new File(Utility.getLogDir(a_dir)+"temp.dat");
@@ -1123 +1138 @@
     }
     GShell process = new GShell(command, GShell.NEW, COLLECT, this, null, GShell.GSHELL_NEW);
-    process.addGShellListener(this);
     process.run(); // Don't bother threading this... yet
-       
     }
 
@@ -1200 +1213 @@
     else if(event.getStatus() == GShell.ERROR || event.getStatus() == GShell.CANCELLED) {
         Gatherer.println("There was an error in the gshell:"+ event.getMessage());
-        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());
+        if (event.getType() == GShell.NEW) {
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CollectionManager.Cannot_Create_Collection"), Dictionary.get("General.Error"), JOptionPane.ERROR_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());
+        }
+        
         Gatherer.g_man.repaint(); // It appears Java's own dialogs have the same not always painting correct area bug that I suffer from. Well I don't suffer from it personally, but my ModalDialog components do.
     }