Changeset 8586 for trunk/gli/src/org/greenstone/gatherer/collection

Timestamp:

2004-11-17T13:20:30+13:00 (20 years ago)

Author:

mdewsnip

Message:

Made saving collections unthreaded -- this makes a lot of code, and at least one race condition, so away. Saving collections is quick enough that it doesn't matter if it is done on the main thread.

Location:

trunk/gli/src/org/greenstone/gatherer/collection

Files:

• Collection.java (modified) (1 diff)
• CollectionManager.java (modified) (2 diffs)
• SaveCollectionBox.java (deleted)
• SaveCollectionTask.java (deleted)

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

@@ -188 +188 @@
     public void save() {
     Utility.export(document, file);
+    saved = true;
     }
 

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

@@ -753 +753 @@
     public void importCollection() {
     importing = true;
-    if(!saved()) {
+
+    if (!saved()) {
         DebugStream.println("CollectionManager.importCollection().forcesave");
         import_monitor.saving();
-        // Force save.
-        try {
-        SaveCollectionTask save_task = new SaveCollectionTask(collection);
-        save_task.setImportAfter(true);
-        save_task.start();
-        }
-        catch(Exception error) {
-        DebugStream.printStackTrace(error);
-        }
+        saveCollection();
+    }
+
+    DebugStream.println("CollectionManager.importCollection()");
+    //check that we can remove the old index before starting import
+    File index_dir = new File(getCollectionIndex(), "temp.txt");
+    index_dir = index_dir.getParentFile();
+    if(index_dir.exists()) {
+        DebugStream.println("Old Index = " + index_dir.getAbsolutePath()+", testing for deletability");
+        if (!canDelete(index_dir)) {
+        // tell the user
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CollectionManager.Cannot_Delete_Index"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE); 
+        // tell the gui manager
+        // a message for the building log 
+        GShellEvent event = new GShellEvent(this, 0, GShell.IMPORT, Dictionary.get("CollectionManager.Cannot_Delete_Index_Log"), GShell.ERROR);
+        Gatherer.g_man.create_pane.message(event);
+        event = new GShellEvent(this, 0, GShell.IMPORT, "", GShell.ERROR);
+        Gatherer.g_man.create_pane.processComplete(event);
+        importing = false;
+        return;
+        }
+    }
+
+    String collect_dir = getCollectDirectory();
+
+    String args[];
+    String lang = Configuration.getLanguage();
+    if((Utility.isWindows()) && (!Gatherer.isGsdlRemote)) {
+        args = new String[8];
+        args[0] = Configuration.perl_path;
+        args[1] = "-S";
+        args[2] = Configuration.getScriptPath() + "import.pl";
+        args[3] = "-gli";
+        args[4] = "-language";
+        args[5] = lang;
+        args[6] = "-collectdir";
+        args[7] = collect_dir;
     }
     else {
-        DebugStream.println("CollectionManager.importCollection()");
-        //check that we can remove the old index before starting import
-        File index_dir = new File(getCollectionIndex(), "temp.txt");
-        index_dir = index_dir.getParentFile();
-        if(index_dir.exists()) {
-        DebugStream.println("Old Index = " + index_dir.getAbsolutePath()+", testing for deletability");
-        if (!canDelete(index_dir)) {
-            // tell the user
-            JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CollectionManager.Cannot_Delete_Index"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE); 
-            // tell the gui manager
-            // a message for the building log 
-            GShellEvent event = new GShellEvent(this, 0, GShell.IMPORT, Dictionary.get("CollectionManager.Cannot_Delete_Index_Log"), GShell.ERROR);
-            Gatherer.g_man.create_pane.message(event);
-            event = new GShellEvent(this, 0, GShell.IMPORT, "", GShell.ERROR);
-            Gatherer.g_man.create_pane.processComplete(event);
-            importing = false;
-            return;
-        }
-        }
-
-        String collect_dir = getCollectDirectory();
-
-        String args[];
-        String lang = Configuration.getLanguage();
-        if((Utility.isWindows()) && (!Gatherer.isGsdlRemote)) {
-        args = new String[8];
-        args[0] = Configuration.perl_path;
-        args[1] = "-S";
-        args[2] = Configuration.getScriptPath() + "import.pl";
-        args[3] = "-gli";
-        args[4] = "-language";
-        args[5] = lang;
-        args[6] = "-collectdir";
-        args[7] = collect_dir;
-        }
-        else {
-        args = new String[6];
-        args[0] = Configuration.getScriptPath() + "import.pl";
-        args[1] = "-gli";
-        args[2] = "-language";
-        args[3] = lang;
-        args[4] = "-collectdir";
-        args[5] = collect_dir;
-        }
-        collect_dir = null;
-        args = ArrayTools.add(args, collection.build_options.getImportValues());
-        args = ArrayTools.add(args, collection.getName());
-
-        GShell shell = new GShell(args, GShell.IMPORT, BUILDING, this, import_monitor, GShell.GSHELL_IMPORT);
-        shell.addGShellListener(Gatherer.g_man.create_pane);
-        shell.start();
-        DebugStream.println("CollectionManager.importCollection().return");
-    }
+        args = new String[6];
+        args[0] = Configuration.getScriptPath() + "import.pl";
+        args[1] = "-gli";
+        args[2] = "-language";
+        args[3] = lang;
+        args[4] = "-collectdir";
+        args[5] = collect_dir;
+    }
+    collect_dir = null;
+    args = ArrayTools.add(args, collection.build_options.getImportValues());
+    args = ArrayTools.add(args, collection.getName());
+
+    GShell shell = new GShell(args, GShell.IMPORT, BUILDING, this, import_monitor, GShell.GSHELL_IMPORT);
+    shell.addGShellListener(Gatherer.g_man.create_pane);
+    shell.start();
+    DebugStream.println("CollectionManager.importCollection().return");
+
     importing = false;
     }
@@ -1280 +1273 @@
     return result;
     }
-    /** Saves a collection by serializing it to file.
-     * @param close_after <i>true</i> to cause the Gatherer to close the collection once save is complete, <i>false</i> otherwise.
-     * @param exit_after <i>true</i> to cause the Gatherer to exit once save is complete, <i>false</i> otherwise.
-     * @see org.greenstone.gatherer.Gatherer
-     * @see org.greenstone.gatherer.gui.GUIManager
-     * @see org.greenstone.gatherer.collection.Collection
-     */
-    public void saveCollection(boolean close_after, boolean exit_after) {
-    DebugStream.println("Save collection: " + collection.getName());
-    try {
-        SaveCollectionTask save_task = new SaveCollectionTask(collection, close_after, exit_after);
-        save_task.start();
-        // Run this in the same thread
-        //save_task.run();
-    }
-    catch(Exception error) {
-        DebugStream.printStackTrace(error);
-    }
-    }
+
+
+    /** Saves the currently loaded collection. */
+    public void saveCollection()
+    {
+    DebugStream.println("Saving collection " + collection.getName() + "...");
+
+    // Change cursor to hourglass
+    Gatherer.g_man.wait(true);
+
+    // Create a backup of the collection file, just in case anything goes wrong
+    File collection_file = new File(Gatherer.c_man.getCollectionFilename());
+    if (collection_file.exists()) {
+        File collection_file_backup = new File(collection_file.getAbsolutePath() + "~");
+        if (!collection_file.renameTo(collection_file_backup)) {
+        DebugStream.println("Error in CollectionManager.saveCollection(): could not create backup file.");
+        }
+        collection_file_backup.deleteOnExit();
+    }
+
+    // Write out the collection file
+    collection.save();
+
+    // Write out the collection configuration file
+    Gatherer.g_man.design_pane.saveConfiguration();
+
+    // Write hfiles for the loaded metadata elements into the collection "etc" directory
+    MetadataSetManager.writeHierarchyFiles(new File(Gatherer.c_man.getCollectionEtc()));
+
+    // Change cursor back to normal
+    Gatherer.g_man.wait(false);
+    }
+
 
     public void setClosingThread(boolean set) {