Changeset 13399 for trunk/gli

Timestamp:

2006-12-01T14:23:45+13:00 (17 years ago)

Author:

mdewsnip

Message:

Tidied up default metadata sets and added a "addRequiredMetadataSets" function so the extracted metadata set is always loaded when creating or loading a collection.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• collection/CollectionManager.java (modified) (8 diffs)
• gui/GUIManager.java (modified) (2 diffs)

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

@@ -414 +414 @@
 
         // Import default metadata sets, if any
-        for (int i = 0; metadata_sets != null && i < metadata_sets.size(); i++) {
-        importMetadataSet((MetadataSet) metadata_sets.get(i));
-        }
+        // for (int i = 0; metadata_sets != null && i < metadata_sets.size(); i++) {
+        // importMetadataSet((MetadataSet) metadata_sets.get(i));
+        // }
 
         ProfileXMLFileManager.loadProfileXMLFile(new File(collection_directory_path + "metadata"));
@@ -452 +452 @@
         }
 
-        // Always import the extracted metadata set if we didn't already
-        if (MetadataSetManager.getMetadataSet(MetadataSetManager.EXTRACTED_METADATA_NAMESPACE) == null) {
-        File extracted_metadata_set_file = new File(Gatherer.getGLIMetadataDirectoryPath() + MetadataSetManager.EXTRACTED_METADATA_NAMESPACE + StaticStrings.METADATA_SET_EXTENSION);
-        importMetadataSet(new MetadataSet(extracted_metadata_set_file));
-        }
+        // Load the default metadata sets
+        addDefaultMetadataSets();
+
+        // Make sure we always have the extracted metadata set
+        addRequiredMetadataSets();
 
         collection.cdm = new CollectionDesignManager(new File(getCollectionConfigFilePath()));
@@ -793 +793 @@
         }
         }
-        catch (Exception ex) {
-        ex.printStackTrace();
+        catch (Exception exception) {
+        DebugStream.printStackTrace(exception);
         }
 
@@ -860 +860 @@
     }
 
-    boolean non_gli_collection = false;
-
     // Check we have actually been given a .col file.
     if (!location.endsWith(".col")) {
@@ -895 +893 @@
 
     // Special case of a user trying to open an old greenstone collection.
+    boolean non_gli_collection = false;
     File collection_metadata_directory = new File(collection_directory, "metadata");
     if (!collection_metadata_directory.exists()) {
@@ -960 +959 @@
         MetadataSetManager.loadMetadataSets(collection_metadata_directory);
 
+        // Make sure we always have the extracted metadata set
+        addRequiredMetadataSets();
+
         ProfileXMLFileManager.loadProfileXMLFile(collection_metadata_directory);
  
-        // If this is a non-GLI (legacy) collection, load the 
-        // default metadata 
+        // If this is a non-GLI (legacy) collection, load the default metadata sets
         if (non_gli_collection) {
-        addDefaultMetadataSets(collection_directory);
-        
+        addDefaultMetadataSets();
+
         // Recurse the import folder tree, backing up the metadata.xml files before they are edited
         LegacyCollectionImporter.backupMetadataXMLFiles(collection_directory);
@@ -1261 +1262 @@
 
     /** I started giving the user the choice of using an existing meta set or creating a new one. The second option being so that they didn't have to add/merge/ignore each element, they could all be added automatically. However, I am not sure where the merge prompt gets called from, and it is not essential, so I am leaving it for now - it should be added back in and finished. [kjdon] */
-    private boolean addDefaultMetadataSets(File collection_dir) {
-
-
+    private void addDefaultMetadataSets()
+    {
     // Add dublin core which is the default metadata set. The user
     // can change this later
@@ -1270 +1270 @@
         importMetadataSet(new MetadataSet(dc_file));
     }
-
+    }
+
+
+    private void addRequiredMetadataSets()
+    {
     // Always import the extracted metadata set
     File extracted_metadata_set_file = new File(Gatherer.getGLIMetadataDirectoryPath() + MetadataSetManager.EXTRACTED_METADATA_NAMESPACE + StaticStrings.METADATA_SET_EXTENSION);
     importMetadataSet(new MetadataSet(extracted_metadata_set_file));
-
-    return true;
     }
 

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

@@ -745 +745 @@
         // Create the collection details prompt from new collection prompt
         NewCollectionDetailsPrompt ncd_prompt = new NewCollectionDetailsPrompt();
-        // dc metadata set is the default
-        ArrayList metadata_sets  = new ArrayList();
-        File dc_file = new File(Gatherer.getGLIMetadataDirectoryPath()+"dublin.mds");
-        if (dc_file.exists()) {
-        metadata_sets.add(new MetadataSet(dc_file));
-        }
+
         // Create the new collection (if not cancelled) in a new thread.
         if (!ncd_prompt.isCancelled()) {
@@ -759 +754 @@
         
         // Create new collection.
-        Gatherer.c_man.createCollection(ncd_prompt.getDescription(), Configuration.getEmail(), ncd_prompt.getName(), ncd_prompt.getTitle(), ncd_prompt.getBase(), metadata_sets);
+        Gatherer.c_man.createCollection(ncd_prompt.getDescription(), Configuration.getEmail(), ncd_prompt.getName(), ncd_prompt.getTitle(), ncd_prompt.getBase(), new ArrayList());
         ncd_prompt.dispose();
         }