Changeset 7168

Timestamp:

2004-03-31T13:58:29+12:00 (20 years ago)

Author:

mdewsnip

Message:

Put Katherine's backing up metadata.xml files code back in.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• collection/CollectionManager.java (modified) (2 diffs)
• msm/LegacyCollectionImporter.java (modified) (2 diffs)

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

@@ -844 +844 @@
         // 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.backupMetadataXMLFiles(collection_directory);
         lci.importMetadata();
         lci.updateClassifiers();
@@ -928 +929 @@
     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;
+//      }
+//      collection.gdm.save(root_node);
+//      return true;
+//      }
+
 
     private boolean searchForMetadata(TreeModel collection_tree, FileNode current_node) {

trunk/gli/src/org/greenstone/gatherer/msm/LegacyCollectionImporter.java

@@ -105 +105 @@
 
 
+    // This copies all the existing metadata.xml files into a backup directory
+    public void backupMetadataXMLFiles(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();
+    copyMetadataXMLFiles(import_dir, import_bak_dir);
+    }
+
+
+    private void copyMetadataXMLFiles(File source_dir, File target_dir)
+    {
+    // Find the metadata.xml file in this dir
+    File metadata_file = new File(source_dir, StaticStrings.METADATA_XML);
+    if (metadata_file.exists()) {
+        File backup_metadata_file = new File(target_dir, StaticStrings.METADATA_XML);
+        try {
+        target_dir.mkdirs();
+        Gatherer.f_man.getQueue().copyFile(metadata_file, backup_metadata_file, null);
+        if (!backup_metadata_file.exists()) {
+            throw new Exception("");
+        }
+        }
+        catch (Exception e) {
+        Gatherer.println("Exception: couldn't copy file " + metadata_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()) {
+        copyMetadataXMLFiles(child, new File(target_dir, child.getName()));
+        }
+    }
+    }
+
+
     public void importMetadata()
     {
@@ -137 +176 @@
     }
 
-    // First, copy the original file to make a backup
-    File backup_file = new File(file.getParentFile(), StaticStrings.METADATA_BAK);
-    try {
-        Gatherer.f_man.getQueue().copyFile(file, backup_file, null);
-        if (!backup_file.exists()) {
-        throw new Error();
-        }
-    }
-    catch (Exception ex) {
-        System.err.println("Exception occurred while importing legacy collection.");
-        System.err.println("Error: Could not backup metadata.xml file to " + backup_file);
-        ex.printStackTrace();
-        System.err.println("Aborting legacy collection import.");
-        cancelled = true;
-        return;
-    }
+//      // First, copy the original file to make a backup
+//      File backup_file = new File(file.getParentFile(), StaticStrings.METADATA_BAK);
+//      try {
+//          Gatherer.f_man.getQueue().copyFile(file, backup_file, null);
+//          if (!backup_file.exists()) {
+//          throw new Error();
+//          }
+//      }
+//      catch (Exception ex) {
+//          System.err.println("Exception occurred while importing legacy collection.");
+//          System.err.println("Error: Could not backup metadata.xml file to " + backup_file);
+//          ex.printStackTrace();
+//          System.err.println("Aborting legacy collection import.");
+//          cancelled = true;
+//          return;
+//      }
 
     // Parse the metadata.xml file