Changeset 7592

Timestamp:

2004-06-14T17:28:15+12:00 (20 years ago)

Author:

mdewsnip

Message:

Much simplified the installLocation function to hopefully remove the nasty "could not remove index directory" problem.

File:

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

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

@@ -1416 +1416 @@
 
     try {
-        // We have to ensure that the local library
+        // We have to ensure that the local library doesn't have locks on any files
         if(!Gatherer.GS3 && Gatherer.config.exec_file != null) {
-        ///ystem.err.println("Local Library Found!");
-        //Gatherer.g_man./review_pane.configServer(GSDLSiteConfig.RELEASE_COMMAND + collection.getName());
         Gatherer.self.configServer(GSDLSiteConfig.RELEASE_COMMAND + collection.getName());
         }
 
-        File index_dir = new File(getCollectionIndex(), "temp.txt");
-        index_dir = index_dir.getParentFile();
-        if(index_dir.exists()) {
-           Gatherer.println("Index = " + index_dir.getAbsolutePath());
-        }
-
-        File build_dir = new File(getCollectionBuild(), "temp.txt");
-        build_dir = build_dir.getParentFile();
+        File build_dir = new File(getCollectionBuild());
         Gatherer.println("Build = " + build_dir.getAbsolutePath());
 
-        // 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(Dictionary.get("CreatePane.Mode_All"))) {
-        // Remove the old index directory
-        if (index_dir.exists()) {
-            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.");
-            }
-        }
-        }
-
+        // Make sure an index directory exists to move files into
+        File index_dir = new File(getCollectionIndex());
+        if (!index_dir.exists()) {
+        index_dir.mkdir();
+        }
+        Gatherer.println("Index = " + index_dir.getAbsolutePath());
+
+        moveContentsInto(build_dir, index_dir, true);
     }
     catch (Exception exception) {
@@ -1486 +1437 @@
         return false;
     }
+
     return true;
     }
+
+
+    /** Moves all the files in one directory into another, overwriting if desired */
+    private void moveContentsInto(File source_directory, File target_directory, boolean overwrite)
+    {
+    File[] source_files = source_directory.listFiles();
+    for (int i = 0; i < source_files.length; i++) {
+        File source_file = source_files[i];
+        File target_file = new File(target_directory, source_file.getName());
+
+        if (source_file.isDirectory()) {
+        moveContentsInto(source_file, target_file, overwrite);
+        source_file.delete();
+        }
+        else {
+        if (target_file.exists() && overwrite) {
+            target_file.delete();
+            source_file.renameTo(target_file);
+        }
+        }
+    }
+    }
+
 
     private boolean searchArchivesForMetadata(File archive_directory) {