Changeset 11314

Timestamp:

2006-03-08T17:17:07+13:00 (18 years ago)

Author:

kjdon

Message:

added in COPY_FILE_ONLY and REPLACE jobs. the first copies a file in without bringing metadata (the first step in a replace) and the second 'replaces' a file with another (already in the collection) by moving the metadata over and deleting the first

Location:

trunk/gli/src/org/greenstone/gatherer/file

Files:

• FileManager.java (modified) (2 diffs)
• FileQueue.java (modified) (6 diffs)

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

@@ -51 +51 @@
 import org.greenstone.gatherer.util.Utility;
 
-
 /** Manages the moving of files within a separate thread.
  * @author John Thompson, NZDL Project, University of Waikato
@@ -368 +367 @@
     }
     }
+
+    public void replaceCollectionFile(CollectionTree collection_tree, CollectionTreeNode collection_tree_node)
+    {
+    // This must go in a separate thread because we need the progress bar to work (remote Greenstone server)
+    new ReplaceTask(collection_tree, collection_tree_node).start();
+    }
+
+
+    private class ReplaceTask
+    extends Thread
+    {
+    private CollectionTree collection_tree = null;
+    private CollectionTreeNode collection_tree_node = null;
+
+    public ReplaceTask(CollectionTree collection_tree, CollectionTreeNode collection_tree_node)
+    {
+        this.collection_tree = collection_tree;
+        this.collection_tree_node = collection_tree_node;
+    }
+
+    public void run()
+    {
+        JFileChooser file_chooser = new JFileChooser();
+        file_chooser.setDialogTitle(Dictionary.get("ReplacePrompt.Title"));
+        File new_file = null;
+        int return_val = file_chooser.showOpenDialog(null);
+        if(return_val == JFileChooser.APPROVE_OPTION) {
+        new_file = file_chooser.getSelectedFile();
+        }
+        
+        if (new_file == null) {
+        return;
+        }
+        
+        // make up a node for the file to bring in
+        WorkspaceTreeNode source_node = new WorkspaceTreeNode(new_file);
+
+        File target_directory = collection_tree_node.getFile().getParentFile();
+        CollectionTreeNode new_collection_tree_node = new CollectionTreeNode(new File(target_directory, new_file.getName()));
+        // copy the new file in - but don't bring metadata
+        file_queue.addJob(System.currentTimeMillis(), Gatherer.g_man.gather_pane.workspace_tree, new FileNode[] { source_node }, collection_tree, (FileNode)collection_tree_node.getParent(),  FileJob.COPY_FILE_ONLY);
+        // do a replace of old file with new file
+        file_queue.addJob(System.currentTimeMillis(), collection_tree, new FileNode[] { collection_tree_node }, collection_tree, new_collection_tree_node, FileJob.REPLACE);
+
+    }
+    }
+    
 }
+
+
+
+

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

@@ -479 +479 @@
 
     // Copy the non-folder level metadata assigned to the original file to the new file
-    ArrayList assigned_metadata = MetadataXMLFileManager.getMetadataAssignedDirectlyToExternalFile(source_file);
-    MetadataXMLFileManager.addMetadata((CollectionTreeNode) new_target_node, assigned_metadata);
+    if (file_job.type == FileJob.COPY) {
+        // do metadata too
+        ArrayList assigned_metadata = MetadataXMLFileManager.getMetadataAssignedDirectlyToExternalFile(source_file);
+        MetadataXMLFileManager.addMetadata((CollectionTreeNode) new_target_node, assigned_metadata);
+    }
     }
 
@@ -536 +539 @@
     MetadataXMLFileManager.addMetadata((CollectionTreeNode) new_target_node, assigned_metadata);
     }
-
+    
+    /** all this does is move the metadata, and delete the source */
+    private void doFileReplace(FileJob file_job) {
+    FileNode source_node = file_job.getOrigin();
+    FileNode target_node = file_job.getDestination();
+
+    File source_file = source_node.getFile();
+    File target_file = target_node.getFile();
+    // Move the non-folder level metadata assigned to the original file to the new file
+    CollectionTreeNode new_target_node = new CollectionTreeNode(target_file);
+    ArrayList assigned_metadata = MetadataXMLFileManager.getMetadataAssignedDirectlyToFile(source_file);
+    MetadataXMLFileManager.removeMetadata((CollectionTreeNode) source_node, assigned_metadata);
+    MetadataXMLFileManager.addMetadata((CollectionTreeNode) new_target_node, assigned_metadata);
+
+    // now delete the original
+    doFileDelete(file_job);
+    }
 
     private void processFileJob(FileJob file_job)
@@ -562 +581 @@
         file_status.setText(Dictionary.get("FileActions.Deleting", formatPath("FileActions.Deleting", source_file.getAbsolutePath(), file_status.getSize().width)));
         doEmptyDirectoryDelete(file_job);
+        return;
     }
 
@@ -575 +595 @@
         doDirectoryDelete(file_job);
         }
+        return;
     }
 
     // Copy job
-    if (file_job.type == FileJob.COPY) {
+    if (file_job.type == FileJob.COPY || file_job.type == FileJob.COPY_FILE_ONLY) {
         file_status.setText(Dictionary.get("FileActions.Copying", formatPath("FileActions.Copying", source_file.getAbsolutePath(), file_status.getSize().width)));
         if (source_file.isFile()) {
@@ -588 +609 @@
         doDirectoryCopy(file_job);
         }
+        return;
     }
 
@@ -601 +623 @@
         doDirectoryMove(file_job);
         }
-    }
+        return;
+    }
+    // Replace job
+    if (file_job.type == FileJob.REPLACE) {
+        file_status.setText(Dictionary.get("FileActions.Replacing", formatPath("FileActions.Replacing", source_file.getAbsolutePath(), file_status.getSize().width)));
+        doFileReplace(file_job);
+        return;
+    }
+    
+        
+        
+        
     }