Changeset 4608 for trunk

Timestamp:

2003-06-12T15:24:44+12:00 (21 years ago)

Author:

mdewsnip

Message:

Installing collections is now done with respect to the build mode option: selecting "all" (or not selecting anything) will remove the old index directory and make the building directory to become the new index directory. The other options merely move the contents of the building directory into the index directory, overwriting previous versions of the files/folders.

File:

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

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

@@ -1086 +1086 @@
     Gatherer.println("Build complete. Moving files.");
 
-    // System.err.println("Build mode: " + collection.build_options.getBuildValue("mode"));
 
     try {
@@ -1103 +1102 @@
         Gatherer.println("Build = " + build_dir.getAbsolutePath());
 
-        // Remove the old index directory
-        if (index_dir.exists()) {
-        Utility.delete(index_dir);
+        // Get the build mode from the build options
+        String build_mode = collection.build_options.getBuildValue("mode");
+
+        // Special case for build mode "all": replace index dir with building dir
+        if (build_mode == null || build_mode.equals(get("CreatePane.Mode_All"))) {
+        // Remove the old index directory
         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();
-
-        if(new_build.exists()) {
-        throw(new Exception("Build directory cannot be moved."));
-        }
-
-        new_build.mkdir();
+            Utility.delete(index_dir);
+            // Check the delete worked
+            if (index_dir.exists()) {
+            throw new Exception("Index directory cannot be removed.");
+            }
+        }
+
+        // Move the building directory to become the new index directory
+        if (build_dir.renameTo(index_dir) == false) {
+            throw new Exception("Build directory cannot be moved.");
+        }
+
+        // Create a new building directory
+        File new_build = new File(getCollectionBuild(), "temp.txt");
+        new_build = new_build.getParentFile();
+        new_build.mkdir();
+        }
+
+        // Otherwise copy everything in the building dir into the index dir
+        else {
+        File[] build_files = build_dir.listFiles();
+        for (int i = 0; i < build_files.length; i++) {
+            File build_file = build_files[i];
+            File index_equivalent = new File(index_dir, build_file.getName());
+
+            // Remove the old file in the index directory (if it exists)
+            if (index_equivalent.exists()) {
+            Utility.delete(index_equivalent);
+            // Check the delete worked
+            if (index_equivalent.exists()) {
+                throw new Exception("Index file " + index_equivalent + " cannot be removed.");
+            }
+            }
+
+            // Move the file into the index directory
+            if (build_file.renameTo(index_equivalent) == false) {
+            throw new Exception("File " + build_file + " cannot be moved into index directory.");
+            }
+        }
+        }
     }
     catch (Exception exception) {