Changeset 6319

Timestamp:

2003-12-19T14:47:38+13:00 (20 years ago)

Author:

jmt12

Message:

A new configuration setting - recursion depth, after which gli suspects a cyclic loop. FileQueue makes use of this setting, along with a method of finding folder depth, to make this judgement

Location:

trunk/gli

Files:

• classes/xml/config.xml (modified) (1 diff)
• src/org/greenstone/gatherer/Configuration.java (modified) (1 diff)
• src/org/greenstone/gatherer/file/FileManager.java (modified) (1 diff)
• src/org/greenstone/gatherer/file/FileQueue.java (modified) (1 diff)
• src/org/greenstone/gatherer/gui/Preferences.java (modified) (8 diffs)

trunk/gli/classes/xml/config.xml

@@ -38 +38 @@
     <Argument name="general.locale">en_NZ</Argument>
     <Argument name="general.home_page">http://www.greenstone.org/</Argument>
+    <!-- How many folders deep should we recurse before suspecting a cyclic path? [40] -->
+    <Argument name="general.max_folder_depth">40</Argument>
     <Argument name="general.open_collection"></Argument>
     <Argument name="general.proxy_host"></Argument>

trunk/gli/src/org/greenstone/gatherer/Configuration.java

@@ -656 +656 @@
 
     /** Set the named property, from the specified configuration, using the given integer value. */
-    /* private void setInt(String property, boolean general, int value) {
-    setString(property, general, String.valueOf(value));
-    } */
+    public void setInt(String property, boolean general, int value) {
+        setString(property, general, String.valueOf(value));
+    } 
 
     /** Set the named property, from the specified configuration, using the given Locale value. */

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

@@ -54 +54 @@
  */
 public class FileManager {
+
+    static public int countFolderDepth(File file) {
+    int count = 0;
+    while(file != null) {
+        count++;
+        file = file.getParentFile();
+    }
+    return count;
+    }
+
     /** Not only the queue of files to be moved, but also the object that moves them. */
     private FileQueue queue = null;

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

@@ -231 +231 @@
             if((job.type == FileJob.COPY || job.type == FileJob.MOVE) && !job.done) {
             ///ystem.err.println("Copy/Move: " + origin_node);
-            FileNode new_node = null;
-            // Check if file exists, and action as necessary. Be aware the user can choose to cancel the action all together (where upon ready becomes false).
-            if(target_file.exists()) {
-                // We've previously been told
-                if(yes_to_all) {
-                // Remove the old file and tree entry.
-                target_file.delete();
-                ready = true;
-                }
-                else {
-                ///atherer.println("Opps! This filename already exists. Give the user some options.");
-                Object[] options = { Dictionary.get("General.Yes"), Dictionary.get("FileActions.Yes_To_All"), Dictionary.get("General.No"), Dictionary.get("General.Cancel") };
-                int result = JOptionPane.showOptionDialog(Gatherer.g_man, Dictionary.get("FileActions.File_Exists", target_file.getName()), Dictionary.get("General.Warning"), JOptionPane.DEFAULT_OPTION, JOptionPane.WARNING_MESSAGE, null, options, options[0]);
-                switch(result) {
-                case 1: // Yes To All
-                    yes_to_all = true;
-                case 0: // Yes
+
+            // The number one thing to check is whether we are in a cyclic loop. The easiest way is just to check how deep we are
+            int max_folder_depth = Gatherer.config.getInt("general.max_folder_depth", Configuration.COLLECTION_SPECIFIC);
+            boolean continue_over_depth = false;
+            if(FileManager.countFolderDepth(source_file) > max_folder_depth) {
+                Object[] options = { Dictionary.get("General.Yes"), Dictionary.get("General.No"), Dictionary.get("FileActions.Increase_Depth") };
+                String args[] = { String.valueOf(max_folder_depth), source_file.getAbsolutePath() };
+                int result = JOptionPane.showOptionDialog(Gatherer.g_man, Utility.formatHTMLWidth(Dictionary.get("FileActions.Possible_Cyclic_Path", args), 80), Dictionary.get("General.Warning"), JOptionPane.DEFAULT_OPTION, JOptionPane.WARNING_MESSAGE, null, options, options[1]);
+                args = null;
+                options = null;
+                switch(result) {
+                case 0: // Yes
+                continue_over_depth = true;
+                break;
+                case 2: // Continue and increase depth
+                continue_over_depth = true;
+                Gatherer.config.setInt("general.max_folder_depth", Configuration.COLLECTION_SPECIFIC, (max_folder_depth + 1));
+                break;
+                }
+            }
+            else {
+                continue_over_depth = true;
+            }
+               
+            if(continue_over_depth) {
+                FileNode new_node = null;
+                // Check if file exists, and action as necessary. Be aware the user can choose to cancel the action all together (where upon ready becomes false).
+                if(target_file.exists()) {
+                // We've previously been told
+                if(yes_to_all) {
                     // Remove the old file and tree entry.
-                    if(destination_node != null) {
-                    TreePath destination_path = new TreePath(destination_node.getPath());
-                    FileNode temp_target_node = new FileNode(target_file, target_model, true);
-                    TreePath target_path = destination_path.pathByAddingChild(temp_target_node);
-                    SynchronizedTreeModelTools.removeNodeFromParent(target_model, target_model.getNode(target_path));
-                    target_path = null;
-                    temp_target_node = null;
-                    destination_path = null;
-                    }
                     target_file.delete();
                     ready = true;
-                    break;
-                case 3: // No To All
-                    cancel_action = true;
-                case 2: // No
-                default:
-                    ready = false;
-                    // Increment progress by size of potentially copied file
-                    progress.addValue(origin_node.getFile().length());
-                }
-                }
-            }
-            // We proceed with the copy/move if the ready flag is still set. If it is that means there is no longer any existing file of the same name.
-            if(ready) {
-                // update status area
-                String args[] = new String[1];
-                args[0] = "" + (queue.size() + 1) + "";
-                if(job.type == FileJob.COPY) {
-                args[0] = Utility.formatPath("FileActions.Copying", source_file.getAbsolutePath(), file_status.getSize().width);
-                file_status.setText(Dictionary.get("FileActions.Copying", args));
-                }
-                else {
-                args[0] = Utility.formatPath("FileActions.Moving", source_file.getAbsolutePath(), file_status.getSize().width);
-                file_status.setText(Dictionary.get("FileActions.Moving", args));
-                }
-                args = null;
-
-                // If source is a file
-                if(source_file.isFile()) {
-                // copy the file. If anything goes wrong the copy file should throw the appropriate exception. No matter what exception is thrown (bar an IOException) we display some message, perhaps take some action, then cancel the remainder of the pending file jobs. No point in being told your out of hard drive space for each one of six thousand files eh?
-                try {
-                    copyFile(source_file, target_file, progress);
-                }
-                // If we can't find the source file, then the most likely reason is that the file system has changed since the last time it was mapped. Warn the user that the requested file can't be found, then force a refresh of the source folder involved.
-                catch(FileNotFoundException fnf_exception) {
-                    Gatherer.printStackTrace(fnf_exception);
+                }
+                else {
+                    ///atherer.println("Opps! This filename already exists. Give the user some options.");
+                    Object[] options = { Dictionary.get("General.Yes"), Dictionary.get("FileActions.Yes_To_All"), Dictionary.get("General.No"), Dictionary.get("General.Cancel") };
+                    int result = JOptionPane.showOptionDialog(Gatherer.g_man, Dictionary.get("FileActions.File_Exists", target_file.getName()), Dictionary.get("General.Warning"), JOptionPane.DEFAULT_OPTION, JOptionPane.WARNING_MESSAGE, null, options, options[0]);
+                    switch(result) {
+                    case 1: // Yes To All
+                    yes_to_all = true;
+                    case 0: // Yes
+                    // Remove the old file and tree entry.
+                    if(destination_node != null) {
+                        TreePath destination_path = new TreePath(destination_node.getPath());
+                        FileNode temp_target_node = new FileNode(target_file, target_model, true);
+                        TreePath target_path = destination_path.pathByAddingChild(temp_target_node);
+                        SynchronizedTreeModelTools.removeNodeFromParent(target_model, target_model.getNode(target_path));
+                        target_path = null;
+                        temp_target_node = null;
+                        destination_path = null;
+                    }
+                    target_file.delete();
+                    ready = true;
+                    break;
+                    case 3: // No To All
+                    cancel_action = true;
+                    case 2: // No
+                    default:
+                    ready = false;
+                    // Increment progress by size of potentially copied file
+                    progress.addValue(origin_node.getFile().length());
+                    }
+                }
+                }
+                // We proceed with the copy/move if the ready flag is still set. If it is that means there is no longer any existing file of the same name.
+                if(ready) {
+                // update status area
+                String args[] = new String[1];
+                args[0] = "" + (queue.size() + 1) + "";
+                if(job.type == FileJob.COPY) {
+                    args[0] = Utility.formatPath("FileActions.Copying", source_file.getAbsolutePath(), file_status.getSize().width);
+                    file_status.setText(Dictionary.get("FileActions.Copying", args));
+                }
+                else {
+                    args[0] = Utility.formatPath("FileActions.Moving", source_file.getAbsolutePath(), file_status.getSize().width);
+                    file_status.setText(Dictionary.get("FileActions.Moving", args));
+                }
+                args = null;
+                
+                // If source is a file
+                if(source_file.isFile()) {
+                    // copy the file. If anything goes wrong the copy file should throw the appropriate exception. No matter what exception is thrown (bar an IOException) we display some message, perhaps take some action, then cancel the remainder of the pending file jobs. No point in being told your out of hard drive space for each one of six thousand files eh?
+                    try {
+                    copyFile(source_file, target_file, progress);
+                    }
+                    // If we can't find the source file, then the most likely reason is that the file system has changed since the last time it was mapped. Warn the user that the requested file can't be found, then force a refresh of the source folder involved.
+                    catch(FileNotFoundException fnf_exception) {
+                    Gatherer.printStackTrace(fnf_exception);
+                    cancel_action = true;
+                    // 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.
+                    source_model.refresh(new TreePath(((FileNode)origin_node.getParent()).getPath()));
+                    }
+                    catch(FileAlreadyExistsException fae_exception) {
+                    Gatherer.printStackTrace(fae_exception);
+                    cancel_action = true;
+                    // Show warning.
+                    JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("FileActions.File_Already_Exists_Message", target_file.getName()), Dictionary.get("FileActions.File_Already_Exists_Title"), JOptionPane.ERROR_MESSAGE);
+                    // Nothing else can be done by the Gatherer.
+                    }
+                    catch(InsufficientSpaceException is_exception) {
+                    Gatherer.printStackTrace(is_exception);
+                    cancel_action = true;
+                    // Show warning. The message body of the expection explains how much more space is required for this file copy.
+                    JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("FileActions.Insufficient_Space_Message", is_exception.getMessage()), Dictionary.get("FileActions.Insufficient_Space_Title"), JOptionPane.ERROR_MESSAGE);
+                    // Nothing else can be done by the Gatherer. In fact if we are really out of space I'm not even sure we can quit safely.
+                    }
+                    catch(UnknownFileErrorException ufe_exception) {
+                    Gatherer.printStackTrace(ufe_exception);
+                    cancel_action = true;
+                    // Show warning
+                    JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("FileActions.Unknown_File_Error_Message"), Dictionary.get("FileActions.Unknown_File_Error_Title"), JOptionPane.ERROR_MESSAGE);
+                    // Nothing else we can do.
+                    }
+                    catch(WriteNotPermittedException wnp_exception) {
+                    Gatherer.printStackTrace(wnp_exception);
+                    cancel_action = true;
+                    // Show warning
+                    JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("FileActions.Write_Not_Permitted_Message", target_file.getAbsolutePath()), Dictionary.get("FileActions.Write_Not_Permitted_Title"), JOptionPane.ERROR_MESSAGE);
+                    // Nothing else we can do.
+                    }
+                    catch(IOException exception) {
+                    // Can't really do much about this.
+                    Gatherer.printStackTrace(exception);
+                    }
+                 // If not cancelled
+                    if(!cancel_action) {
+                    // Step one is to create a dummy FileNode. Its important it has the correct structure so getPath works.
+                    FileNode new_record = new FileNode(target_file);
+                    SynchronizedTreeModelTools.insertNodeInto(target_model, destination_node, new_record);
+                    new_node = new_record;
+                    
+                    // create undo job
+                    if(job.undoable) {
+                        job.undoable = false;
+                        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, new_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, new_record, job.undo);
+                        }
+                    }
+                    new_record = null;
+                    }
+                }
+                // Else
+                else if(source_file.isDirectory()) {
+                    // create new record
+                    FileNode directory_record = new FileNode(target_file);
+                    ///ystem.err.println("Directory record = " + directory_record + " (" + target_file.getAbsolutePath() + ")");
+                    SynchronizedTreeModelTools.insertNodeInto(target_model, destination_node, directory_record);
+                    // Why is this not happening eh?
+                    directory_record.setParent(destination_node);
+                    if(!target_file.exists()) {
+                    // make the directory
+                    target_file.mkdirs();
+                    new_node = directory_record;
+                    // create undo job
+                    if(job.undoable) {
+                        job.undoable = false;
+                        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);
+                        }
+                    }
+                    }
+                    // Else inform the users that a directory already exists and files will be copied into it
+                    //else {
+                    //    JOptionPane.showMessageDialog(null, Dictionary.get("FileActions.Directory_Exists", target_file.toString()), Dictionary.get("General.Warning"), JOptionPane.WARNING_MESSAGE);
+                    //}
+                    // Queue non-filtered child files for copying. If this directory already existed, the child records will have to generate the undo jobs, as we don't want to entirely delete this directory if it already existed.
+                    FileNode child_record = null;
+                    // In order to have a sane copy proceedure (rather than always copying last file first as it used to) we always add the child node at the position the parent was removed from. Consider the file job 'a' at the end of the queue which generates three new jobs 'b', 'c' and 'd'. The resulting flow should look like this.
+                    // -- Starting queue                   ...[a]
+                    // remove(position) = 'a'              ...
+                    // add(position, 'b')                  ...[b]
+                    // add(position, 'c')                  ...[c][b]
+                    // add(position, 'd')                  ...[d][c][b]
+                    // Next loop
+                    // remove(position) = 'b'              ...[d][c]
+                    for(int i = 0; i < origin_node.getChildCount(); i++) {
+                    child_record = (FileNode) origin_node.getChildAt(i);
+                    addJob(job.ID(), job.source, child_record, job.target, directory_record, job.type, job.undo, false, false, position);
+                    }
+                    child_record = null;
+                    directory_record = null;
+                }
+                // The file wasn't found!
+                else {
                     cancel_action = true;
                     // 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()));
                 }
-                catch(FileAlreadyExistsException fae_exception) {
-                    Gatherer.printStackTrace(fae_exception);
-                    cancel_action = true;
-                    // Show warning.
-                    JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("FileActions.File_Already_Exists_Message", target_file.getName()), Dictionary.get("FileActions.File_Already_Exists_Title"), JOptionPane.ERROR_MESSAGE);
-                    // Nothing else can be done by the Gatherer.
-                }
-                catch(InsufficientSpaceException is_exception) {
-                    Gatherer.printStackTrace(is_exception);
-                    cancel_action = true;
-                    // Show warning. The message body of the expection explains how much more space is required for this file copy.
-                    JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("FileActions.Insufficient_Space_Message", is_exception.getMessage()), Dictionary.get("FileActions.Insufficient_Space_Title"), JOptionPane.ERROR_MESSAGE);
-                    // Nothing else can be done by the Gatherer. In fact if we are really out of space I'm not even sure we can quit safely.
-                }
-                catch(UnknownFileErrorException ufe_exception) {
-                    Gatherer.printStackTrace(ufe_exception);
-                    cancel_action = true;
-                    // Show warning
-                    JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("FileActions.Unknown_File_Error_Message"), Dictionary.get("FileActions.Unknown_File_Error_Title"), JOptionPane.ERROR_MESSAGE);
-                    // Nothing else we can do.
-                }
-                catch(WriteNotPermittedException wnp_exception) {
-                    Gatherer.printStackTrace(wnp_exception);
-                    cancel_action = true;
-                    // Show warning
-                    JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("FileActions.Write_Not_Permitted_Message", target_file.getAbsolutePath()), Dictionary.get("FileActions.Write_Not_Permitted_Title"), JOptionPane.ERROR_MESSAGE);
-                    // Nothing else we can do.
-                }
-                catch(IOException exception) {
-                    // Can't really do much about this.
-                    Gatherer.printStackTrace(exception);
-                }
-                // If not cancelled
-                if(!cancel_action) {
-                    // Step one is to create a dummy FileNode. Its important it has the correct structure so getPath works.
-                    FileNode new_record = new FileNode(target_file);
-                    SynchronizedTreeModelTools.insertNodeInto(target_model, destination_node, new_record);
-                    new_node = new_record;
-
-                    // create undo job
-                    if(job.undoable) {
-                    job.undoable = false;
-                    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, new_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, new_record, job.undo);
-                    }
-                    }
-                    new_record = null;
-                }
-                }
-                // Else
-                else if(source_file.isDirectory()) {
-                // create new record
-                FileNode directory_record = new FileNode(target_file);
-                ///ystem.err.println("Directory record = " + directory_record + " (" + target_file.getAbsolutePath() + ")");
-                SynchronizedTreeModelTools.insertNodeInto(target_model, destination_node, directory_record);
-                // Why is this not happening eh?
-                directory_record.setParent(destination_node);
-                if(!target_file.exists()) {
-                    // make the directory
-                    target_file.mkdirs();
-                    new_node = directory_record;
-                    // create undo job
-                    if(job.undoable) {
-                    job.undoable = false;
-                    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);
-                    }
-                    }
-                }
-                // Else inform the users that a directory already exists and files will be copied into it
-                //else {
-                //    JOptionPane.showMessageDialog(null, Dictionary.get("FileActions.Directory_Exists", target_file.toString()), Dictionary.get("General.Warning"), JOptionPane.WARNING_MESSAGE);
-                //}
-                // Queue non-filtered child files for copying. If this directory already existed, the child records will have to generate the undo jobs, as we don't want to entirely delete this directory if it already existed.
-                FileNode child_record = null;
-                // In order to have a sane copy proceedure (rather than always copying last file first as it used to) we always add the child node at the position the parent was removed from. Consider the file job 'a' at the end of the queue which generates three new jobs 'b', 'c' and 'd'. The resulting flow should look like this.
-                // -- Starting queue                   ...[a]
-                // remove(position) = 'a'              ...
-                // add(position, 'b')                  ...[b]
-                // add(position, 'c')                  ...[c][b]
-                // add(position, 'd')                  ...[d][c][b]
-                // Next loop
-                // remove(position) = 'b'              ...[d][c]
-                for(int i = 0; i < origin_node.getChildCount(); i++) {
-                    child_record = (FileNode) origin_node.getChildAt(i);
-                    addJob(job.ID(), job.source, child_record, job.target, directory_record, job.type, job.undo, false, false, position);
-                }
-                child_record = null;
-                directory_record = null;
-                }
-                // The file wasn't found!
-                else {
-                cancel_action = true;
-                // 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.
-                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) {
+                
+                // 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 (job.source.toString().equals("Collection")) {
-                    ///ystem.err.println("Move within collection...");
-                    GDMManager gdm = Gatherer.c_man.getCollection().gdm;
-                    // we just retrieve the metadata attached to the origin node...
-                    ArrayList existing_metadata = 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));
-                    gdm.addMetadata(new_node, existing_metadata);
-                    existing_metadata = null;
-                    gdm = null;
-                }
+                    if (job.source.toString().equals("Collection")) {
+                    ///ystem.err.println("Move within collection...");
+                    GDMManager gdm = Gatherer.c_man.getCollection().gdm;
+                    // we just retrieve the metadata attached to the origin node...
+                    ArrayList existing_metadata = 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));
+                    gdm.addMetadata(new_node, existing_metadata);
+                    existing_metadata = null;
+                    gdm = 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")) {
-                    GDMManager gdm = Gatherer.c_man.getCollection().gdm;
-                    // Retrieve metadata from the recycle bin
-                    ArrayList existing_metadata = Gatherer.c_man.undo.getMetadata(source_file);
-                    // then assign this remainder to the new folder.
-                    gdm.addMetadata(new_node, existing_metadata);
-                    existing_metadata = null;
-                    gdm = null;
-                }
+                    else if (job.source.toString().equals("Undo")) {
+                    GDMManager gdm = Gatherer.c_man.getCollection().gdm;
+                    // Retrieve metadata from the recycle bin
+                    ArrayList existing_metadata = Gatherer.c_man.undo.getMetadata(source_file);
+                    // then assign this remainder to the new folder.
+                    gdm.addMetadata(new_node, existing_metadata);
+                    existing_metadata = null;
+                    gdm = 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).
-                else if (job.source.toString().equals("Workspace")) {
-                    cancel_action = !Gatherer.c_man.getCollection().msm.searchForMetadata(new_node, origin_node, job.folder_level);
-                }
-                }
-                new_node = null;
-
+                    else if (job.source.toString().equals("Workspace")) {
+                    cancel_action = !Gatherer.c_man.getCollection().msm.searchForMetadata(new_node, origin_node, job.folder_level);
+                    }
+                }
+                new_node = null;
+                }
             }
             }

trunk/gli/src/org/greenstone/gatherer/gui/Preferences.java

@@ +1 @@
+/**
+ *#########################################################################
+ *
+ * A component of the Gatherer application, part of the Greenstone digital
+ * library suite from the New Zealand Digital Library Project at the
+ * University of Waikato, New Zealand.
+ *
+ * Author: John Thompson, Greenstone Digital Library, University of Waikato
+ *
+ * Copyright (C) 1999 New Zealand Digital Library Project
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *########################################################################
+ */
 package org.greenstone.gatherer.gui;
 
@@ -14 +40 @@
 import org.greenstone.gatherer.checklist.Entry;
 import org.greenstone.gatherer.gui.EmailField;
+import org.greenstone.gatherer.gui.GLIButton;
 import org.greenstone.gatherer.gui.ModalDialog;
 import org.greenstone.gatherer.gui.SimpleMenuBar;
@@ -47 +74 @@
     private JLabel proxy_host_label;
     private JLabel proxy_port_label;
+    private JLabel recursion_depth_label;
     private JLabel title_label;
     private JTabbedPane tab_pane;
@@ -52 +80 @@
     private JTextField proxy_host_field;
     private JSpinner proxy_port_field;
+    private JSpinner recursion_depth_spinner;
     private Preferences self;
 
@@ -78 +107 @@
 
     JPanel button_pane = new JPanel();
-    ok_button = new JButton();
+    ok_button = new GLIButton();
+    ok_button.setMnemonic(KeyEvent.VK_O);
     Dictionary.registerBoth(ok_button, "General.OK", "General.OK_Tooltip");
-    apply_button = new JButton();
+    apply_button = new GLIButton();
+    apply_button.setMnemonic(KeyEvent.VK_A);
     Dictionary.registerBoth(apply_button, "General.Apply", "General.Apply_Tooltip");
-    cancel_button = new JButton();
+    cancel_button = new GLIButton();
+    cancel_button.setMnemonic(KeyEvent.VK_C);
     Dictionary.registerBoth(cancel_button, "General.Cancel", "General.Cancel_Tooltip");
 
@@ -263 +295 @@
     Dictionary.registerTooltip(language_combobox, "Preferences.General.Interface_Language_Tooltip");
 
+    // Recursion
+    JPanel recursion_depth_pane = new JPanel();
+    recursion_depth_label = new JLabel();
+    recursion_depth_label.setPreferredSize(LABEL_SIZE);
+    Dictionary.registerText(recursion_depth_label, "Preferences.General.Recursion_Depth");
+    recursion_depth_spinner = new JSpinner(new SpinnerNumberModel(Gatherer.config.getInt("general.max_folder_depth", Configuration.COLLECTION_SPECIFIC), 0, Integer.MAX_VALUE, 1));
+    Dictionary.registerTooltip(recursion_depth_spinner, "Preferences.General.Recursion_Depth_Tooltip");
+
     // Connect
     language_combobox.addActionListener(new LanguageComboboxListener());
@@ -275 +315 @@
     language_pane.add(language_combobox, BorderLayout.CENTER);
 
+    recursion_depth_pane.setLayout(new BorderLayout());
+    recursion_depth_pane.add(recursion_depth_label, BorderLayout.WEST);
+    recursion_depth_pane.add(recursion_depth_spinner, BorderLayout.CENTER);
+
     general_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
     general_pane.setLayout(new GridLayout(5,1,0,5));
     general_pane.add(email_pane);
     general_pane.add(language_pane);
+    general_pane.add(recursion_depth_pane);
     general_pane.add(view_extracted_metadata_checkbox);
     general_pane.add(show_file_size_checkbox);
@@ -456 +501 @@
 
         Gatherer.config.setLocale("general.locale", Configuration.GENERAL_SETTING, ((DictionaryEntry)language_combobox.getSelectedItem()).getLocale());
+
+        Gatherer.config.setInt("general.max_folder_depth", Configuration.COLLECTION_SPECIFIC, ((Integer)recursion_depth_spinner.getValue()).intValue());
 
         // Warning preferences