Changeset 7491 for trunk/gli/src/org/greenstone/gatherer/file/FileQueue.java

Timestamp:

2004-05-28T16:47:01+12:00 (20 years ago)

Author:

mdewsnip

Message:

Even more improvements to the workspace and collection trees. These are now hugely improved -- with refreshing being much quicker and much more reliable.

File:

• trunk/gli/src/org/greenstone/gatherer/file/FileQueue.java (modified) (1 diff)

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

@@ -528 +528 @@
                 // Don't worry about all this for true file move actions.
                 if(job.type == FileJob.DELETE) {
-                   // queue all of its children, (both filtered and non-filtered), but for deleting only. Don't queue jobs for a current move event, as they would be queued as part of copying. I have no idea way, per sec, however the children within the origin node are always invalid during deletion (there are several copies of some nodes?!?). I'll check that each child is only added once.
-                   ///ystem.err.println("Directory has " + origin_node.getChildCount() + " children.");
+                // queue all of its children, (both filtered and non-filtered), but for deleting only. Don't queue jobs for a current move event, as they would be queued as part of copying. I have no idea way, per sec, however the children within the origin node are always invalid during deletion (there are several copies of some nodes?!?). I'll check that each child is only added once.
+                ///ystem.err.println("Directory has " + origin_node.getChildCount() + " children.");
                 ///ystem.err.println("Directory actually has " + child_list.length + " children.");
-                   origin_node.unmap();
-                   origin_node.map();
-                   ///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);
-                   //}
-                   }  
+                origin_node.refresh();
+                ///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.