Changeset 4800

Timestamp:

2003-06-25T13:55:34+12:00 (21 years ago)

Author:

jmt12

Message:

bug#2030155: Added greenstone collection mapping for world node, and also hid modelcol in greenstone collections

File:

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

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

@@ -233 +233 @@
 
     public void map() {
-    // Only map if there are no children.
-    if(children == null && file != null && getAllowsChildren()) {
-        ///ystem.err.println("Map: " + this);
+    if(children == null) {
         children = new ArrayList();
-        File[] files = file.listFiles();
-        if(files != null && files.length > 0) {
-        ArrayTools tools = new ArrayTools();
-        // Apply the filters set in the model.
-        FileFilter[] filters = model.getFilters();
-        for(int i = 0; filters != null && i < filters.length; i++) {
-            files = tools.filter(files, filters[i].filter, filters[i].exclude);
+        // 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 by the collect directory of greenstone.
+        if(file == null && title.equals(Gatherer.dictionary.get("Tree.World"))) {
+        ///atherer.println("Map the 'Greenstone Collections' node.");
+        // For each of the children directories, which are collections...
+        File start = new File(Utility.getCollectionDir(Gatherer.config.gsdl_path));
+        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++) {
+            if(!cols[i].getName().equals("modelcol") && (!Gatherer.c_man.ready() || !Gatherer.c_man.getCollectionDirectory().equals(cols[i].getAbsolutePath()))) {
+            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);
+                collection_root.setParent(this);
+                children.add(collection_root);
+                collection_root = null;
+            }
+            import_dir = null;
+            dirs = null;
+            }
         }
-        // If this node just happens to be the greenstone collection directory
-        if(Gatherer.c_man != null && Gatherer.c_man.ready() && file.equals(new File(Utility.getCollectionDir(Gatherer.config.gsdl_path)))) {
-            // Preclude the directory of any open collection
-            String collection_name = Gatherer.c_man.getCollection().getName();
-            for(int j = 0; j < files.length; j++) {
-            ///ystem.err.println("Does " + files[j].getName() + " equal " + collection_name + "?");
-            if(files[j].getName().equals(collection_name) || files[j].getName().equals("modelcol")) {
-                // Remove the offending directory
-                files = ArrayTools.remove(files, j);
-            }
-            }
-        }
-        // Finally remove any files whose canonical path do not match their absolute one (ie symbolic links). We only do this test under linux, because under windows there is no such thing as a symbolic link, and instead we suffer difficulties with the 16bit truncated file paths not being the same as the canonical ones (i.e Program Files => Progra~1).
-        if(!Utility.isWindows()) {
-            for(int k = files.length; k != 0; k--) {
-            try {
-                if(!files[k-1].getAbsolutePath().equals(files[k-1].getCanonicalPath())) {
-                ///ystem.err.println("For file: " + files[k-1].getName());
-                ///ystem.err.println("Absolute Path:  " + files[k-1].getAbsolutePath());
-                ///ystem.err.println("Canonical Path: " + files[k-1].getCanonicalPath());
-                files = ArrayTools.remove(files, (k-1));
+        cols = null;
+        model.nodeStructureChanged(this);
+        }
+        // General case: Only map if there are no children.
+        else if(file != null && getAllowsChildren()) {
+        File[] files = file.listFiles();
+        if(files != null && files.length > 0) {
+            ArrayTools tools = new ArrayTools();
+            // Apply the filters set in the model.
+            FileFilter[] filters = model.getFilters();
+            for(int i = 0; filters != null && i < filters.length; i++) {
+            files = tools.filter(files, filters[i].filter, filters[i].exclude);
+            }
+            // If this node just happens to be the greenstone collection directory
+            if(Gatherer.c_man != null && Gatherer.c_man.ready() && file.equals(new File(Utility.getCollectionDir(Gatherer.config.gsdl_path)))) {
+            // Preclude the directory of any open collection
+            String collection_name = Gatherer.c_man.getCollection().getName();
+            for(int j = 0; j < files.length; j++) {
+                ///ystem.err.println("Does " + files[j].getName() + " equal " + collection_name + "?");
+                if(files[j].getName().equals(collection_name)) {
+                // Remove the offending directory
+                files = ArrayTools.remove(files, j);
                 }
             }
-            catch (IOException exception) {
-                Gatherer.printStackTrace(exception);
+            }
+            // Finally remove any files whose canonical path do not match their absolute one (ie symbolic links). We only do this test under linux, because under windows there is no such thing as a symbolic link, and instead we suffer difficulties with the 16bit truncated file paths not being the same as the canonical ones (i.e Program Files => Progra~1).
+            if(!Utility.isWindows()) {
+            for(int k = files.length; k != 0; k--) {
+                try {
+                if(!files[k-1].getAbsolutePath().equals(files[k-1].getCanonicalPath())) {
+                    ///ystem.err.println("For file: " + files[k-1].getName());
+                    ///ystem.err.println("Absolute Path:  " + files[k-1].getAbsolutePath());
+                    ///ystem.err.println("Canonical Path: " + files[k-1].getCanonicalPath());
+                    files = ArrayTools.remove(files, (k-1));
+                }
+                }
+                catch (IOException exception) {
+                Gatherer.printStackTrace(exception);
+                }
             }
             }
+            // Sort the remaining files.
+            tools.sort(files, true);
+            // Now add them to children.
+            for(int i = 0; i < files.length; i++) {
+            FileNode child = new FileNode(files[i], model, children_readonly);
+            child.setParent(this);
+            children.add(child);
+            }
         }
-        // Sort the remaining files.
-        tools.sort(files, true);
-        // Now add them to children.
-        for(int i = 0; i < files.length; i++) {
-            FileNode child = new FileNode(files[i], model, children_readonly);
-            child.setParent(this);
-            children.add(child);
-        }
-        }
-        model.nodeStructureChanged(this);
-    }
-    else {
-        ///ystem.err.println("Can't map: " + this + ". No file or doesn't allow children.");
+        model.nodeStructureChanged(this);
+        }
     }
     }
@@ -356 +383 @@
     public void unmap() {
     // You cannot unmap nodes that have no file basis.
-    if(file != null) {
-                ///ystem.err.println("Unmap: " + this);
+    if(file != null || title.equals(Gatherer.dictionary.get("Tree.World"))) {
+        ///atherer.println("Unmap: " + this);
         children = null;
     }