Changeset 4557 for trunk/gli

Timestamp:

2003-06-11T13:43:03+12:00 (21 years ago)

Author:

jmt12

Message:

2030114: Hadn't actually implemented importing from collections other than dls/demo. The last resort step, running a dummy searchForMetadata() process, still doesn't seem to work properly.

File:

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

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

@@ -53 +53 @@
 import org.greenstone.gatherer.gui.MetaEditPane;
 import org.greenstone.gatherer.gui.NewCollectionMetadataPrompt;
+import org.greenstone.gatherer.msm.ElementWrapper;
 import org.greenstone.gatherer.msm.GDMManager;
+import org.greenstone.gatherer.msm.GreenstoneArchiveParser;
 import org.greenstone.gatherer.msm.MetadataSet;
 import org.greenstone.gatherer.msm.MetadataSetManager;
@@ -195 +197 @@
     }
 
-    /** Used to set the current collection to the given collection. Note that this call should -always- be proceeded by a ready call, and if the colection is ready and the saved flag is unset then the user should be prompted to save. Also note that this method creates yet another GShell to run buildcol.pl. */
+    /** Used to set the current collection to the given collection. Note that this call should -always- be proceeded by a ready call, and if the colection is ready and the saved flag is unset then the user should be prompted to save. Also note that this method creates yet another GShell to run buildcol.pl. 
+     * @param description a description of the collection as a String
+     * @param email the email address of the author/maintainer as a String
+     * @param name the short name of the collection, which will subsequently be used to refer to this particular collection, as a String
+     * @param title the longer title of the collection as a String
+     * @param base_collection_directory if the user has chosen to base their new collection on an existing one, this is the directory where this base collection can be found, as a File, otherwise its null
+     * @param metadata_sets if the user has decided to select several metadata sets with which to initially populate the GLI then this is an ArrayList of metadata set file names, otherwise its null
+     */
     public void createCollection(String description, String email, String name, String title, File base_collection_directory, ArrayList metadata_sets) {
+    boolean cancelled = false;
     special_case = NO_SPECIAL_CASE;
     try {
-                // Create a progress monitor.
+        // Create a progress monitor.
         ProgressMonitor progress = new ProgressMonitor(Gatherer.g_man, get("Creating_New"), "mkcol.pl", 0, 7);
-                // Create the new collection.
+        // Create the new collection.
         makeCollection(description, email, name, title);
         progress.setProgress(1);
 
-                // ACTIVE_DIR/gimport/
+        // 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.
+        // 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();
@@ -216 +226 @@
         }
 
-                // ACTIVE_DIR/gcache/
+        // ACTIVE_DIR/gcache/
         File gcache_dir_temp = new File(Utility.getCacheDir(a_dir)+"temp.dat");
         File gcache_dir = gcache_dir_temp.getParentFile();
@@ -224 +234 @@
         }
 
-                // ACTIVE_DIR/log/
+        // ACTIVE_DIR/log/
         File log_dir_temp = new File(Utility.getLogDir(a_dir)+"temp.dat");
         File log_dir = log_dir_temp.getParentFile();
@@ -234 +244 @@
         progress.setProgress(2);
 
-                // Now create the collection object around the directory.
+        // Now create the collection object around the directory.
         collection = new Collection(new File(a_dir, name + ".col"));
         collection.msm = new MetadataSetManager();
         msm = collection.msm; // Legacy
         collection.msm.load();
-                // Import default metadata sets if any.
+        // Import default metadata sets if any.
         for(int i = 0; metadata_sets != null && i < metadata_sets.size(); i++) {
         MetadataSet metadata_set = (MetadataSet) metadata_sets.get(i);
@@ -247 +257 @@
         // 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.
+        Gatherer.println("Basing new collection on existing one: " + base_collection_directory);
         // Try to import any existing metadata sets for this collection. Look in base_collection_directory/metadata and import any metadata sets found.
-        File base_metadata = new File(base_collection_directory, Utility.METADATA_DIR);
+        File base_metadata = new File(base_collection_directory, Utility.META_DIR);
         if(base_metadata.exists()) {
+            Gatherer.println("Found the metadata directory.");
             File[] possible_metadata_sets = base_metadata.listFiles();
             for(int i = 0; possible_metadata_sets != null && i < possible_metadata_sets.length; i++) {
             String filename = possible_metadata_sets[i].getName();
             if(filename.endsWith(".mds")) {
-                ///ystem.err.println("Found a metadata set. Importing: " + possible_metadata_sets[i].getAbsolutePath());
+                Gatherer.println("+ Found a metadata set. Importing: " + possible_metadata_sets[i].getAbsolutePath());
                 collection.msm.importMDS(possible_metadata_sets[i], false);
             }
             }
         }
+        else {
+            Gatherer.println("This base collection has no metadata directory.");
+        }
         // If no sets were imported, then create a new metadata with this new collections name. Note that if this is one of the 'big five' collections then I already know the importing mappings as well.
         boolean skip_import_phase = false;
         if(collection.msm.getSets().size() == 0) {
+            Gatherer.println("As there are no metadata sets loaded yet, we'll make special checks for the collections available on the GS2.39CD.");
             CollectionConfiguration col_con = new CollectionConfiguration(new File(base_collection_directory, Utility.CONFIG_DIR));
             // If the source collection is one of the 'big five' then we know what the metadata set is.
@@ -268 +283 @@
             // Demo collection - part of the DLS
             if(collection_name.equals(Utility.COLLECTION_DEMO) || collection_name.equals(Utility.COLLECTION_DLS)) {
+            Gatherer.println("+ This is a DLS.mds collection.");
             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);
@@ -294 +308 @@
             // Prompt the user so that they can choose at least one initial metadata set. We're sneaky here and just create a ncm_prompt
             else {
+            Gatherer.println("This collection has no metadata sets, nor is it one of our special collections, thus we cannot import any metadata sets automatically. Present the user with the metadata set selection prompt.");
             NewCollectionMetadataPrompt ncm_prompt = new NewCollectionMetadataPrompt();
             // If cancelled then they really do mean to start a collection with no metadata sets.
@@ -310 +325 @@
         }
         // Do a dry metadata import run over the entire base collection, recording profile mappings. We do this by finding the archive files, and then iterating over them using the GreenstoneArchiveParser to retrieve metadata from them. We then process the importing of new metadata elements using the selectElement prompt used in a file action metadata import. However the big change is that we don't actually import any metadata, just create importing profiles.
-        File base_archives = new File(base_collection_directory, Utility.ARCHIVE_DIR);
-        if(!skip_import_phase && base_archives.exists()) {
-            ///ystem.err.println("Found archives directory.");
-        }
-        // Failing that we do a dummy run over the files in the collection.
-        else if(!skip_import_phase) {
-            ///ystem.err.println("No archives directory. Searching files for metadata.xml information.");
-            // 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(!skip_import_phase) {
+            File base_archive = new File(base_collection_directory, Utility.ARCHIVE_DIR);
+            if(base_archive.exists()) {
+            Gatherer.println("+ Archive directory found. Inspecting archives for metadata information.");
+            ArrayList metadata_elements = GreenstoneArchiveParser.extractMetadataElements(base_archive);
+            for(int i = 0; !cancelled && i < metadata_elements.size(); i++) {
+                String metadata_name = (String) metadata_elements.get(i);
+                ElementWrapper target = collection.msm.prompt.selectElement(metadata_name);
+                cancelled = Gatherer.c_man.getCollection().msm.prompt.wasDialogCancelled();
+                if(!cancelled) {
+                if(target != null) {
+                    collection.msm.profiler.addAction(base_collection_directory.getAbsolutePath(), metadata_name, target.getName());
+                }
+                else {
+                    collection.msm.profiler.addAction(base_collection_directory.getAbsolutePath(), metadata_name, null);
+                }
+                }
+            }
+            // Hopefully mappings should now be in place for metadata extracted from this collection.
             }
-            if(base_import.exists()) {
-            searchForMetadata(base_import);
+            else {
+            Gatherer.println("+ Searching files for metadata.xml information.");
+            // 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);
+            }
             }
-            // And if that fails then we must have been asked by Satan himself to build the very digital collections of hell, because they don't match any goodly greenstone collection I have ever seen, so you can't blame me if I can't import them.
-        }
+        }
+        // And if that fails then we must have been asked by Satan himself to build the very digital collections of hell, because they don't match any goodly greenstone collection I have ever seen, so you can't blame me if I can't import them.
+
+
         // Now we update our collect.cfg
+        Gatherer.println("Copy and update collect.cfg from base collection.");
         updateCollectionCFG(new File(base_collection_directory, Utility.CONFIG_DIR), new File(a_dir, Utility.CONFIG_DIR), description, email, title);
         }
@@ -716 +750 @@
       */
     public boolean loadCollection(String location) {
-    ///ystem.err.println("Load Collection '" + location + "'");
+    Gatherer.println("Load Collection '" + location + "'");
     String[] args2 = new String[1];
     args2[0] = location;
@@ -1121 +1155 @@
     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?");
+        Gatherer.println("Mappings is null, which is odd. Leaving all configuration commands which use metadata as they are.");
     }
 
@@ -1194 +1227 @@
                 text.append(token);
                 String temp_metadata = tokenizer.nextToken();
-                String replacement = (String) mappings.get(temp_metadata);
+                String replacement = null;
+                if(mappings != null) {
+                    replacement = (String) mappings.get(temp_metadata);
+                }
                 if(replacement != null) {
                     token = replacement;
@@ -1212 +1248 @@
                 text.append(token);
                 String temp_metadata = tokenizer.nextToken();
-                String replacement = (String) mappings.get(temp_metadata);
+                String replacement = null;
+                if(mappings != null) {
+                    replacement = (String) mappings.get(temp_metadata);
+                }
                 if(replacement != null) {
                     token = replacement;