Changeset 10382

Timestamp:

2005-08-01T15:33:54+12:00 (19 years ago)

Author:

mdewsnip

Message:

Can now base a new collection on an existing one, when using a remote Greenstone server.

File:

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

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

@@ -323 +323 @@
         //check that this creation has worked - simply by checking for the existence of the collect.cfg file
         String collection_directory_path = getCollectionDirectoryPath(name);
-        File collect_cfg_file = new File(collection_directory_path + "collect.cfg");
+        File collect_cfg_file = new File(collection_directory_path + "etc" + File.separator + "collect.cfg");
         if (!collect_cfg_file.exists()) {
         // no point continuing
@@ -357 +357 @@
         }
 
-        ProfileXMLFileManager.loadProfileXMLFile(new File(collection_directory_path, Utility.META_DIR));
+        ProfileXMLFileManager.loadProfileXMLFile(new File(collection_directory_path + "metadata"));
 
         // Before creating the CollectionDesignManager check if we are basing it upon some other collection
         if (base_collection_directory != null) {
         DebugStream.println("Basing new collection on existing one: " + base_collection_directory);
+
+        // If we're using a remote Greenstone server, download the collection shell to get the files needed
+        if (Gatherer.isGsdlRemote) {
+            String base_collection_name = base_collection_directory.getName();
+            RemoteGreenstoneServer.downloadCollection(base_collection_name);
+        }
+
         collection.setBaseCollection(base_collection_directory.getAbsolutePath());
         // copy over other needed directories
         copyExtraBaseCollStuff(new File(collection_directory_path), 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_directory = new File(base_collection_directory, Utility.META_DIR);
+        File base_metadata_directory = new File(base_collection_directory, "metadata");
         ArrayList base_metadata_sets = MetadataSetManager.listMetadataSets(base_metadata_directory);
         if (base_metadata_sets != null) {