Changeset 7526

Timestamp:

2004-06-02T10:09:57+12:00 (20 years ago)

Author:

kjdon

Message:

fixed up some indenting. also, when you base a collection on an existing one, we now copy over the macros and images directories.

File:

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

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

@@ -54 +54 @@
 import org.greenstone.gatherer.collection.SaveCollectionTask;
 import org.greenstone.gatherer.file.FileNode;
+import org.greenstone.gatherer.file.FileQueue;
 import org.greenstone.gatherer.file.FileSystemModel;
 import org.greenstone.gatherer.gui.LockFileDialog;
@@ -280 +281 @@
     }
 
+    /** When basing a new collection on an existing one, we need to copy 
+     *  over some extra directories: images and macros  
+     */
+    private boolean copyExtraBaseCollStuff(File new_coll_dir, File base_coll_dir) {
+    if (!new_coll_dir.isDirectory() || !base_coll_dir.isDirectory()) {
+        return false;
+    }
+    Gatherer.println("Copying images and macros dirs from the base collection");
+    FileQueue fq = Gatherer.f_man.getQueue();
+    try {
+        // do the images dir
+        File base_coll_images = new File(base_coll_dir, Utility.IMAGES_DIR);
+        if (base_coll_images.isDirectory()) {
+        // copy all the images over
+        File new_coll_images = new File(new_coll_dir, Utility.IMAGES_DIR);
+        new_coll_images.mkdirs();
+        
+        // copy the contents over
+        fq.copyDirectoryContents(base_coll_images, new_coll_images, null);
+        } 
+    } catch (Exception e) {
+        Gatherer.println("Couldn't copy over the images dir from the base collection: "+e.toString());
+    }
+    try {
+        // do the macros dir
+        File base_coll_macros = new File(base_coll_dir, Utility.MACROS_DIR);
+        if (base_coll_macros.isDirectory()) {
+        // copy all the macros over
+        File new_coll_macros = new File(new_coll_dir, Utility.MACROS_DIR);
+        new_coll_macros.mkdirs();
+        
+        // copy the contents over
+        fq.copyDirectoryContents(base_coll_macros, new_coll_macros, null);
+        } 
+    } catch (Exception e) {
+        Gatherer.println("Couldn't copy over the macros dir from the base collection: "+e.toString());
+    }
+    return true;
+    }
+
     /** Used to set the current collection to the given collection. Note that this call should -always- be proceeded by a ready call, and if the colection is ready and the saved flag is unset then the user should be prompted to save. Also note that this method creates yet another GShell to run buildcol.pl.
      * @param description a description of the collection as a String
@@ -338 +379 @@
            Gatherer.println("Basing new collection on existing one: " + base_collection_directory);
            collection.setBaseCollection(base_collection_directory.getAbsolutePath());
+           // copy over other needed directories
+           copyExtraBaseCollStuff(new File(a_dir), base_collection_directory);
         // Try to import any existing metadata sets for this collection. Look in base_collection_directory/metadata and import any metadata sets found.
         File base_metadata = new File(base_collection_directory, Utility.META_DIR);
@@ -416 +459 @@
 
         collection.cdm = new CollectionDesignManager(new File(getCollectionConfig()));
-
+        
         // Now that we have a CDM, update several settings, such as if we created this collection by basing it on another, set it as public automatically
-        if(base_collection_directory != null) {
-            // Update the creator and maintainer
-            CollectionMeta creator_collectionmeta = new CollectionMeta(collection.cdm.collect_config.getCreator());
-            creator_collectionmeta.setValue(email);
-            creator_collectionmeta = null;
-            CollectionMeta maintainer_collectionmeta = new CollectionMeta(collection.cdm.collect_config.getMaintainer());
-            maintainer_collectionmeta.setValue(email);
-            maintainer_collectionmeta = null;
-            // Update the collection title
-            CollectionMeta collection_name_collectionmeta = collection.cdm.collectionmeta_manager.getMetadatum(StaticStrings.COLLECTIONMETADATA_COLLECTIONNAME_STR);
-            collection_name_collectionmeta.setValue(title);
-            collection_name_collectionmeta = null;
-            // And now the description
-            CollectionMeta collection_extra_collectionmeta = collection.cdm.collectionmeta_manager.getMetadatum(StaticStrings.COLLECTIONMETADATA_COLLECTIONEXTRA_STR);
-            collection_extra_collectionmeta.setValue(description);
-            collection_extra_collectionmeta = null;
-            // All collections based on others are automatically public
-            CollectionMeta public_collectionmeta = new CollectionMeta(collection.cdm.collect_config.getPublic());
-            public_collectionmeta.setValue(StaticStrings.TRUE_STR);
-            public_collectionmeta = null;
-            // Finally reset the icons
-            CollectionMeta icon_collection_collectionmeta = collection.cdm.collectionmeta_manager.getMetadatum(StaticStrings.COLLECTIONMETADATA_ICONCOLLECTION_STR);
-            icon_collection_collectionmeta.setValue(StaticStrings.EMPTY_STR);
-            icon_collection_collectionmeta = null;
-            CollectionMeta icon_collection_small_collectionmeta = collection.cdm.collectionmeta_manager.getMetadatum(StaticStrings.COLLECTIONMETADATA_ICONCOLLECTIONSMALL_STR);
-            icon_collection_small_collectionmeta.setValue(StaticStrings.EMPTY_STR);
-            icon_collection_small_collectionmeta = null;
-        }
-
+        if(base_collection_directory != null) {
+        // Update the creator and maintainer
+        CollectionMeta creator_collectionmeta = new CollectionMeta(collection.cdm.collect_config.getCreator());
+        creator_collectionmeta.setValue(email);
+        creator_collectionmeta = null;
+        CollectionMeta maintainer_collectionmeta = new CollectionMeta(collection.cdm.collect_config.getMaintainer());
+        maintainer_collectionmeta.setValue(email);
+        maintainer_collectionmeta = null;
+        // Update the collection title
+        CollectionMeta collection_name_collectionmeta = collection.cdm.collectionmeta_manager.getMetadatum(StaticStrings.COLLECTIONMETADATA_COLLECTIONNAME_STR);
+        collection_name_collectionmeta.setValue(title);
+        collection_name_collectionmeta = null;
+        // And now the description
+        CollectionMeta collection_extra_collectionmeta = collection.cdm.collectionmeta_manager.getMetadatum(StaticStrings.COLLECTIONMETADATA_COLLECTIONEXTRA_STR);
+        collection_extra_collectionmeta.setValue(description);
+        collection_extra_collectionmeta = null;
+        // All collections based on others are automatically public
+        CollectionMeta public_collectionmeta = new CollectionMeta(collection.cdm.collect_config.getPublic());
+        public_collectionmeta.setValue(StaticStrings.TRUE_STR);
+        public_collectionmeta = null;
+        // Finally reset the icons
+        CollectionMeta icon_collection_collectionmeta = collection.cdm.collectionmeta_manager.getMetadatum(StaticStrings.COLLECTIONMETADATA_ICONCOLLECTION_STR);
+        icon_collection_collectionmeta.setValue(StaticStrings.EMPTY_STR);
+        icon_collection_collectionmeta = null;
+        CollectionMeta icon_collection_small_collectionmeta = collection.cdm.collectionmeta_manager.getMetadatum(StaticStrings.COLLECTIONMETADATA_ICONCOLLECTIONSMALL_STR);
+        icon_collection_small_collectionmeta.setValue(StaticStrings.EMPTY_STR);
+        icon_collection_small_collectionmeta = null;
+        }
+        
         collection.gdm = new MetadataXMLFileManager();