Changeset 7326 for trunk/gli/src/org/greenstone/gatherer/file

Timestamp:

2004-05-13T17:08:42+12:00 (20 years ago)

Author:

kjdon

Message:

the intial stage of making gli work with gs3 - still uses gs2 building, but uses colls in gs3 setup

File:

• trunk/gli/src/org/greenstone/gatherer/file/FileNode.java (modified) (8 diffs)

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

@@ -34 +34 @@
     private MutableTreeNode parent;
     private String title;
+    private boolean gs3_site = false;
 
     public FileNode(File file) {
@@ -267 +268 @@
 
     public void map() {
-    if(children == null) {
-        children = new ArrayList();
-        // Super Special Case: if the name of this node is the Tree.World string, then we actually map the collections installed in greenstone. The file in this case will actually be the collect directory of greenstone.
-        if(file == null && title.equals(Dictionary.get("Tree.World"))) {
+    if(children != null) {
+        return;
+    }
+    children = new ArrayList();
+    // Super Special Case: if the name of this node is the Tree.World string, then we actually map the collections installed in greenstone. The file in this case will actually be the collect directory of greenstone.
+    if(file == null) { // a special mapping folder
+        if (title.equals(Dictionary.get("Tree.World")) && Gatherer.GS3) {
+        // the Greenstone collections folder for GS3 - this contains a 
+        // folder for each site
+        File start = new File(Utility.getSitesDir(Gatherer.config.gsdl3_path));
+        File sites[] = start.listFiles();
+        ArrayTools.sort(sites);
+        for (int i=0; sites != null && i < sites.length; i++) {
+            //File site = sites[i];
+            File collect_dir = new File(sites[i], Utility.COL_DIR);
+            if(!collect_dir.exists()) {
+            continue;
+            }
+            
+            FileNode child = new FileNode(sites[i].getName());
+            child.setGS3Site(true);
+            child.unmap();
+            child.setParent(this);
+            child.setModel(model);
+            child.map();
+            children.add(child);
+        }
+
+        } else if (title.equals(Dictionary.get("Tree.World")) || gs3_site) {
+        // the collect dir for gs2 or a site dir for gs3
         ///atherer.println("Map the 'Greenstone Collections' node.");
         // For each of the children directories, which are collections...
-        File start = new File(Utility.getCollectDir(Gatherer.config.gsdl_path));
+        File start;
+        if (gs3_site) {
+            start = new File(Utility.getCollectDir(Gatherer.config.gsdl3_path, title));
+        } else {
+            start = new File(Utility.getCollectDir(Gatherer.config.gsdl_path));
+        }
         File cols[] = start.listFiles();
         ArrayTools.sort(cols);
@@ -279 +311 @@
         for(int i = 0; cols != null && i < cols.length; i++) {
             if (!cols[i].getName().equals(StaticStrings.MODEL_COLLECTION_NAME)) {
-            File dirs[] = cols[i].listFiles();
-            ArrayTools.sort(dirs);
+            //File dirs[] = cols[i].listFiles();
+            //ArrayTools.sort(dirs);
             File import_dir = new File(cols[i], StaticStrings.IMPORT_FOLDER);
-            if(import_dir.exists()) {
-                // we don't care if there is no config file
-                BasicCollectionConfiguration collect_cfg = new BasicCollectionConfiguration(new File(cols[i], Utility.CONFIG_FILE));
-                FileNode collection_root = new FileNode(import_dir, collect_cfg.toString(), true);
-                collection_root.setParent(this);
-                collection_root.setModel(model);
-                // One last piece of magic so we can determine the current collection
-                Collection collection = Gatherer.c_man.getCollection();
-                if(collection != null) {
-                collection_root.setCurrentCollection(cols[i].getName().equals(collection.getName()));
-                }
-                children.add(collection_root);
-                collection_root = null;
+            if(!import_dir.exists()) {
+                continue;
             }
+            // we don't care if there is no config file
+            BasicCollectionConfiguration collect_cfg = new BasicCollectionConfiguration(new File(cols[i], Utility.CONFIG_FILE));
+            FileNode collection_root = new FileNode(import_dir, collect_cfg.toString(), true);
+            collection_root.setParent(this);
+            collection_root.setModel(model);
+            // One last piece of magic so we can determine the current collection
+            Collection collection = Gatherer.c_man.getCollection();
+            if(collection != null) {
+                collection_root.setCurrentCollection(cols[i].getName().equals(collection.getName()));
+            }
+            children.add(collection_root);
+            collection_root = null;
             import_dir = null;
-            dirs = null;
-            }
-        }
+            //dirs = null;
+            }
+        } // for each coll
         cols = null;
         model.nodeStructureChanged(this);
         }
-        // General case: Only map if there are no children.
-        else if(file != null && getAllowsChildren()) {
+    } // if file == null
+    // General case: Only map if there are no children.
+    else { // file !=null
+        if(getAllowsChildren()) {
         File[] files = file.listFiles();
         if(files != null && files.length > 0) {
@@ -318 +353 @@
             raw_children.add(child);
             }
-
+            
             // Apply the filters set in the model.
             //if(model != null) {
@@ -326 +361 @@
             }
             //}
-
+            
             // Now add them to children.
             for(int i = 0; i < files.length; i++) {
@@ -343 +378 @@
         }
     }
+    
     }
 
@@ -376 +412 @@
     public void setFile(File file) {
     this.file = file;
+    }
+
+    public void setGS3Site(boolean is_site) {
+    this.gs3_site = is_site;
     }
 
@@ -426 +466 @@
     public void unmap() {
     // You cannot unmap nodes that have no file basis.
-    if(file != null || title.equals(Dictionary.get("Tree.World"))) {
+    if(file != null || title.equals(Dictionary.get("Tree.World")) || gs3_site) {
         ///atherer.println("Unmap: " + this);
         children = null;