Changeset 5751

Timestamp:

2003-10-29T12:15:36+13:00 (21 years ago)

Author:

jmt12

Message:

Fixed a problem that me commenting out the undo code created

File:

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

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

@@ -552 +552 @@
                 completed_folder_mappings.put(origin_node, recycle_folder_record);
                 ///ystem.err.println("Added completed directories mapping " + origin_node);
-                // 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();
-                ///ystem.err.println("Directory has " + origin_node.getChildCount() + " children.");
+                   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);
-                    }
-                    }
-                   **/
+                  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);
+                     //}
+                  }
+                  
                 }
                 // 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) {
-                ///ystem.err.println("Requeue");
+                System.err.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 {
-                ///ystem.err.println("I've already done this job twice. I refuse to requeue it again!!!");
+                System.err.println("I've already done this job twice. I refuse to requeue it again!!!");
                 }
             }