Changeset 7341 for trunk

Timestamp:

2004-05-17T13:34:32+12:00 (20 years ago)

Author:

kjdon

Message:

in gs3 can now base a coll on one in another site

File:

• trunk/gli/src/org/greenstone/gatherer/gui/NewCollectionDetailsPrompt.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/gui/NewCollectionDetailsPrompt.java

@@ -103 +103 @@
     Vector base_collection_model = new Vector();
     // need to modify this to base a coll on any collection from any site
-    File gsdl_collection_directory;
     if (Gatherer.GS3) {
-        gsdl_collection_directory = new File(Utility.getCollectDir(Gatherer.config.gsdl3_path, Gatherer.config.site_name));
+        File sites_dir = new File(Utility.getSitesDir(Gatherer.config.gsdl3_path));
+        File [] sites = sites_dir.listFiles();
+        for (int i=0; i<sites.length; i++) {
+        File collect_dir = new File(Utility.getCollectDir(Gatherer.config.gsdl3_path, sites[i].getName()));
+        if (collect_dir.exists()) {
+            addCollectionsToModel(base_collection_model, collect_dir, sites[i].getName());
+        }
+        }
     } else {
-       gsdl_collection_directory = new File(Utility.getCollectDir(Gatherer.config.gsdl_path));
-    }
-    File[] possible_collections = gsdl_collection_directory.listFiles();
-    for (int i = 0; possible_collections != null && i < possible_collections.length; i++) {
-        // If the directory has a etc/collect.cfg file then it looks like a collection
-        File collect_cfg_file = new File(possible_collections[i], Utility.CONFIG_FILE);
-        if (collect_cfg_file.exists()) {
-        // If the directory has a metadata/ then the collection can be used as a base
-        File metadata_directory = new File(possible_collections[i], Utility.META_DIR);
-        if (metadata_directory.exists()) {
-            // Add to model
-            BasicCollectionConfiguration collect_cfg = new BasicCollectionConfiguration(collect_cfg_file);
-            Item item = new Item(possible_collections[i], collect_cfg);
-            if (!base_collection_model.contains(item)) {
-            base_collection_model.add(item);
-            }
-        }
-        }
+       File gsdl_collection_directory = new File(Utility.getCollectDir(Gatherer.config.gsdl_path));
+       addCollectionsToModel(base_collection_model, gsdl_collection_directory, null);
     }
 
@@ -289 +279 @@
     }
 
+    private void addCollectionsToModel(Vector base_collection_model, File collect_directory, String site) {
+    File[] possible_collections = collect_directory.listFiles();
+    for (int i = 0; possible_collections != null && i < possible_collections.length; i++) {
+        // If the directory has a etc/collect.cfg file then it looks like a collection
+        File collect_cfg_file = new File(possible_collections[i], Utility.CONFIG_FILE);
+        if (collect_cfg_file.exists()) {
+        // If the directory has a metadata/ then the collection can be used as a base
+        File metadata_directory = new File(possible_collections[i], Utility.META_DIR);
+        if (metadata_directory.exists()) {
+            // Add to model
+            BasicCollectionConfiguration collect_cfg = new BasicCollectionConfiguration(collect_cfg_file);
+            if (Gatherer.GS3 && site != null) {
+            collect_cfg.setSite(site);
+            }
+            Item item = new Item(possible_collections[i], collect_cfg);
+            if (!base_collection_model.contains(item)) {
+            base_collection_model.add(item);
+            }
+        }
+        }
+    }
+       
+    }
+
     private class CancelListener
     implements ActionListener {