Changeset 4799

Timestamp:

2003-06-25T13:54:46+12:00 (21 years ago)

Author:

jmt12

Message:

bug#2030155: Moved greenstone collection mapping into FileNode

File:

• trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -625 +625 @@
         current_collection_directory = Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName();
     }
-
     // Create the workspace tree.
     FileNode workspace_root = new FileNode("ABS_ROOT");
@@ -631 +630 @@
     // Create and add Greenstone collections node.
     // Starting at the collection directory of gsdl...
-    File start = new File(Utility.getCollectionDir(Gatherer.config.gsdl_path));
     FileNode world_root = new FileNode(get("Tree.World"));
+    world_root.unmap();
     workspace_root.insert(world_root);
-    // For each of the children directories, which are collections...
-    File cols[] = start.listFiles();
-    ArrayTools.sort(cols);
-    // We add their import and gimport directories, but only if its not our current collection.
-    for(int i = 0; cols != null && i < cols.length; i++) {
-        ///ystem.err.print("Collection: " + collection);
-        ///ystem.err.print(" Current collection dir: " + current_collection_directory);
-        ///ystem.err.print(" Col " + i + " : " + cols[i] + "\n");
-        if(collection == null || (!current_collection_directory.equals(cols[i].getAbsolutePath()) && !cols[i].getName().equals("modelcol"))) {
-        File dirs[] = cols[i].listFiles();
-        ArrayTools.sort(dirs);
-        File import_dir = new File(cols[i], "gimport");
-        if(!import_dir.exists()) {
-            import_dir = new File(cols[i], "import");
-        }
-        if(import_dir.exists()) {
-            FileNode collection_root = new FileNode(import_dir, cols[i].getName(), true);
-            world_root.insert(collection_root);
-            collection_root = null;
-        }
-        import_dir = null;
-        }
-    }
     // Create Local File space.
     // Get all the available roots mounted on the system.