Changeset 4351

Timestamp:

2003-05-27T15:17:37+12:00 (21 years ago)

Author:

jmt12

Message:

Added new local library server command to release collection before installing the building directory to index - John

File:

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

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

@@ -66 +66 @@
 import org.greenstone.gatherer.undo.UndoManager;
 import org.greenstone.gatherer.util.ArrayTools;
+import org.greenstone.gatherer.util.GSDLSiteConfig;
 import org.greenstone.gatherer.util.MetadataXML;
 import org.greenstone.gatherer.util.SynchronizedTreeModelTools;
@@ -867 +868 @@
                 collection.setBuilt(true);
                 // If we have a local library running (that we know about) then we ask it to add our newly create collection
-                System.err.println("Check if we should reset local server.");
+                ///ystem.err.println("Check if we should reset local server.");
                 if(Gatherer.config.exec_file != null) {
-                    System.err.println("Local Library Found!");
-                    Gatherer.g_man.preview_pane.resetServer();
-                }
-                else {
-                    System.err.println("GLI can't recognize a local library.");
-                }
+                     ///ystem.err.println("Local Library Found!");
+                    Gatherer.g_man.preview_pane.configServer(GSDLSiteConfig.ADD_COMMAND + collection.getName());
+                }
+                //else {
+                ///ystem.err.println("GLI can't recognize a local library.");
+                //}
                 // Signal collection changed.
                 workspace_model = null;
@@ -1035 +1036 @@
      private void installCollection() {
           Gatherer.println("Build complete. Moving files.");
-          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);
-          }
-          File build_dir = new File(getCollectionBuild(), "temp.txt");
-          build_dir = build_dir.getParentFile();
-          Gatherer.println("Build = " + build_dir.getAbsolutePath());
-          build_dir.renameTo(index_dir);
-          File new_build = new File(getCollectionBuild(), "temp.txt");
-          new_build = new_build.getParentFile();
-          new_build.mkdir();
+          
+          try {
+                // We have to ensure that the local library 
+                if(Gatherer.config.exec_file != null) {
+                     ///ystem.err.println("Local Library Found!");
+                    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());
+                build_dir.renameTo(index_dir);
+
+                File new_build = new File(getCollectionBuild(), "temp.txt");
+                new_build = new_build.getParentFile();
+
+                if(new_build.exists()) {
+                     throw(new Exception("Build directory cannot be moved."));
+                }
+
+                new_build.mkdir();
+          }
+          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);
+          }
      }
      /** Creates and dispatches a message given the initial details.