Changeset 24636 for main/trunk

Timestamp:

2011-09-23T13:37:54+12:00 (13 years ago)

Author:

ak19

Message:

FileQueue.copyDirectoryContents is now overloaded to take an overwrite parameter. This is necessary for when CollectionManager.copyExtraBaseCollStuff() has to copy the macros folder across. At this point a new collection contains a macros folder already and it used to be unable to overwite it before. Now, with the new overwrite flag to FileQueue.copyDirContents(), setting overwrite to true when basing a new collection on an existing one allows all the necessary folders to be copied across.

Location:

main/trunk/gli/src/org/greenstone/gatherer

Files:

• collection/CollectionManager.java (modified) (1 diff)
• file/FileQueue.java (modified) (2 diffs)

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

@@ -485 +485 @@
           File new_coll_subdir = new File(new_coll_dir, dir_name);
           new_coll_subdir.mkdirs();
-          Gatherer.f_man.getQueue().copyDirectoryContents(subdir, new_coll_subdir);
+          // Copy with force overwrite, since it's a new collection that's currently
+          // being created and won't have anything in it but at most modelcol stuff
+          Gatherer.f_man.getQueue().copyDirectoryContents(subdir, new_coll_subdir, true);
         }
         catch (Exception e) {

main/trunk/gli/src/org/greenstone/gatherer/file/FileQueue.java

@@ -727 +727 @@
      * @see org.greenstone.gatherer.Gatherer
      */
-    public void copyDirectoryContents(File source, File destination) 
+    public void copyDirectoryContents(File source, File destination, boolean overwrite) 
     throws FileAlreadyExistsException, FileNotFoundException, InsufficientSpaceException, IOException, ReadNotPermittedException, UnknownFileErrorException, WriteNotPermittedException
     {
@@ -741 +741 @@
         File new_file = new File(destination, f_name);
         if (f.isDirectory()) {
-        copyDirectoryContents(f, new_file);
+        copyDirectoryContents(f, new_file, overwrite);
         } else if (f.isFile()) {
-        copyFile(f, new_file, false);
-        }
-    }
+        copyFile(f, new_file, overwrite);
+        }
+    }
+    }
+
+    /** Preserving old default behaviour of copyDirContents method, where overwrite is false. */
+    public void copyDirectoryContents(File source, File destination) throws FileAlreadyExistsException, FileNotFoundException, InsufficientSpaceException, IOException, ReadNotPermittedException, UnknownFileErrorException, WriteNotPermittedException 
+    {
+    copyDirectoryContents(source, destination, false);
     }