Changeset 6175

Timestamp:

2003-12-08T17:08:03+13:00 (20 years ago)

Author:

jmt12

Message:

When deleting FileNode.size() and get() are used instead of getChildCount() and getChildAt(), which had previously lead to a problem with filtered children

File:

• trunk/gli/src/org/greenstone/gatherer/file/FileQueue.java (modified) (8 diffs)

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

@@ -121 +121 @@
     FileJob job = new FileJob(id, source, child, target, parent, type, undo, undoable);
     job.folder_level = folder_level;
-    ///ystem.err.println("Adding job: " + job);
+        Gatherer.println("Adding job: " + job);
     if(position != -1 && position <= queue.size() + 1) {
         queue.add(position, job);
@@ -413 +413 @@
                     // we just retrieve the metadata attached to the origin node...
                     ArrayList existing_metadata = gdm.getMetadataOnly(source_file);
-                    //Gatherer.println("Existing metadata for " + origin_node + ": " + gdm.toString(existing_metadata));
+                    ///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));
@@ -441 +441 @@
             // If we haven't been cancelled, and we've been asked to delete a directory/file, or perhaps as part of a move, we delete the file. This involves removing any existing metadata and then copying the file to the recycled bin (for a delete only), then deleting the file. When deleting a directory record from the tree (or from the filesystem for that matter) we must ensure that all of the descendant records have already been removed. If we fail to do this the delete will fail, or you will be bombarded with hundreds of 'Parent node of null not allowed' error messages. Also be aware that if the user has cancelled just this action, because of say a name clash, then we shouldn't do any deleting of any sort dammit.
             if(!cancel_action && ready && (job.type == FileJob.DELETE || job.type == FileJob.MOVE)) {
-            ///ystem.err.print("Delete/Move: " + origin_node + " -> ");
+            ///atherer.println("Delete/Move: " + origin_node);
+            ///atherer.println(queue.size() + " jobs remain in queue");
             // If the source is an empty directory or a file. Don't do anything to 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)) {
-                ///ystem.err.println("File or empty directory.");
+                ///atherer.println("File or empty directory.");
                 // Delete any metadata.xml still in the directory.
                 if(child_list != null && child_list.length == 1) {
@@ -451 +452 @@
                 }
 
-                ///ystem.err.println("Origin is file or is directory and is empty.");
+                ///atherer.println("Origin is file or is directory and is empty.");
                 // update status area
                 String args[] = new String[1];
@@ -471 +472 @@
                 FileNode parent_record = (FileNode)origin_node.getParent();
                 // Remove from model
-                SynchronizedTreeModelTools.removeNodeFromParent(source_model, origin_node);
+                if(parent_record != null) {
+                SynchronizedTreeModelTools.removeNodeFromParent(source_model, origin_node);
+                }
                 // If we are deleting
                 File recycled_file = null;
@@ -526 +529 @@
             else if(child_list != null && child_list.length > 0) {
                 ///ystem.err.print("Nonempty directory -> ");
-                ///ystem.err.println("Directory is non-empty. Remove children first.");
+                ///atherer.println("Directory is non-empty. Remove children first.");
                 FileNode recycle_folder_record = null;
                 // Don't worry about all this for true file move actions.
@@ -555 +558 @@
                    origin_node.unmap();
                    origin_node.map();
-                   ///ystem.err.println("Directory has " + origin_node.getChildCount() + " children.");
-                ///ystem.err.println("Directory actually has " + child_list.length + " children.");
-                  for(int i = 0; i < origin_node.getChildCount(); i++) {
-                     FileNode child_record = (FileNode) origin_node.getChildAt(i);
-                     addJob(job.ID(), job.source, child_record, job.target, destination_node, FileJob.DELETE, job.undo, false, false, position);
-                     //if(recycle_folder_record != null) {
-                     // recycle_folder_mappings.put(child_record, recycle_folder_record);
-                     //}
-                  }
-                  
+                   ///atherer.println("Directory has " + origin_node.getChildCount() + " children.");
+                   ///atherer.println("Directory actually has " + child_list.length + " children.");
+                   for(int i = 0; i < origin_node.size(); i++) {
+                   FileNode child_record = (FileNode) origin_node.get(i);
+                   ///atherer.println("Queuing: " + child_record);
+                   addJob(job.ID(), job.source, child_record, job.target, destination_node, FileJob.DELETE, job.undo, false, false, position);
+                   //if(recycle_folder_record != null) {
+                   //   recycle_folder_mappings.put(child_record, recycle_folder_record);
+                   //}
+                   }  
                 }
                 // Requeue a delete job -after- the children have been dealt with. Remember I've reversed the direction of the queue so sooner is later. Te-he. Also have to remember that we have have followed this path to get here for a move job: Copy Directory -> Queue Child Files -> Delete Directory (must occur after child files) -> Queue Directory.
                 // One special case. Do not requeue root nodes. Don't requeue jobs marked as done.
                 if(origin_node.getParent() != null && !job.done) {
-                System.err.println("Requeuing: " + origin_node.getFile().getAbsolutePath());
+                ///atherer.println("Requeuing: " + origin_node.getFile().getAbsolutePath());
                 job.type = FileJob.DELETE; // You only requeue jobs that are deletes, as directories must be inspected before children, but deleted after.
                 addJob(job, position);
                 }
                 else {
-                System.err.println("I've already done this job twice. I refuse to requeue it again!!!");
+                Gatherer.println("I've already done this job twice. I refuse to requeue it again!!!");
                 }
             }
@@ -681 +684 @@
         // Check if the origin file exists.
         if(!source.exists()) {
-        System.err.println("Couldn't find the source file.");
+        Gatherer.println("Couldn't find the source file.");
         throw(new FileNotFoundException());
         }