Changeset 6026

Timestamp:

2003-11-28T17:39:07+13:00 (20 years ago)

Author:

jmt12

Message:

Changed build complete dialog to a warning dialog, changed it so a cancelled process no longer displays an error dialog, and rewrote makeCollection method so that the email is optional

File:

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

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

@@ -55 +55 @@
 import org.greenstone.gatherer.gui.ExternalCollectionPrompt;
 import org.greenstone.gatherer.gui.NewMetaSetPrompt;
+import org.greenstone.gatherer.gui.WarningDialog;
 import org.greenstone.gatherer.gui.tree.WorkspaceTree;
 import org.greenstone.gatherer.msm.ElementWrapper;
 import org.greenstone.gatherer.msm.GDMManager;
 import org.greenstone.gatherer.msm.GreenstoneArchiveParser;
+import org.greenstone.gatherer.msm.LegacyCollectionImporter;
 import org.greenstone.gatherer.msm.MetadataSet;
 import org.greenstone.gatherer.msm.MetadataSetManager;
@@ -799 +801 @@
         collection.cdm = new CollectionDesignManager(new File(collection_file.getParent(), Utility.CONFIG_DIR));
         if (non_gatherer_collection) {
-        // do a dummy load of GDMManager - so we don't load in the old 
-        // metadata.xml files, we just create new empty ones.
-        collection.gdm = new GDMManager(true);
-        if (findAndLoadExistingMetadata(collection_directory)==false) {
-            lock_file = null;
-            collection_directory = null;
-            closeCollection();
-            return false;
-        }
-        } else {
-        collection.gdm = new GDMManager();
-        }
+        // We first recurse the Import folder tree, reading in any metadata.xml files, and then altering the non-namespaced element names to be valid GLI names
+        LegacyCollectionImporter lci = new LegacyCollectionImporter(collection_directory, collection.cdm);
+        lci.importMetadata();
+        lci = null;
+        }
+        
+        // Whether the collection is legacy or not, we should now be able to prepared the GDMManager
+        collection.gdm = new GDMManager();
         
         // Tell everyone that it worked.
@@ -885 +883 @@
 
     return true;
-    }
-    
-
-    // now try to load in existing metadata, delete the existing metadata.xml files, then save the new ones.
-    private boolean findAndLoadExistingMetadata(File collection_dir) {
-
-    TreeModel collection_tree = getRecordSet();
-    FileNode root_node = (FileNode)collection_tree.getRoot();
-    if (searchForMetadata(collection_tree, root_node)==false) {
-        return false;
-    }
-    removeOldMetadataFiles(collection_dir);
-    collection.gdm.save(root_node);
-    return true;
-    }
-
-    // this moves all the existing metadata files into a back up directory
-    public void removeOldMetadataFiles(File collection_dir) {
-    File import_dir = new File(collection_dir, Utility.IMPORT_DIR);
-    File import_bak_dir = new File(collection_dir, Utility.IMPORT_BAK_DIR);
-    import_bak_dir.mkdir();
-
-    moveMetadataFiles(import_dir, import_bak_dir);
-
-    }
-
-    private boolean moveMetadataFiles(File source_dir, File dest_dir) {
-
-    // find the metadata file in this dir
-    File meta_file = new File(source_dir, "metadata.xml");
-    if (meta_file.exists()) {
-        File new_meta_file = new File(dest_dir, "metadata.xml");
-        try {
-        dest_dir.mkdirs();
-        if (meta_file.renameTo(new_meta_file)== false) {
-            throw new Exception("");
-        }
-        } catch (Exception e) {
-        Gatherer.println("Exception: couldn't move the file "+meta_file.getPath() + e.getMessage());
-        }
-    }
-    
-    // now go through child directories
-    File [] children = source_dir.listFiles();
-    for (int i=0; i<children.length; i++) {
-        File child = children[i];
-        if (child.isDirectory()) {
-        moveMetadataFiles(child, new File(dest_dir, child.getName()));
-        }
-    }
-    return true;
-    }
-        
+    }   
 
     private boolean searchForMetadata(TreeModel collection_tree, FileNode current_node) {
@@ -969 +915 @@
     String command[];
     if(Utility.isWindows()) {
-        if(description == null || email == null || title == null) {
+        if(description == null || title == null) {
         command = new String[4];
+        command[0] = Gatherer.config.perl_path;
+        command[1] = "-S";
+        command[2] = Gatherer.config.getScriptPath() + "mkcol.pl";
+        command[3] = name;
+        }
+        // Users are no longer required to supply an email
+        else if(email == null) {
+        command = new String[8];
+        command[0] = Gatherer.config.perl_path;
+        command[1] = "-S";
+        command[2] = Gatherer.config.getScriptPath() + "mkcol.pl";
+        command[3] = "-title";
+        command[4] = title;
+        command[5] = "-about";
+        command[6] = description;
+        command[7] = name;
         }
         else {
         command = new String[10];
-        }
-        command[0] = Gatherer.config.perl_path;
-        command[1] = "-S";
-        command[2] = Gatherer.config.getScriptPath() + "mkcol.pl";
-        if(description == null || email == null || title == null) {
-        command[3] = name;
-        }
-        else {
+        command[0] = Gatherer.config.perl_path;
+        command[1] = "-S";
+        command[2] = Gatherer.config.getScriptPath() + "mkcol.pl";
         command[3] = "-title";
         command[4] = title;
@@ -992 +949 @@
     }
     else {
-        if(description == null || email == null || title == null) {
+        if(description == null || title == null) {
         command = new String[2];
         command[0] = "mkcol.pl";
         command[1] = name;
+        }
+        else if(email == null) {
+        command = new String[6];
+        command[0] = "mkcol.pl";
+        command[1] = "-title";
+        command[2] = title;
+        command[3] = "-about";
+        command[4] = description;
+        command[5] = name;
         }
         else {
@@ -1051 +1017 @@
     ///ystem.err.println("Recieved process complete event - " + event);
     // If we were running an import, now run a build.
-    if(event.getType() == GShell.IMPORT && event.getStatus() != GShell.ERROR) {
+    if(event.getType() == GShell.IMPORT && event.getStatus() == GShell.OK) {
         // Finish import.
         collection.setImported(true);
@@ -1057 +1023 @@
     }
     // If we were running a build, now is when we move files across.
-    else if(event.getType() == GShell.BUILD && event.getStatus() != GShell.ERROR) {
-        ///ystem.err.println("Installing collection.");
+    else if(event.getType() == GShell.BUILD && event.getStatus() == GShell.OK) {
         if(installCollection()) {
         // If we have a local library running (that we know about) then we ask it to add our newly create collection
-        ///ystem.err.println("Check if we should reset local server.");
         if(Gatherer.config.exec_file != null) {
-            ///ystem.err.println("Local Library Found!");
-            //Gatherer.g_man.preview_pane.configServer(GSDLSiteConfig.ADD_COMMAND + collection.getName());
             Gatherer.self.configServer(GSDLSiteConfig.ADD_COMMAND + collection.getName());
         }
-        //else {
-        ///ystem.err.println("GLI can't recognize a local library.");
-        //}
-        // Signal collection changed.
-        // workspace_model = null;
+        WarningDialog collection_built_warning_dialog = new WarningDialog("warning.CollectionBuilt", false);
+        collection_built_warning_dialog.display();
+        collection_built_warning_dialog.dispose();
+        collection_built_warning_dialog = null;
         Gatherer.g_man.collectionChanged(ready());
-        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CollectionManager.Preview_Ready"), Dictionary.get("CollectionManager.Preview_Ready_Title"), JOptionPane.INFORMATION_MESSAGE);
         }
         else {