Changeset 22361 for main

Timestamp:

2010-07-07T11:42:20+12:00 (14 years ago)

Author:

kjdon

Message:

handle collect groups when making the list of collections to export

File:

• main/trunk/gli/src/org/greenstone/gatherer/gui/WriteCDImagePrompt.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/gui/WriteCDImagePrompt.java

@@ -440 +440 @@
     // Start at the collect dir.
     File collect_directory = new File(Gatherer.getCollectDirectoryPath());
-    String file_name = (Gatherer.GS3)? Utility.CONFIG_GS3_FILE : Utility.CONFIG_FILE;
     if (collect_directory.exists()) {
-        // Now for each child directory see if it contains a .col file and
-        // if so try to load it..
-        File collections[] = collect_directory.listFiles();
-        ArrayTools.sort(collections);
-        for(int i = 0; collections != null && i < collections.length; i++) {
-        if(collections[i].isDirectory() && !collections[i].getName().equals(StaticStrings.MODEL_COLLECTION_NAME)) {
-            File config_file = new File(collections[i], file_name);
-            if (config_file.exists()) {
-            BasicCollectionConfiguration config = new BasicCollectionConfiguration(config_file);
-            all_collections.add(config);                
-            config = null;
-            }
-        }
-        }
-    }
-    // Otherwise the collect directory doesn't actually exist, so there ain't much we can do.
-    }
+      scanForCollectionsInternal(collect_directory);
+    }
+    }
+
+  private void scanForCollectionsInternal(File collect_directory) {
+    
+    String file_name = (Gatherer.GS3)? Utility.CONFIG_GS3_FILE : Utility.CONFIG_FILE;
+    // For each child directory see if it contains a .cfg file and
+    // if so try to load it..
+    File collections[] = collect_directory.listFiles();
+    ArrayTools.sort(collections);
+    for(int i = 0; collections != null && i < collections.length; i++) {
+      if(collections[i].isDirectory() && !collections[i].getName().equals(StaticStrings.MODEL_COLLECTION_NAME)) {
+    File config_file = new File(collections[i], file_name);
+    if (config_file.exists()) {
+      BasicCollectionConfiguration config = new BasicCollectionConfiguration(config_file);
+      if (config.getCollectGroup().equals("true")) {
+        scanForCollectionsInternal(collections[i]);
+      } else {
+        all_collections.add(config);                
+        config = null;
+      }
+    }
+      }
+    }
+  }