Changeset 5164 for trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

Timestamp:

2003-08-18T14:10:31+12:00 (21 years ago)

Author:

jmt12

Message:

I can't remember what has changed, but I bet it was for the better

File:

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

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

@@ -70 +70 @@
 import org.greenstone.gatherer.util.GSDLSiteConfig;
 import org.greenstone.gatherer.util.MetadataXML;
+import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.SynchronizedTreeModelTools;
 import org.greenstone.gatherer.util.Utility;
@@ -197 +198 @@
     Gatherer.g_man.collectionChanged(false);
     ///ystem.err.println("Closed collection.");
-    // All of the consequences of a close should have been processed by now, so others should now see the collection as non-ready.
-    closing_thread = null;
+    // All of the consequences of a close should have been processed by now, so others should now see the collection as non-ready.
+    closing_thread = null;
     }
 
@@ -226 +227 @@
         progress.setProgress(1);
 
-        // ACTIVE_DIR/gimport/
         String a_dir = Utility.getCollectionDir(Gatherer.config.gsdl_path) + name + File.separator;
-
-        // Has to be done before creating greenstone directory metadata manager.
-        File gimport_dir_temp = new File(Utility.getImportDir(a_dir)+"temp.dat");
-        File gimport_dir = gimport_dir_temp.getParentFile();
-        gimport_dir.mkdirs();
-        if(progress != null) {
-        progress.setNote(get("Gimport_Created"));
-        }
 
         // ACTIVE_DIR/gcache/
@@ -260 +252 @@
         msm = collection.msm; // Legacy
         collection.msm.load();
+        // Always import the extracted metadata set
+        collection.msm.importMDS(new File(Utility.METADATA_DIR + Utility.EXTRACTED_METADATA_NAMESPACE + StaticStrings.METADATA_SET_EXTENSION), false);
         // Import default metadata sets if any.
         for(int i = 0; metadata_sets != null && i < metadata_sets.size(); i++) {
@@ -360 +354 @@
             // Find the import directory
             File base_import = new File(base_collection_directory, Utility.IMPORT_DIR);
-            if(!base_import.exists()) {
-                base_import = new File(base_collection_directory, Utility.OLD_IMPORT_DIR);
-            }
             if(base_import.exists()) {
                 searchForMetadata(base_import);
@@ -536 +527 @@
     return Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator + collection.getName() + ".col";
     }
-    /** Constructs the absolute filename of the collection import directory, which should resemble "$GSDLHOME/collect/&lt;col_name&gt;/gimport/"
+    /** Constructs the absolute filename of the collection import directory, which should resemble "$GSDLHOME/collect/&lt;col_name&gt;/import/"
       * @return A <strong>String</strong> containing the filename.
       * @see org.greenstone.gatherer.Configuration
@@ -577 +568 @@
     }
 
-    public String getCollectionOldImport() {
-    return Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator + Utility.OLD_IMPORT_DIR;
-    }
-
     /** This method either returns the title of the current collection, or a placeholder string of 'No Collection'.
       * @return A <strong>String</strong> which represents what we wish to display for a collection title.
@@ -595 +582 @@
     public TreeModel getRecordSet() {
     if(collection_model == null && collection != null) {
-        // Check if the gimport directory exists, and if so use it.
-        File gimport_directory = new File(getCollectionImport());
-        if(gimport_directory.exists()) {
-        // Generate a new FileSystemModel based on the collection gimport directory.
-        collection_model = new FileSystemModel(new FileNode(gimport_directory, false));
-        }
-        else {
-        ///ystem.err.println("No gimport directory exists.");
-        // Otherwise default to the import directory. If it doesn't exist, there aint much more I can do.
-        // Generate a new FileSystemModel based on the collection import directory.
-        collection_model = new FileSystemModel(new FileNode(new File(getCollectionOldImport()), false));
-        }
+        // Use the import directory to generate a new FileSystemModel
+        collection_model = new FileSystemModel(new FileNode(new File(getCollectionImport()), false));
         // Ensure that the manager is a change listener for the tree.
         if(fm_tree_model_listener == null) {
@@ -661 +638 @@
     // If mirroring is enabled show the public and private caches.
     if(Gatherer.config.get("workflow.mirror", false)) {
-                // Add Public workspace
+        // Add Public workspace
         FileNode public_root = new FileNode(new File(Utility.CACHE_DIR), get("Tree.Public"));
         workspace_root.insert(public_root);
-                // Add Private workspace if a collection has been loaded.
+        // Add Private workspace if a collection has been loaded.
         if(ready()) {
         FileNode private_root = new FileNode(new File(getCollectionCache()), get("Tree.Private"));
@@ -973 +950 @@
     }
     }
+
+    /** Refresh the Greenstone Collections special mapping in the workspace tree to account for collections being added/removed
+     */
+    public void refreshGreenstoneCollections() {
+    FileNode root = (FileNode) workspace_model.getRoot();
+    FileNode greenstone_collections_node = null;
+    int root_child_count = root.getChildCount();
+    String greenstone_collections_str = get("Tree.World");
+    for(int i = 0; greenstone_collections_node == null && i < root_child_count; i++) {
+        TreeNode child = root.getChildAt(i);
+        if(child.toString().equals(greenstone_collections_str)) {
+        greenstone_collections_node = (FileNode) child;
+        }
+        child = null;
+    }
+    greenstone_collections_str = null;
+    root = null;
+    if(greenstone_collections_node != null) {
+        TreePath greenstone_collections_path = new TreePath(greenstone_collections_node.getPath());
+        workspace_model.refresh(greenstone_collections_path);
+        greenstone_collections_path = null;
+        greenstone_collections_node = null;
+    }
+    }
+
     /** Called to refresh the models upon which the trees are based.
      * @see org.greenstone.gatherer.collection.Collection