Changeset 4601

Timestamp:

2003-06-12T13:33:34+12:00 (21 years ago)

Author:

kjdon

Message:

now the current coll is back in the list, but it is fixed and always selected

File:

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

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

@@ -56 +56 @@
     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);
@@ -70 +66 @@
             Entry entry = new Entry(collection_title);
             entry.setProperty(collection_name);
+            if (collection_name.equals(current_coll_name)) {
+            // the current collection is always selected
+            entry.setFixed(true);
+            entry.setSelected(true);
+            }
             collection_checklist_model.add(entry);
             entry = null;
+
         }
         collection_name = null;
@@ -135 +137 @@
         Entry entry = (Entry) collection_checklist_model.get(i);
         if(entry.isSelected()) {
-        found_entry = true;
+        if (!entry.getProperty().equals(current_coll_name)){
+            found_entry = true;
+        }
         command.append(" ");
         command.append(entry.getProperty());
@@ -141 +145 @@
         entry = null;
     }
-    // It is possible that there were no entries in which case we return null.
+    command.append("\n");
+    command.append("\n");
+    
+    // It is possible that there was only one entry - the current collection -  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();
     }