Changeset 8313 for trunk/gli/src/org/greenstone/gatherer/file/FileQueue.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/file/FileQueue.java (modified) (4 diffs)

trunk/gli/src/org/greenstone/gatherer/file/FileQueue.java

@@ -38 +38 @@
 import org.greenstone.gatherer.gui.LongProgressBar;
 import org.greenstone.gatherer.gui.tree.DragTree;
+import org.greenstone.gatherer.metadata.MetadataValue;
+import org.greenstone.gatherer.metadata.MetadataXMLFileManager;
 import org.greenstone.gatherer.util.ArrayTools;
 import org.greenstone.gatherer.util.DragComponent;
@@ -397 +399 @@
                         if(job.type == FileJob.COPY) {
                         // A copy is undone with a delete, so it doesn't really matter where the file originally came from (we're not moving it back there, but into the recycle bin). You may also notice we don't make use of the target parent record. This is because no undo action needs this information, and even if it did it could simply ask for records parent!
-                        // Gatherer.c_man.undo.addUndo(job.ID(), UndoManager.FILE_COPY, null, null, job.target, directory_record, job.undo);
                         }
                         else {
                         // Movements however do need a source and source parent so the file can be moved back to the correct place.
-                        // Gatherer.c_man.undo.addUndo(job.ID(), UndoManager.FILE_MOVE, job.source, (FileNode)origin_node.getParent(), job.target, directory_record, job.undo);
                         }
                     }
@@ -431 +431 @@
                     // Show warning.
                     JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("FileActions.File_Not_Found_Message", source_file.getName()), Dictionary.get("FileActions.File_Not_Found_Title"), JOptionPane.ERROR_MESSAGE);
-                // Force refresh of source folder.
+                    // Force refresh of source folder.
                     source_model.refresh(new TreePath(((FileNode)origin_node.getParent()).getPath()));
                 }
                 
                 // We can't have been cancelled, and we must have created a new FileNode during the above phase, before we can handle metadata.
-                if(!cancel_action && new_node != null) {
-                /* Time to handle any existing metadata. */
-                // If the directory came from inside our collection...
+                if (!cancel_action && new_node != null) {
+                    /* Time to handle any existing metadata. */
+                    // If the directory came from inside our collection...
                     if (job.source.toString().equals("Collection")) {
-                    ///ystem.err.println("Move within collection...");
-                    // we just retrieve the metadata attached to the origin node...
-                    ArrayList existing_metadata = Gatherer.c_man.getCollection().gdm.getMetadataOnly(source_file);
-                    ///atherer.println("Existing metadata for " + origin_node + ": " + gdm.toString(existing_metadata));
-                    // then assign this remainder to the new folder.
-                    ///ystem.err.println("New metadata: " + gdm.toString(existing_metadata));
-                    Gatherer.c_man.getCollection().gdm.addMetadata(new_node, existing_metadata);
-                    existing_metadata = null;
-                    }
-                // If it came from the recycle bin retrieve the metadata from there, once again remembering to account for inherited metadata
-//                      else if (job.source.toString().equals("Undo")) {
-//                      // Retrieve metadata from the recycle bin
-//                      ArrayList existing_metadata = Gatherer.c_man.undo.getMetadata(source_file);
-//                      // then assign this remainder to the new folder.
-//                      Gatherer.c_man.getCollection().gdm.addMetadata(new_node, existing_metadata);
-//                      existing_metadata = null;
-//                      }
-                // Otherwise if it came from the workspace use the MSMs parsers to search for folder level metadata (such as metadata.xml or marc records).
+                    // System.err.println("Move within collection...");
+
+                    // Get the non-folder level metadata assigned to the origin node...
+                    ArrayList assigned_metadata = MetadataXMLFileManager.getMetadataAssignedDirectlyToFile(source_file);
+                    // ...and remove it from the original node and assign it to the new folder
+                    for (int i = 0; i < assigned_metadata.size(); i++) {
+                        MetadataValue metadata_value = (MetadataValue) assigned_metadata.get(i);
+                        MetadataXMLFileManager.removeMetadata(origin_node, metadata_value);
+                        MetadataXMLFileManager.addMetadata(new_node, metadata_value);
+                    }
+                    }
+                    // If it came from the workspace search for metadata assigned to the file
                     else if (job.source.toString().equals("Workspace")) {
-                    cancel_action = !Gatherer.c_man.getCollection().msm.searchForMetadata(new_node, origin_node, job.folder_level);
+                    ArrayList assigned_metadata = MetadataXMLFileManager.getMetadataAssignedDirectlyToExternalFile(origin_node.getFile());
+                    for (int i = 0; i < assigned_metadata.size(); i++) {
+                        MetadataValue metadata_value = (MetadataValue) assigned_metadata.get(i);
+                        MetadataXMLFileManager.addMetadata(new_node, metadata_value);
+                    }   
                     }
                 }
@@ -475 +473 @@
             }
 
-            // If the source is an empty directory or a file. Don't do anything to the root node of a tree.
+            // If the source is a file or an empty directory (but not the root node of a tree)
             File[] child_list = source_file.listFiles();
-            if(source_file.isFile() || (child_list != null && (child_list.length == 0 || (child_list.length == 1 && child_list[0].getName().equals(Utility.METADATA_XML))) && origin_node.getParent() != null)) {
-                ///atherer.println("File or empty directory.");
-                // Delete any metadata.xml still in the directory.
-                if(child_list != null && child_list.length == 1) {
-                child_list[0].delete();
-                }
-
-                ///atherer.println("Origin is file or is directory and is empty.");
-                // update status area
+            if (source_file.isFile() || (child_list != null && child_list.length == 0 && origin_node.getParent() != null)) {
+                // System.err.println("Deleting file: " + source_file.getAbsolutePath());
+
+                // Update status area
                 String args[] = new String[1];
-                // args[0] = "" + (queue.size() + 1) + "";
                 args[0] = Utility.formatPath("FileActions.Deleting", source_file.getAbsolutePath(), file_status.getSize().width);
                 file_status.setText(Dictionary.get("FileActions.Deleting", args));
-                args = null;
-
-                // Remove its metadata
-                ArrayList metadatum = null;
-//                  if(job.source == Gatherer.c_man.undo) {
-//                  Gatherer.c_man.undo.addMetadata(target_file, metadatum);
-//                  }
-//                  else {
-                metadatum = Gatherer.c_man.getCollection().gdm.removeMetadata(origin_node.getFile());
-                // }
-                // determine its parent node
-                FileNode parent_record = (FileNode)origin_node.getParent();
+
+                // If it is a metadata.xml file, we must unload it
+                if (source_file.getName().equals(Utility.METADATA_XML)) {
+                MetadataXMLFileManager.unloadMetadataXMLFile(source_file);
+                }
+
+                // Remove the metadata assigned directly to the file
+                ArrayList assigned_metadata = MetadataXMLFileManager.getMetadataAssignedDirectlyToFile(origin_node.getFile());
+                for (int i = 0; i < assigned_metadata.size(); i++) {
+                MetadataValue metadata_value = (MetadataValue) assigned_metadata.get(i);
+                MetadataXMLFileManager.removeMetadata(origin_node, metadata_value);
+                }
+
                 // Remove from model
-                if(parent_record != null) {
+                FileNode parent_record = (FileNode) origin_node.getParent();
+                if (parent_record != null) {
                 SynchronizedTreeModelTools.removeNodeFromParent(source_model, origin_node);
                 }
-                // If we are deleting
-                File recycled_file = null;
-                FileNode recycled_parent = null;
-                // delete the source file
+
+                // Delete the source file
                 Utility.delete(source_file);
             }