Changeset 4513 for trunk

Timestamp:

2003-06-09T11:50:47+12:00 (21 years ago)

Author:

jmt12

Message:

* empty log message *

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• collection/CollectionManager.java (modified) (4 diffs)
• file/FileNode.java (modified) (1 diff)
• gui/WarningDialog.java (modified) (1 diff)
• valuetree/GValueModel.java (modified) (2 diffs)

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

@@ -245 +245 @@
         }
 
-                // Before we create the CollectionDesignManager we have to check if we are basing it upon some other collection.
+        // Before we create the CollectionDesignManager we have to check if we are basing it upon some other collection.
         if(base_collection_directory != null) {
         // If so our first step is to correctly generate an import profile for our collection from this base collection.
@@ -270 +270 @@
             special_case = SPECIAL_DLS;
             String demo_directory = (new File(base_collection_directory.getParentFile(), Utility.COLLECTION_DEMO_DIRECTORY)).getAbsolutePath();
+            System.err.println("Demo directory = " + demo_directory);
             String dls_directory = (new File(base_collection_directory.getParentFile(), Utility.COLLECTION_DLS_DIRECTORY)).getAbsolutePath();
+            System.err.println("DLS directory = " + dls_directory);
             // Add the dls.mds
             collection.msm.importMDS(new File(Utility.METADATA_DIR + Utility.DLS_MDS), false);
@@ -589 +591 @@
     // 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(collection == null || !current_collection_directory.equals(cols[i].getAbsolutePath())) {
+        ///ystem.err.println(current_collection_directory);
+        ///ystem.err.println(cols[i].getName() + " = modelcol");
+        if(collection == null || (!current_collection_directory.equals(cols[i].getAbsolutePath()) && !cols[i].getName().equals("modelcol"))) {
         File dirs[] = cols[i].listFiles();
         ArrayTools.sort(dirs);
@@ -1117 +1121 @@
     String collection_path = (base_cfg.getParentFile().getParentFile()).getAbsolutePath();
 
+    System.err.println("Searching for " + collection_path);
     HashMap mappings = collection.msm.profiler.getActions(collection_path);
+    if(mappings == null) {
+        System.err.println("How is this happening?");
+    }
 
     // Now read in base_cfg line by line, parsing important onces and/or replacing them with information pertinent to our collection. Each line is then written back out to the new collect.cfg file.

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

@@ -245 +245 @@
             files = tools.filter(files, filters[i].filter, filters[i].exclude);
         }
-        // If this node just happens to be the greenstone collection
+        // 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; collection_name != null && j < files.length; j++) {
-            if(files[j].getName().equals(collection_name)) {
+            for(int j = 0; j < files.length; j++) {
+            System.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);
-                collection_name = null; // Only have to do this once.
             }
             }

trunk/gli/src/org/greenstone/gatherer/gui/WarningDialog.java

@@ -98 +98 @@
     ///ystem.err.println("Show " + full_property + ": " + Gatherer.config.get(full_property, false));
     if(Gatherer.config.get(full_property, false)) {
-                // We only show if the warning has not been disabled.
+        // We only show if the warning has not been disabled.
         show();
     }

trunk/gli/src/org/greenstone/gatherer/valuetree/GValueModel.java

@@ -112 +112 @@
         value_node = new GValueNode(new_subject);
         // Insert it. If position is still -1, append it to the end of subjects children.
-        SynchronizedTreeModelTools.insertNodeInto(this, subject, value_node);
+        //SynchronizedTreeModelTools.insertNodeInto(this, subject, value_node);
+        insertNodeInto(value_node, subject, 0);
         // Inform listeners that we've changed.
         Gatherer.c_man.getCollection().msm.fireValueChanged(element, null, this);
@@ -190 +191 @@
 
     public void removeValue(GValueNode child) {
-    SynchronizedTreeModelTools.removeNodeFromParent(this, child);
+    //SynchronizedTreeModelTools.removeNodeFromParent(this, child);
+    removeNodeFromParent(child);
     Gatherer.c_man.getCollection().msm.fireValueChanged(new ElementWrapper(child.getElement()), null, this);
     }