Changeset 4573 for trunk/gli

Timestamp:

2003-06-11T15:52:43+12:00 (21 years ago)

Author:

kjdon

Message:

super collections: dont show the current coll in the list cos it is now automatically included

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/SuperCollectionManager.java (modified) (4 diffs)

trunk/gli/src/org/greenstone/gatherer/cdm/SuperCollectionManager.java

@@ -45 +45 @@
     static final public String CCS_COMMAND = "ccs";
 
+    private String current_coll_name = null;
     private Control controls;
     private ArrayList collection_checklist_model;
@@ -52 +53 @@
     collection_checklist_model = new ArrayList();
     File gsdl_collection_directory = new File(Utility.getCollectionDir(Gatherer.config.gsdl_path));
+    current_coll_name = Gatherer.c_man.getCollection().getName();
     File[] possible_collections = gsdl_collection_directory.listFiles();
     for(int i = 0; possible_collections != null && i < possible_collections.length; i++) {
+        if (possible_collections[i].getName().equals(current_coll_name)) {
+        // we dont want to add the current collection to the list
+        continue;
+        }
         // The simpliest case is if the directory etc/collect.cfg file and a metadata/ in it. Thus it can easily be built upon.
         File collect_cfg_file = new File(possible_collections[i], Utility.CONFIG_DIR);
@@ -135 +141 @@
         entry = null;
     }
-    command.append("\n");
-    command.append("\n");
     // It is possible that there were no entries in which case we return null.
     if(found_entry) {
+        // we need to add on the current collection
+        command.append(" ");
+        command.append(current_coll_name);
+        command.append("\n");
+        command.append("\n");
         return command.toString();
     }
@@ -183 +192 @@
 
         CheckList collection_checklist = new CheckList(collection_checklist_model);
-
         // Layout
         //center_pane.setTopComponent(new JScrollPane(instructions));