Changeset 18364 for gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/OpenCollectionDialog.java

Timestamp:

2009-01-12T11:40:15+13:00 (15 years ago)

Author:

kjdon

Message:

updated the rtl-gli branch with files from trunk. Result of a merge 14807:18318, and fixed some conflicts. I think this is the last commit following merging the files. Haven't tried to compile yet... here goes...

File:

• gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/OpenCollectionDialog.java (modified) (2 diffs)

gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/OpenCollectionDialog.java

@@ -269 +269 @@
         return;
         }
+
+        load_collection_configs(data,collect_directory);
+
+    }
+
+
+    protected void load_collection_configs(TreeSet data, File collect_directory) {
+
         File[] collection_folders = collect_directory.listFiles();
+
         for(int i = 0; i < collection_folders.length; i++) {
         File collection_folder = collection_folders[i];
         String collection_foldername = collection_folder.getName();
+
         if(collection_folder.isDirectory() && !collection_foldername.equals(StaticStrings.MODEL_COLLECTION_NAME)) {
-            // this 'file_name' has already been prefixed by 'etc'
-            String file_name = (Gatherer.GS3)? Utility.CONFIG_GS3_FILE : Utility.CONFIG_FILE;
+            // this 'file_name' has already been prefixed by 'etc'
+            String file_name;
+            if (Gatherer.GS3){
+            convertToGS3Collection(collection_folder);
+            file_name = Utility.CONFIG_GS3_FILE;
+            }else{
+            file_name = Utility.CONFIG_FILE;
+            }
+            
             File config_file = new File(collection_folder, file_name);
             File collection_metadata_directory = new File(collection_folder, "metadata");
             if (collection_metadata_directory.exists() && config_file.exists()) {
             BasicCollectionConfiguration collection_configuration = new BasicCollectionConfiguration(config_file);
-            data.add(collection_configuration);
+
+            // look to see if group set?
+            // => if it is, don't add, but recurse to look for child collections in collect-group
+
+            if (collection_configuration.getCollectGroup().equals("true")) {
+                load_collection_configs(data, collection_folder);
+            }
+            else {
+                data.add(collection_configuration);
+            }
             }
             config_file = null;
@@ -290 +316 @@
         collect_directory = null;
     }
+
+
 
     public Object getElementAt(int index) {