Changeset 19226 for gli

Timestamp:

2009-04-23T15:05:46+12:00 (15 years ago)

Author:

kjdon

Message:

added code to handle collect groups

File:

• gli/trunk/src/org/greenstone/gatherer/file/WorkspaceTreeNode.java (modified) (3 diffs)

gli/trunk/src/org/greenstone/gatherer/file/WorkspaceTreeNode.java

@@ -46 +46 @@
 {
     private boolean is_gs3_site_node = false;
+    private boolean is_group_node = false;
     private boolean is_in_loaded_collection = false;
     private String title = null;
@@ -127 +128 @@
         model.nodeStructureChanged(this);
         
-        } else if (title.equals(Dictionary.get("Tree.World")) || is_gs3_site_node) {
+        } else if (title.equals(Dictionary.get("Tree.World")) || is_gs3_site_node || is_group_node) {
         // For each of the children directories, which are collections...
         File start;
-        if (is_gs3_site_node) {
+        if (is_gs3_site_node ) {
             start = new File(Gatherer.getSitesDirectoryPath() + title + File.separator + "collect" + File.separator);
-        } else {
+        } 
+        else if (is_group_node) {
+          start = new File(Gatherer.getCollectDirectoryPath() + title);
+        }
+        else {
             start = new File(Gatherer.getCollectDirectoryPath());
         }
@@ -141 +146 @@
         for (int i = 0; cols != null && i < cols.length; i++) {
             if (!cols[i].getName().equals(StaticStrings.MODEL_COLLECTION_NAME)) {
-            File import_dir = new File(cols[i], "import");
-            if (!import_dir.exists()) {
-                continue;
-            }
-
-            // we don't care if there is no config file
+            // check for groups
             String file_name = (Gatherer.GS3)? Utility.CONFIG_GS3_FILE : Utility.CONFIG_FILE;
             BasicCollectionConfiguration collect_cfg = new BasicCollectionConfiguration(new File(cols[i], file_name));
-            WorkspaceTreeNode collection_root = new WorkspaceTreeNode(import_dir, collect_cfg.toString());
-            collection_root.setParent(this);
-            collection_root.setModel(model);
-
-            // One last piece of magic so we can determine the current collection
-            collection_root.is_in_loaded_collection = cols[i].getName().equals(CollectionManager.getLoadedCollectionName());
-            child_nodes.add(collection_root);
+            if (collect_cfg.getCollectGroup().equals("true")) {
+              WorkspaceTreeNode child = new WorkspaceTreeNode(null, cols[i].getName());
+              child.is_group_node = true;
+              child.unmap();
+              child.setModel(model);
+              child.setParent(this);
+              child.map();
+              child_nodes.add(child);
+            } else {
+              File import_dir = new File(cols[i], "import");
+              if (!import_dir.exists()) {
+                continue;
+              }
+              
+              WorkspaceTreeNode collection_root = new WorkspaceTreeNode(import_dir, collect_cfg.toString());
+              collection_root.setParent(this);
+              collection_root.setModel(model);
+              
+              // One last piece of magic so we can determine the current collection
+              collection_root.is_in_loaded_collection = cols[i].getName().equals(CollectionManager.getLoadedCollectionName());
+              child_nodes.add(collection_root);
+            }
             }
         }