Changeset 4584 for trunk/gli

Timestamp:

2003-06-11T16:40:23+12:00 (21 years ago)

Author:

mdewsnip

Message:

Changed saving a collection so it doesn't happen in its own thread - this was sometimes causing nasty race conditions when loading an old collection or opening a new one.

File:

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

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

@@ -178 +178 @@
      */
     public void closeCollection() {
+    // System.err.println("Closing collection...");
     // Remove the lock on this file, then remove the collection.
     File lock_file = new File(Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator + LOCK_FILE);
@@ -188 +189 @@
     Gatherer.config.setCollectionConfiguration(null);
     Gatherer.g_man.collectionChanged(false);
+    // System.err.println("Closed collection.");
     }
 
@@ -612 +614 @@
         current_collection_directory = Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName();
     }
+
     // Create the workspace tree.
     FileNode workspace_root = new FileNode("ABS_ROOT");
@@ -625 +628 @@
     // We add their import and gimport directories, but only if its not our current collection.
     for(int i = 0; cols != null && i < cols.length; i++) {
-        ///ystem.err.println(current_collection_directory);
-        ///ystem.err.println(cols[i].getName() + " = modelcol");
+        ///ystem.err.print("Collection: " + collection);
+        ///ystem.err.print(" Current collection dir: " + current_collection_directory);
+        ///ystem.err.print(" Col " + i + " : " + cols[i] + "\n");
         if(collection == null || (!current_collection_directory.equals(cols[i].getAbsolutePath()) && !cols[i].getName().equals("modelcol"))) {
         File dirs[] = cols[i].listFiles();
@@ -779 +783 @@
             // Open the collection file
             collection = new Collection(collection_file);
+            // System.err.println("In CollectionManager::loadCollection(), collection: " + collection);
             collection.msm = new MetadataSetManager();
             msm = collection.msm; // Legacy
@@ -794 +799 @@
             }
             result = true;
+            // System.err.println("Done loadCollection().");
             } catch (Exception error) {
             // There is obviously no existing collection present.
@@ -997 +1003 @@
     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) {
@@ -1078 +1085 @@
     private void installCollection() {
     Gatherer.println("Build complete. Moving files.");
-          
+
+    // System.err.println("Build mode: " + collection.build_options.getBuildValue("mode"));
+
     try {
                 // We have to ensure that the local library 
@@ -1085 +1094 @@
         Gatherer.g_man.preview_pane.configServer(GSDLSiteConfig.RELEASE_COMMAND + collection.getName());
         }
-                
+
         File index_dir = new File(getCollectionIndex(), "temp.txt");
         index_dir = index_dir.getParentFile();
         Gatherer.println("Index = " + index_dir.getAbsolutePath());
-                
-        if(index_dir.exists()) {
-        Utility.delete(index_dir);
-        }
-
-        if(index_dir.exists()) {
-        throw(new Exception("Index directory cannot be removed."));
-        }
-                
+
         File build_dir = new File(getCollectionBuild(), "temp.txt");
         build_dir = build_dir.getParentFile();
         Gatherer.println("Build = " + build_dir.getAbsolutePath());
+
+        // Remove the old index directory
+        if (index_dir.exists()) {
+        Utility.delete(index_dir);
+        if (index_dir.exists()) {
+            throw new Exception("Index directory cannot be removed.");
+        }
+        }
+
+        // Move the building directory to become the new index directory
         build_dir.renameTo(index_dir);
 
+        // Create a new building directory
         File new_build = new File(getCollectionBuild(), "temp.txt");
         new_build = new_build.getParentFile();