Changeset 8313 for trunk/gli/src/org/greenstone/gatherer/collection/SaveCollectionTask.java

Timestamp:

2004-10-13T14:48:20+13:00 (20 years ago)

Author:

mdewsnip

Message:

Finally committing the (many) changes to the GLI to use the new metadata code... I hope this doesn't have too many bugs in it and committing it now doesn't stuff anyone up! (Katherine said I could commit it, so blame her if anything goes wrong).

File:

• trunk/gli/src/org/greenstone/gatherer/collection/SaveCollectionTask.java (modified) (8 diffs)

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

@@ -43 +43 @@
 import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Gatherer;
+import org.greenstone.gatherer.metadata.MetadataSetManager;
 import org.greenstone.gatherer.util.Utility;
 
@@ -66 +67 @@
     static final private int COPY_COLLECTION      = 4;
     static final private int MAKE_COLLECTION      = 5;
-    static final private int METADATA_SAVED       = 6;
-    static final private int METADATA_XML_SAVED   = 7;
     static final private int OPEN_COLLECTION      = 8;
     static final private int RESTORE_COLLECTION   = 9;
@@ -112 +111 @@
     // spd.setMillisToDecideToPopup(100);
     // spd.setMillisToPopup(100);
-    // 0. Force all remaining metadata.xml files to load.
+
     // 1. Perform a regular collection save on what we will later refer to as the origin collection.
     ///ystem.err.println("1. Save origin.");
@@ -119 +118 @@
     args[0] = collection.getName() + ".col";
     try {
-        // Block until all of the metadata files have been read in.
-        collection.gdm.waitUntilComplete();
-        // Write out the metadata xml files. The destroy below is meant to do this, but never does.
-        collection.gdm.save();
-        // spd.setProgress(getValue(METADATA_XML_SAVED));
-
         File file = new File(tmp_loc);
         // Create backup
@@ -131 +124 @@
         backup.deleteOnExit();
         if(!file.renameTo(backup)) {
-            DebugStream.println("Error in CollectionManager.load(): FileRenamedException");
+            DebugStream.println("Error in SaveCollectionTask.run(): FileRenamedException");
         }
         }
@@ -143 +136 @@
         // spd.setProgress(getValue(COLLECTION_CFG_SAVED));
 
-        // Write out the metadata files.
-        Gatherer.c_man.msm.save();
-        // spd.setProgress(getValue(METADATA_SAVED));
+        // Write hfiles for the loaded metadata elements into the collection "etc" directory
+        MetadataSetManager.writeHierarchyFiles(new File(Gatherer.c_man.getCollectionEtc()));
 
         collection.setSaved(true);
@@ -307 +299 @@
         return (int)((double)70 * multiplier);
     case COLLECTION_CFG_SAVED:
-    case METADATA_SAVED:
-    case METADATA_XML_SAVED:
         return (int)((double)10 * multiplier);
         // Save As
@@ -325 +315 @@
     }
 }
-
-
-
-
-