Changeset 6051

Timestamp:

2003-11-30T21:43:23+13:00 (20 years ago)

Author:

jmt12

Message:

Here is the result of sixteen hours work over the weekend. I'm too tired to comment them all separately, but here are some of the highlights:
Rewrote how the 'base on collection' method actually retrieves and updates the collection configuration - ensuring the CDM.CollectionConfiguration class is used instead of the retarded Collection.CollectionConfiguration (which coincidently has had a name change to BasicCollectionConfiguration). Went through code search for places where the two versions had been confused. Rewrote large swathes of GDMDocument so as to differentiate between normal and extracted metadata - an attempt to prevent the snowballing extracted metadata problem. Fixed problem where GLI was correctly recieving the last few lines of an external process. The collection shortname is no longer visible, nor is the confusing double name for metadata elements. Also coloured folders in the trees are kaput. The users email is now saved as part of the GLI configuration and is used as appropriate to fill out collection fields. There are new options on the right click menus over trees to allow the expansion and collapsing of folders. 'Show Files' now shows all types (or at least 6 types) of image properly (arg, the plagues of copy and paste). 'Based On' collections are public, plugin list automatically moves to next entry if plugin removed (I guess we should do the same in every other screen?) and metadata arguments in plugins/classifiers are no longer editable. There are about a dozen other small things, but I can't remember them. Hope I remembered to set all of the files to UNIX line-endings.

Location:

trunk/gli

Files:

• buglist/status.txt (modified) (12 diffs)
• classes/dictionary.properties (modified) (7 diffs)
• src/org/greenstone/gatherer/Configuration.java (modified) (1 diff)
• src/org/greenstone/gatherer/cdm/ArgumentConfiguration.java (modified) (1 diff)
• src/org/greenstone/gatherer/cdm/CollectionConfiguration.java (modified) (42 diffs)
• src/org/greenstone/gatherer/cdm/CollectionDesignManager.java (modified) (7 diffs)
• src/org/greenstone/gatherer/cdm/CommandTokenizer.java (modified) (2 diffs)
• src/org/greenstone/gatherer/cdm/GeneralManager.java (modified) (7 diffs)
• src/org/greenstone/gatherer/cdm/IndexManager.java (modified) (21 diffs)
• src/org/greenstone/gatherer/cdm/MetadataSetView.java (modified) (2 diffs)
• src/org/greenstone/gatherer/cdm/PlugInManager.java (modified) (1 diff)
• src/org/greenstone/gatherer/cdm/SearchTypeManager.java (modified) (9 diffs)
• src/org/greenstone/gatherer/cdm/SuperCollectionManager.java (modified) (7 diffs)
• src/org/greenstone/gatherer/collection/BasicCollectionConfiguration.java (added)
• src/org/greenstone/gatherer/collection/Collection.java (modified) (4 diffs)
• src/org/greenstone/gatherer/collection/CollectionManager.java (modified) (15 diffs)
• src/org/greenstone/gatherer/gui/CollectionPane.java (modified) (10 diffs)
• src/org/greenstone/gatherer/gui/Filter.java (modified) (3 diffs)
• src/org/greenstone/gatherer/gui/GUIManager.java (modified) (2 diffs)
• src/org/greenstone/gatherer/gui/MetaEditPane.java (modified) (4 diffs)
• src/org/greenstone/gatherer/gui/NewCollectionDetailsPrompt.java (modified) (16 diffs)
• src/org/greenstone/gatherer/gui/OpenCollectionDialog.java (modified) (8 diffs)
• src/org/greenstone/gatherer/gui/Preferences.java (modified) (13 diffs)
• src/org/greenstone/gatherer/gui/PreviewPane.java (modified) (3 diffs)
• src/org/greenstone/gatherer/gui/SimpleOpenCollectionDialog.java (modified) (8 diffs)
• src/org/greenstone/gatherer/gui/table/GTableModel.java (modified) (6 diffs)
• src/org/greenstone/gatherer/gui/tree/DragTreeCellRenderer.java (modified) (4 diffs)
• src/org/greenstone/gatherer/msm/ElementWrapper.java (modified) (7 diffs)
• src/org/greenstone/gatherer/msm/GDMDocument.java (modified) (4 diffs)
• src/org/greenstone/gatherer/msm/GreenstoneArchiveParser.java (modified) (1 diff)
• src/org/greenstone/gatherer/shell/GShell.java (modified) (8 diffs)
• src/org/greenstone/gatherer/util/Codec.java (modified) (2 diffs)
• src/org/greenstone/gatherer/util/StaticStrings.java (modified) (5 diffs)

trunk/gli/buglist/status.txt

@@ -29 +29 @@
 3.2
 Fixed (16-10-03)
-Metadata importing should have happened automatically. To investigate further. Tracked down an error in ElementWrapper that was causing a NPE when attempting to import metadata with files - but only if you hadn't based your collection on a previous one. Its possible that is what was causing the problem/confusion here
+Metadata importing should have happened automatically. To investigate further.<br>Tracked down an error in ElementWrapper that was causing a NPE when attempting to import metadata with files - but only if you hadn't based your collection on a previous one. Its possible that is what was causing the problem/confusion here
 
 203B005
@@ -140 +140 @@
 Unknown
 6
-Fixed 22-10-2003
-Default strings for all features to be added by way of a combobox containing currently/commonly used format strings. Turns out that one multipurpose default format string can be used. Added 'Use Default Format' button to format manager which becomes active when a part is selected that has a default format string available
+Fixed - 22-10-03
+Default strings for all features to be added by way of a combobox containing currently/commonly used format strings<br>Turns out that one multipurpose default format string can be used. Added 'Use Default Format' button to format manager which becomes active when a part is selected that has a default format string available
 
 203F019
@@ -205 +205 @@
 5
 Fixed
-Adding suggested information to help. Tooltips also being added. Tooltips complete. Section on basic functionality removed from help documents due to translation constraints
+Adding suggested information to help. Tooltips also being added<br>Tooltips complete. Section on basic functionality removed from help documents due to translation constraints
 
 203F027
@@ -324 +324 @@
 Linux, Win98, WinXP
 NA
-Fixed 22-10-2003
-Include 'expand text' button for extracted metadata. Investigate other methods for displaying HTML based information. Expand text button in place
+Fixed 22-10-03
+Include 'expand text' button for extracted metadata. Investigate other methods for displaying HTML based information<br>Expand text button in place
 
 203B042
@@ -396 +396 @@
 Win98, Win2000
 6
-Fixed 22-10-2003
-Ensure GLI correctly detects when it needs to produce hfiles. Elements in metadata sets can now be told if they are to generate hfiles as necessary, however of the three mentioned above only AZList was a bug. Organization has a flat structure so doesn't really need a Hierarchy classifier (a AZCompactList would do)
+Fixed - 22-10-03
+Ensure GLI correctly detects when it needs to produce hfiles<br>Elements in metadata sets can now be told if they are to generate hfiles as necessary, however of the three mentioned above only AZList was a bug. Organization has a flat structure so doesn't really need a Hierarchy classifier (a AZCompactList would do)
 
 203F051
@@ -428 +428 @@
 Win98, Win2000
 6
-Fixed 16-10-2003
-Ensure that selecting a fixed feature clears component selection and adjusts output state appropriately. It was, the problem lay in trying to change the gui from within the EventThread again - SwingUtilities to the rescue.
+Fixed (16-10-03)
+Ensure that selecting a fixed feature clears component selection and adjusts output state appropriately<br>It was, the problem lay in trying to change the gui from within the EventThread again - SwingUtilities to the rescue.
 
 203B055
@@ -436 +436 @@
 Win98, Win2000
 6
-Fixed 16-10-2003
-First index should be the default if none other is selected. Fixed as part of the redesign of the indexes page
+Fixed (16-10-03)
+First index should be the default if none other is selected.<br>Fixed as part of the redesign of the indexes page
 
 203B056
@@ -1428 +1428 @@
 All
 NA
-Fixed 11-11-2003
-Something to do with Codec transform not being applied at the right place<br>Actually the whole idea of using double escapes is flawed as this just causing further problems during building. Instead replace escape with some 'safe' character (What about newline?). Of course, this would be transparent to the user as they have been explicitly told in several help documents to use escape.<br>Why CVS didn't update when I changed the status of this bug before I don't know - but it is now officially, completely and finally fixed.
+Fixed 05-11-03
+Something to do with Codec transform not being applied at the right place<br>Actually the whole idea of using double escapes is flawed as this just causing further problems during building. Instead replace escape with some 'safe' character (What about newline?). Of course, this would be transparent to the user as they have been explicitly told in several help documents to use escape.<br>Have now used the '|' character behind the scenes as it doesn't seem to cause problems in GLI and Greenstone. Of course the user still sees and uses '\' to denote hierarchical paths.
 
 203B180
@@ -1444 +1444 @@
 All
 NA
-Fixed 27-11-2003
-OK<br>Gone. The 'alias' was the unique identifier of a particular row in the hfile - perhaps key would have been a more descriptive name - anyhow I now just use the full-path of the metadata value which is gareunteed to be unique (whereas allowing people to enter their own 'alias' would have required GLI to test this).
+Fixed - 05-11-03
+The value alias is meant to be a unique identifier for a certain hierarchy path - this isn't made clear in the documents, and is far less of an issue for computer generate documents as it would've been for hand written ones
 
 203B182
@@ -1996 +1996 @@
 All
 NA
-Pending
+Fixed 13-11-03
 Ensure description metadata extracted from plugins/classifiers and utilized by the comboboxes
 
@@ -2012 +2012 @@
 All
 NA
-Fixed
+Fixed 13-11-03
 Increase empty string checking
 
@@ -2124 +2124 @@
 All
 NA
-Pending Again
-Make memory use reasonable<br>Reinstated the idea of caching metadata.xml files rather than trying to load them all
+Fixed - 06-11-03
+Make memory use reasonable<br>I've made memory savings in two ways (hopefully). First I've re-activated the idea of only caching a certain number of MDSDocuments in memory (its currently arbitarily set at twenty five), as one of the causes of this problem was hundreds of small MDSDocuments being loaded. The second problem is that the threaded task that loaded all of the documents initially never released the tree nodes after creating them - thus if your collection contains hundreds of folder nodes, each with a small mds, you'd blow your memory allowance. Since caching has been re-enabled I've simply disabled the loader thread (which used to be necessary for hierarchies when I had to depend on the stupid numbering scheme - this however has hopefully been addressed with the hvalue attribute in MDS documents).
 
 203B320

trunk/gli/classes/dictionary.properties

@@ -348 +348 @@
 #
 #***** Collection *****
-Collection.Collection:{32}Collection: {0}{34}
+Collection.Collection:{32}Collection:{34}
 Collection.Delete_Tooltip:Delete selected files and folders
 Collection.Filter_Tooltip:Restrict the files shown in the file tree
@@ -555 +555 @@
 General.Apply:Apply
 General.Apply_Tooltip:Apply the current settings but do not exit the dialog
-General.Browse:Browse
+General.Browse:Browse...
 General.Browse_Tooltip:Choose a filepath on your computer
 General.Cancel:Cancel
@@ -698 +698 @@
 #
 #***** Menu Options *****
+Menu.Collapse:Close Folder
 Menu.Edit:Edit
 Menu.Edit_Copy:Copy (ctrl-c)
@@ -706 +707 @@
 Menu.Edit_Search:Search
 Menu.Edit_Undo:Undo
+Menu.Expand:Open Folder
 Menu.File:File
 Menu.File_Associations:File Associations...
@@ -899 +901 @@
 NewCollectionPrompt.Collection_Description:Description of content:
 #NewCollectionPrompt.Collection_Email:Author's Email:
-#NewCollectionPrompt.Collection_Name:Short Name:
+NewCollectionPrompt.Collection_Name:Short Name:
 #NewCollectionPrompt.Collection_Name_Tooltip:Short collection name, used internally (must be 8 characters or less)
 NewCollectionPrompt.Description_Error:The description field must be filled out. Please correct.
@@ -909 +911 @@
 NewCollectionPrompt.Metadata_Instructions2:(Note: You can add new ones later).
 NewCollectionPrompt.Metadata_Title_Existing:Select metadata sets.
-NewCollectionPrompt.Name_Error:You have either failed to enter a name for the collection, or the name you have choosen is already in use. Please correct.
+#NewCollectionPrompt.Name_Error:You have either failed to enter a name for the collection, or the name you have choosen is already in use. Please correct.
 NewCollectionPrompt.NewCollection:-- New Collection --
 NewCollectionPrompt.Select_MDS:Available metadata sets:
 NewCollectionPrompt.Set_Contains:This metadata set contains the elements
 NewCollectionPrompt.Title:Create a new Collection.
+NewCollectionPrompt.Title_Clash:The title you have choosen for your collection is already in use. Please correct.
 NewCollectionPrompt.Title_Error:The title field must be filled out. Please correct.
 #***** New Folder Prompt *****
@@ -962 +965 @@
 Preferences.General:General
 Preferences.General_Tooltip:Set some general preferences
+Preferences.General.Email:Users Email:
+Preferences.General.Email_Tooltip:The email address automatically used for any collection created with the GLI
 Preferences.General.Interface_Language:Interface Language:
 Preferences.General.Interface_Language_Tooltip:Select the language you wish the interface and its controls to be displayed in. 

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

@@ -453 +453 @@
     public void set(String property, boolean general, boolean value) {
     if(property.startsWith("workflow")) {
-        System.err.println("Set property: " + property + ", general=" + general + ", value=" + value);
+        Gatherer.println("Set property: " + property + ", general=" + general + ", value=" + value);
     }
     setString(property, general, (value ? "true" : "false"));

trunk/gli/src/org/greenstone/gatherer/cdm/ArgumentConfiguration.java

@@ -400 +400 @@
         case Argument.METADATUM:
         value = new JComboBox(Gatherer.c_man.getCollection().msm.getAssignedElements());
-        ((JComboBox)value).setEditable(true);
+        //((JComboBox)value).setEditable(true);
         // Now ensure we have the existing value or default value selected if either exist.
         if(existing_value != null) {

trunk/gli/src/org/greenstone/gatherer/cdm/CollectionConfiguration.java

@@ -46 +46 @@
  */
 public class CollectionConfiguration
-    extends StaticStrings {
-
-    static public Document document;
-
-    static public void main(String[] args) {
+    extends StaticStrings {
+
+    static public Document document;
+
+    static public void main(String[] args) {
     if(args.length >= 1) {
-        File file = new File(args[0]);
-        CollectionConfiguration collect_cfg = new CollectionConfiguration(file);
-        collect_cfg.save(true);
-        collect_cfg.save(false);
-        collect_cfg = null;
+        File file = new File(args[0]);
+        CollectionConfiguration collect_cfg = new CollectionConfiguration(file);
+        collect_cfg.save(true);
+        collect_cfg.save(false);
+        collect_cfg = null;
     }
     else {
-        System.out.println("Usage: CollectionConfiguration <filename>");
-    }
-    }
-
-    /** Find the best insertion position for the given DOM Element. This should try to match command tag, and if found should then try to group by name or type (eg CollectionMeta), or append to end is no such grouping exists (eg PlugIns). Failing a command match it will check against the command order for the best insertion location.
-     * @param element the command Element to be inserted
-     * @return the Element which the given command should be inserted before, or null to append to end of list
-     */
-    static public Node findInsertionPoint(Element target_element) {
+        System.out.println("Usage: CollectionConfiguration <filename>");
+    }
+    }
+
+    /** Find the best insertion position for the given DOM Element. This should try to match command tag, and if found should then try to group by name or type (eg CollectionMeta), or append to end is no such grouping exists (eg PlugIns). Failing a command match it will check against the command order for the best insertion location.
+     * @param element the command Element to be inserted
+     * @return the Element which the given command should be inserted before, or null to append to end of list
+     */
+    static public Node findInsertionPoint(Element target_element) {
     ///ystem.err.println("Find insertion point: " + target_element.getNodeName());
     String target_element_name = target_element.getNodeName();
@@ -75 +75 @@
     // If we found matching elements, then we have our most likely insertion location, so check within for groupings
     if(matching_elements.getLength() != 0) {
-        ///ystem.err.println("Found matching elements.");
-        // Only CollectionMeta are grouped.
-        if(target_element_name.equals(COLLECTIONMETADATA_ELEMENT)) {
+        ///ystem.err.println("Found matching elements.");
+        // Only CollectionMeta are grouped.
+        if(target_element_name.equals(COLLECTIONMETADATA_ELEMENT)) {
         ///ystem.err.println("Dealing with collection metadata");
         // Special case: CollectionMeta can be added at either the start or end of a collection configuration file. However the start position is reserved for special metadata, so if no non-special metadata can be found we must append to the end.
         // So if the command to be added is special add it immediately after any other special command
         if(target_element.getAttribute(SPECIAL_ATTRIBUTE).equals(TRUE_STR)) {
-            int index = 0;
-            Element matched_element = (Element) matching_elements.item(index);
-            Element sibling_element = (Element) matched_element.getNextSibling();
-            while(sibling_element.getAttribute(SPECIAL_ATTRIBUTE).equals(TRUE_STR)) {
+            int index = 0;
+            Element matched_element = (Element) matching_elements.item(index);
+            Element sibling_element = (Element) matched_element.getNextSibling();
+            while(sibling_element.getAttribute(SPECIAL_ATTRIBUTE).equals(TRUE_STR)) {
             index++;
             matched_element = (Element) matching_elements.item(index);
             sibling_element = (Element) matched_element.getNextSibling();
-            }
-            if(sibling_element.getNodeName().equals(NEWLINE_ELEMENT)) {
+            }
+            if(sibling_element.getNodeName().equals(NEWLINE_ELEMENT)) {
             Element newline_element = document.createElement(NEWLINE_ELEMENT);
             document_element.insertBefore(newline_element, sibling_element);
-            }
-            return sibling_element;
+            }
+            return sibling_element;
         }
         // Otherwise try to find a matching 'name' and add after the last one in that group.
         else {
-            int index = 0;
-            target_element_name = target_element.getAttribute(NAME_ATTRIBUTE);
-            boolean found = false;
-            // Skip all of the special metadata
-            Element matched_element = (Element) matching_elements.item(index);
-            while(matched_element.getAttribute(SPECIAL_ATTRIBUTE).equals(TRUE_STR)) {
+            int index = 0;
+            target_element_name = target_element.getAttribute(NAME_ATTRIBUTE);
+            boolean found = false;
+            // Skip all of the special metadata
+            Element matched_element = (Element) matching_elements.item(index);
+            while(matched_element.getAttribute(SPECIAL_ATTRIBUTE).equals(TRUE_STR)) {
             index++;
             matched_element = (Element) matching_elements.item(index);
-            }
-            // Begin search
-            while(!found && matched_element != null) {
+            }
+            // Begin search
+            while(!found && matched_element != null) {
             if(matched_element.getAttribute(NAME_ATTRIBUTE).equals(target_element_name)) {
-                found = true;
+                found = true;
             }
             else {
-                index++;
-                matched_element = (Element) matching_elements.item(index);
-            }
-            }
-            // If we found a match, we need to continue checking until we find the last name match.
-            if(found) {
+                index++;
+                matched_element = (Element) matching_elements.item(index);
+            }
+            }
+            // If we found a match, we need to continue checking until we find the last name match.
+            if(found) {
             index++;
             Element previous_sibling = matched_element;
             Element sibling_element = (Element) matching_elements.item(index);
             while(sibling_element != null && sibling_element.getAttribute(NAME_ATTRIBUTE).equals(target_element_name)) {
-                previous_sibling = sibling_element;
-                index++;
-                sibling_element = (Element) matching_elements.item(index);
+                previous_sibling = sibling_element;
+                index++;
+                sibling_element = (Element) matching_elements.item(index);
             }
             // Previous sibling now holds the command immediately before where we want to add, so find its next sibling and add to that. In this one case we can ignore new lines!
             return previous_sibling.getNextSibling();
-            }
-            // If not found we just add after last metadata element
-            else {
+            }
+            // If not found we just add after last metadata element
+            else {
             Element last_element = (Element) matching_elements.item(matching_elements.getLength() - 1);
             return last_element.getNextSibling();
-            }
-        }
-
-        }
-        else {
+            }
+        }
+
+        }
+        else {
         ///ystem.err.println("Not dealing with collection meta.");
         Element matched_element = (Element) matching_elements.item(matching_elements.getLength() - 1);
@@ -144 +144 @@
         Node sibling_element = matched_element.getNextSibling();
         if(sibling_element != null && sibling_element.getNodeName().equals(NEWLINE_ELEMENT)) {
-            Element newline_element = document.createElement(NEWLINE_ELEMENT);
-            document_element.insertBefore(newline_element, sibling_element);
+            Element newline_element = document.createElement(NEWLINE_ELEMENT);
+            document_element.insertBefore(newline_element, sibling_element);
         }
         return sibling_element; // Note that this may be null
-        }
+        }
     }
     ///ystem.err.println("No matching elements found.");
@@ -154 +154 @@
     int command_index = -1;
     for(int i = 0; command_index == -1 && i < COMMAND_ORDER.length; i++) {
-        if(COMMAND_ORDER[i].equals(target_element_name)) {
+        if(COMMAND_ORDER[i].equals(target_element_name)) {
         command_index = i;
-        }
+        }
     }
     ///ystem.err.println("Command index is: " + command_index);
@@ -163 +163 @@
     ///ystem.err.println("Searching before the target command.");
     while(preceeding_index >= 0) {
-        matching_elements = document_element.getElementsByTagName(COMMAND_ORDER[preceeding_index]);
-        // If we've found a match
-        if(matching_elements.getLength() > 0) {
+        matching_elements = document_element.getElementsByTagName(COMMAND_ORDER[preceeding_index]);
+        // If we've found a match
+        if(matching_elements.getLength() > 0) {
         // We add after the last element
         Element matched_element = (Element) matching_elements.item(matching_elements.getLength() - 1);
@@ -171 +171 @@
         Node sibling_element = matched_element.getNextSibling();
         if(sibling_element != null && sibling_element.getNodeName().equals(NEWLINE_ELEMENT)) {
-            Element newline_element = document.createElement(NEWLINE_ELEMENT);
-            document_element.insertBefore(newline_element, sibling_element);
+            Element newline_element = document.createElement(NEWLINE_ELEMENT);
+            document_element.insertBefore(newline_element, sibling_element);
         }
         return sibling_element; // Note that this may be null
-        }
-        preceeding_index--;
+        }
+        preceeding_index--;
     }
     // If all that fails, we now move backwards through the commands
@@ -182 +182 @@
     ///ystem.err.println("Searching after the target command.");
     while(susceeding_index < COMMAND_ORDER.length) {
-        matching_elements = document_element.getElementsByTagName(COMMAND_ORDER[susceeding_index]);
-        // If we've found a match
-        if(matching_elements.getLength() > 0) {
+        matching_elements = document_element.getElementsByTagName(COMMAND_ORDER[susceeding_index]);
+        // If we've found a match
+        if(matching_elements.getLength() > 0) {
         // We add before the first element
         Element matched_element = (Element) matching_elements.item(0);
@@ -190 +190 @@
         Node sibling_element = matched_element.getPreviousSibling();
         if(sibling_element != null && sibling_element.getNodeName().equals(NEWLINE_ELEMENT)) {
-            Element newline_element = document.createElement(NEWLINE_ELEMENT);
-            document_element.insertBefore(newline_element, sibling_element);
+            Element newline_element = document.createElement(NEWLINE_ELEMENT);
+            document_element.insertBefore(newline_element, sibling_element);
         }
         return sibling_element; // Note that this may be null
-        }
-        susceeding_index++;
+        }
+        susceeding_index++;
     }
     // Well. Apparently there are no other commands in this collection configuration. So append away...
     return null;
-    }
-
-    static public String toString(Element command_element, boolean show_extracted_namespace) {
+    }
+
+    static public String toString(Element command_element, boolean show_extracted_namespace) {
     String command_element_name = command_element.getNodeName();
     if(command_element_name.equals(CLASSIFY_ELEMENT)) {
-        return self.classifyToString(command_element, show_extracted_namespace);
+        return self.classifyToString(command_element, show_extracted_namespace);
     }
     else if(command_element_name.equals(FORMAT_ELEMENT)) {
-        return self.formatToString(command_element, show_extracted_namespace);
+        return self.formatToString(command_element, show_extracted_namespace);
     }
     else if(command_element_name.equals(INDEXES_ELEMENT)) {
-        return self.indexesToString(command_element, show_extracted_namespace);
+        return self.indexesToString(command_element, show_extracted_namespace);
     }
     else if(command_element_name.equals(INDEX_DEFAULT_ELEMENT)) {
-        return self.indexDefaultToString(command_element, show_extracted_namespace);
+        return self.indexDefaultToString(command_element, show_extracted_namespace);
     }
     else if(command_element_name.equals(LANGUAGES_ELEMENT)) {
-        return self.languagesToString(command_element);
+        return self.languagesToString(command_element);
     }
     else if(command_element_name.equals(LANGUAGE_DEFAULT_ELEMENT)) {
-        return self.languageDefaultToString(command_element);
+        return self.languageDefaultToString(command_element);
     }
     else if(command_element_name.equals(LEVELS_ELEMENT)) {
-        return self.levelsToString(command_element);
+        return self.levelsToString(command_element);
     }
     else if(command_element_name.equals(COLLECTIONMETADATA_ELEMENT)) {
-        return self.metadataToString(command_element, show_extracted_namespace);
+        return self.metadataToString(command_element, show_extracted_namespace);
     }
     else if(command_element_name.equals(COLLECTIONMETADATA_CREATOR_ELEMENT)) {
-        return self.metadataToString(command_element, show_extracted_namespace);
+        return self.metadataToString(command_element, show_extracted_namespace);
     }
     else if(command_element_name.equals(COLLECTIONMETADATA_MAINTAINER_ELEMENT)) {
-        return self.metadataToString(command_element, show_extracted_namespace);
+        return self.metadataToString(command_element, show_extracted_namespace);
     }
     else if(command_element_name.equals(COLLECTIONMETADATA_PUBLIC_ELEMENT)) {
-        return self.metadataToString(command_element, show_extracted_namespace);
+        return self.metadataToString(command_element, show_extracted_namespace);
     }
     else if(command_element_name.equals(COLLECTIONMETADATA_BETA_ELEMENT)) {
-        return self.metadataToString(command_element, show_extracted_namespace);
+        return self.metadataToString(command_element, show_extracted_namespace);
     }
     else if(command_element_name.equals(PLUGIN_ELEMENT)) {
-        return self.pluginToString(command_element, show_extracted_namespace);
+        return self.pluginToString(command_element, show_extracted_namespace);
     }
     else if(command_element_name.equals(SEARCHTYPE_ELEMENT)) {
-        return self.searchtypeToString(command_element);
+        return self.searchtypeToString(command_element);
     }
     else if(command_element_name.equals(SUBCOLLECTION_ELEMENT)) {
-        return self.subcollectionToString(command_element, show_extracted_namespace);
+        return self.subcollectionToString(command_element, show_extracted_namespace);
     }
     else if(command_element_name.equals(SUBCOLLECTION_DEFAULT_INDEX_ELEMENT)) {
-        return self.subcollectionDefaultIndexToString(command_element);
+        return self.subcollectionDefaultIndexToString(command_element);
     }
     else if(command_element_name.equals(SUBCOLLECTION_INDEXES_ELEMENT)) {
-        return self.subcollectionIndexesToString(command_element);
+        return self.subcollectionIndexesToString(command_element);
     }
     else if(command_element_name.equals(SUPERCOLLECTION_ELEMENT)) {
-        return self.supercollectionToString(command_element);
+        return self.supercollectionToString(command_element);
     }
     else if(command_element_name.equals(UNKNOWN_ELEMENT)) {
-        return self.unknownToString(command_element);
+        return self.unknownToString(command_element);
     }
     return "";
-    }
-
-    /** Parses arguments from a tokenizer and returns a HashMap of mappings. The tricky bit here is that not all entries in the HashMap are name->value pairs, as some arguments are boolean and are turned on by their presence. Arguments are denoted by a '-' prefix.
-     * @param tokenizer a CommandTokenizer based on the unconsumed portion of a command string
-     * @return a HashMap containing the arguments parsed
-     */
-    static public HashMap parseArguments(CommandTokenizer tokenizer) {
+    }
+
+    /** Parses arguments from a tokenizer and returns a HashMap of mappings. The tricky bit here is that not all entries in the HashMap are name->value pairs, as some arguments are boolean and are turned on by their presence. Arguments are denoted by a '-' prefix.
+     * @param tokenizer a CommandTokenizer based on the unconsumed portion of a command string
+     * @return a HashMap containing the arguments parsed
+     */
+    static public HashMap parseArguments(CommandTokenizer tokenizer) {
     HashMap arguments = new HashMap();
     String name = null;
     String value = null;
     while(tokenizer.hasMoreTokens() || name != null) {
-        // First we retrieve a name if we need one.
-        if(name == null) {
+        // First we retrieve a name if we need one.
+        if(name == null) {
         name = tokenizer.nextToken();
-        }
-        // Now we attempt to retrieve a value
-        if(tokenizer.hasMoreTokens()) {
+        }
+        // Now we attempt to retrieve a value
+        if(tokenizer.hasMoreTokens()) {
         value = tokenizer.nextToken();
         // Test if the value is actually a name, and if so add the name by itself, then put value into name so that it is parsed correctly during the next loop.
         if(value.startsWith(StaticStrings.MINUS_CHARACTER)) {
-            arguments.put(name, null);
-            name = value;
+            arguments.put(name, null);
+            name = value;
         }
         // Otherwise we have a typical name->value pair ready to go
         else {
-            arguments.put(name, value);
-            name = null;
-        }
-        }
-        // Otherwise its a binary flag
-        else {
+            arguments.put(name, value);
+            name = null;
+        }
+        }
+        // Otherwise its a binary flag
+        else {
         arguments.put(name, null);
         name = null;
-        }
+        }
     }
     return arguments;
-    }
-
-    static private ArrayList known_metadata;
-
-    static private CollectionConfiguration self;
-
-    static final private String EXTRACTED_PREFIX = Utility.EXTRACTED_METADATA_NAMESPACE + MSMUtils.NS_SEP;
-    /** Gives the preferred ordering of commands */
-    static final private String[] COMMAND_ORDER = {StaticStrings.COLLECTIONMETADATA_CREATOR_ELEMENT, StaticStrings.COLLECTIONMETADATA_MAINTAINER_ELEMENT, StaticStrings.COLLECTIONMETADATA_PUBLIC_ELEMENT, StaticStrings.COLLECTIONMETADATA_BETA_ELEMENT, StaticStrings.SEARCHTYPE_ELEMENT, StaticStrings.PLUGIN_ELEMENT, StaticStrings.INDEXES_ELEMENT, StaticStrings.LEVELS_ELEMENT, StaticStrings.INDEX_DEFAULT_ELEMENT, StaticStrings.LANGUAGES_ELEMENT, StaticStrings.LANGUAGE_DEFAULT_ELEMENT, StaticStrings.SUBCOLLECTION_ELEMENT, StaticStrings.SUBCOLLECTION_INDEXES_ELEMENT, StaticStrings.SUBCOLLECTION_DEFAULT_INDEX_ELEMENT, StaticStrings.SUPERCOLLECTION_ELEMENT, StaticStrings.CLASSIFY_ELEMENT, StaticStrings.FORMAT_ELEMENT, StaticStrings.COLLECTIONMETADATA_ELEMENT};
-
-    /** ************************** Public Data Members ***************************/
-
-    /** ************************** Private Data Members ***************************/
-
-    private File collect_config_file;
-
-    /** ************************** Public Methods ***************************/
-
-    public CollectionConfiguration(File collect_config_file) {
+    }
+
+    static private ArrayList known_metadata;
+
+    static private CollectionConfiguration self;
+
+    static final private String EXTRACTED_PREFIX = Utility.EXTRACTED_METADATA_NAMESPACE + MSMUtils.NS_SEP;
+    /** Gives the preferred ordering of commands */
+    static final private String[] COMMAND_ORDER = {StaticStrings.COLLECTIONMETADATA_CREATOR_ELEMENT, StaticStrings.COLLECTIONMETADATA_MAINTAINER_ELEMENT, StaticStrings.COLLECTIONMETADATA_PUBLIC_ELEMENT, StaticStrings.COLLECTIONMETADATA_BETA_ELEMENT, StaticStrings.SEARCHTYPE_ELEMENT, StaticStrings.PLUGIN_ELEMENT, StaticStrings.INDEXES_ELEMENT, StaticStrings.LEVELS_ELEMENT, StaticStrings.INDEX_DEFAULT_ELEMENT, StaticStrings.LANGUAGES_ELEMENT, StaticStrings.LANGUAGE_DEFAULT_ELEMENT, StaticStrings.SUBCOLLECTION_ELEMENT, StaticStrings.SUBCOLLECTION_INDEXES_ELEMENT, StaticStrings.SUBCOLLECTION_DEFAULT_INDEX_ELEMENT, StaticStrings.SUPERCOLLECTION_ELEMENT, StaticStrings.CLASSIFY_ELEMENT, StaticStrings.FORMAT_ELEMENT, StaticStrings.COLLECTIONMETADATA_ELEMENT};
+
+    /** ************************** Public Data Members ***************************/
+
+    /** ************************** Private Data Members ***************************/
+
+    private File collect_config_file;
+
+    /** ************************** Public Methods ***************************/
+
+    public CollectionConfiguration(File collect_config_file) {
     this.self = this;
     this.collect_config_file = collect_config_file;
@@ -321 +321 @@
     String collect_config_name = collect_config_file.getName();
     if(collect_config_name.equals(COLLECTCONFIGURATION_XML)) {
-        // Parse with Utility but don't use class loader
-        document = Utility.parse(collect_config_file, false);
+        // Parse with Utility but don't use class loader
+        document = Utility.parse(collect_config_file, false);
     }
     // Otherwise if this is a legacy collect.cfg file then read in the template and send to magic parser
     else if(collect_config_name.equals(COLLECT_CFG)) {
-        document = Utility.parse(PSEUDO_COLLECTCONFIGURATION_XML, true);
-        parse(collect_config_file);
-    }
-    }
-
-    /** This debug facility shows the currently loaded collect.cfg or CollectConfig.xml file as a DOM tree. */
-    public void display() {
+        document = Utility.parse(PSEUDO_COLLECTCONFIGURATION_XML, true);
+        parse(collect_config_file);
+    }
+    }
+
+    /** This debug facility shows the currently loaded collect.cfg or CollectConfig.xml file as a DOM tree. */
+    public void display() {
     JDialog dialog = new JDialog(Gatherer.g_man, "Collection Configuration", false);
     dialog.setSize(400,400);
@@ -340 +340 @@
     refresh_button.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent event) {
-            tree.setDocument(document);
-        }
-        });
+            tree.setDocument(document);
+        }
+        });
     content_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
     content_pane.setLayout(new BorderLayout());
@@ -348 +348 @@
     content_pane.add(refresh_button, BorderLayout.SOUTH);
     dialog.show();
-    }
-
-    public Element getBeta() {
+    }
+
+    public Element getBeta() {
     Element element = getOrCreateElementByTagName(COLLECTIONMETADATA_BETA_ELEMENT, null, null);
     element.setAttribute(NAME_ATTRIBUTE, COLLECTIONMETADATA_BETA_STR);
     element.setAttribute(SPECIAL_ATTRIBUTE, TRUE_STR);
     return element;
-    }
-
-    public Element getCreator() {
+    }
+
+    public Element getCreator() {
     Element element = getOrCreateElementByTagName(COLLECTIONMETADATA_CREATOR_ELEMENT, null, null);
     element.setAttribute(NAME_ATTRIBUTE, COLLECTIONMETADATA_CREATOR_STR);
     element.setAttribute(SPECIAL_ATTRIBUTE, TRUE_STR);
     return element;
-    }
-
-    public Element getDocumentElement() {
+    }
+
+    public Element getDocumentElement() {
     return document.getDocumentElement();
-    }
-
-    public File getFile() {
+    }
+
+    public File getFile() {
     return collect_config_file;
-    }
-
-    /** Retrieve or create the languages Element. */
-    public Element getLanguages() {
+    }
+
+    /** Retrieve or create the languages Element. */
+    public Element getLanguages() {
     return getOrCreateElementByTagName(LANGUAGES_ELEMENT, null, null);
-    }
-
-    public Element getLevels() {
+    }
+
+    public Element getLevels() {
     return getOrCreateElementByTagName(LEVELS_ELEMENT, null, null);
-    }
-
-    public Element getMaintainer() {
+    }
+
+    public Element getMaintainer() {
     Element element = getOrCreateElementByTagName(COLLECTIONMETADATA_MAINTAINER_ELEMENT, null, null);
     element.setAttribute(NAME_ATTRIBUTE, COLLECTIONMETADATA_MAINTAINER_STR);
     element.setAttribute(SPECIAL_ATTRIBUTE, TRUE_STR);
     return element;
-    }
-
-    /** Retrieve or create the indexes Element. Note that this method behaves differently from the other getBlah methods, in that it also has to keep in mind that indexes come in two flavours, MG and MGPP. */
-    public Element getMGIndexes() {
+    }
+
+    /** Retrieve or create the indexes Element. Note that this method behaves differently from the other getBlah methods, in that it also has to keep in mind that indexes come in two flavours, MG and MGPP. */
+    public Element getMGIndexes() {
     return getOrCreateElementByTagName(INDEXES_ELEMENT, MGPP_ATTRIBUTE, FALSE_STR);
-    }
-
-    public Element getMGPPIndexes() {
+    }
+
+    public Element getMGPPIndexes() {
     return getOrCreateElementByTagName(INDEXES_ELEMENT, MGPP_ATTRIBUTE, TRUE_STR);
-    }
-
-    public Element getPublic() {
+    }
+
+    public Element getPublic() {
     Element element = getOrCreateElementByTagName(COLLECTIONMETADATA_PUBLIC_ELEMENT, null, null);
     element.setAttribute(NAME_ATTRIBUTE, COLLECTIONMETADATA_PUBLIC_STR);
     element.setAttribute(SPECIAL_ATTRIBUTE, TRUE_STR);
     return element;
-    }
-
-    /** Retrieve or create the searchtype element. */
-    public Element getSearchType() {
+    }
+
+    /** Retrieve or create the searchtype element. */
+    public Element getSearchType() {
     ///ystem.err.println("Get or create element by tag name: " + name);
     Element document_element = document.getDocumentElement();
@@ -411 +411 @@
     int elements_length = elements.getLength();
     if(elements_length > 0) {
-        document_element = null;
-        return (Element) elements.item(0);
+        document_element = null;
+        return (Element) elements.item(0);
     }
     // Create the element
@@ -418 +418 @@
     Node target_node = findInsertionPoint(element);
     if(target_node != null) {
-        document_element.insertBefore(element, target_node);
+        document_element.insertBefore(element, target_node);
     }
     else {
-        document_element.appendChild(element);
+        document_element.appendChild(element);
     }
     document_element = null;
@@ -429 +429 @@
     element.appendChild(a_searchtype_element);
     return element;
-    }
-
-    /** Retrieve or create the subindexes Element. */
-    public Element getSubIndexes() {
+    }
+
+    /** Retrieve or create the subindexes Element. */
+    public Element getSubIndexes() {
     return getOrCreateElementByTagName(SUBCOLLECTION_INDEXES_ELEMENT, null, null);
-    }
-
-    /** Retrieve or create the supercollections Element. */
-    public Element getSuperCollection() {
+    }
+
+    /** Retrieve or create the supercollections Element. */
+    public Element getSuperCollection() {
     return getOrCreateElementByTagName(SUPERCOLLECTION_ELEMENT, null, null);
-    }
-
-    public boolean ready() {
+    }
+
+    public boolean ready() {
     return document != null;
-    }
-
-    public void save() {
+    }
+
+    public void save() {
     save(false);
-    }
-
-    public void save(boolean force_xml) {
+    }
+
+    public void save(boolean force_xml) {
     if(collect_config_file.exists()) {
-        File original_file = new File(collect_config_file.getParentFile(), COLLECT_CFG);
-        File backup_file = new File(collect_config_file.getParentFile(), "collect.bak");
-        if(backup_file.exists()) {
+        File original_file = new File(collect_config_file.getParentFile(), COLLECT_CFG);
+        File backup_file = new File(collect_config_file.getParentFile(), "collect.bak");
+        if(backup_file.exists()) {
         backup_file.delete();
-        }
-        if(!original_file.renameTo(backup_file)) {
+        }
+        if(!original_file.renameTo(backup_file)) {
         Gatherer.println("Can't rename collect.cfg");
-        }
+        }
     }
     if(force_xml || collect_config_file.getName().equals(COLLECTCONFIGURATION_XML)) {
-        ///ystem.err.println("Writing XML");
-        Utility.export(document, new File(collect_config_file.getParentFile(), COLLECTCONFIGURATION_XML));
+        ///ystem.err.println("Writing XML");
+        Utility.export(document, new File(collect_config_file.getParentFile(), COLLECTCONFIGURATION_XML));
     }
     else {
-        ///ystem.err.println("Writing text");
-        try {
+        ///ystem.err.println("Writing text");
+        try {
         FileWriter file_writer = new FileWriter(collect_config_file, false);
         BufferedWriter buffered_writer = new BufferedWriter(file_writer);
@@ -476 +476 @@
         boolean just_wrote_newline = false; // Prevent two or more newlines in a row
         for(int i = 0; i < command_elements.getLength(); i++) {
-            Node command_node = command_elements.item(i);
-            if(command_node instanceof Element) {
+            Node command_node = command_elements.item(i);
+            if(command_node instanceof Element) {
             Element command_element = (Element) command_node;
             // The only thing left are NewLine elements
             if(command_element.getNodeName().equals(NEWLINE_ELEMENT) && !just_wrote_newline) {
-                buffered_writer.newLine();
-                just_wrote_newline = true;
+                buffered_writer.newLine();
+                just_wrote_newline = true;
             }
             // Anything else we write to file, but only if it has been assigned, the exception being the Indexes element which just get commented if unassigned (a side effect of MG && MGPP compatibility)
             else if(!command_element.getAttribute(ASSIGNED_ATTRIBUTE).equals(FALSE_STR) || command_element.getNodeName().equals(INDEXES_ELEMENT) || command_element.getNodeName().equals(INDEX_DEFAULT_ELEMENT) || command_element.getNodeName().equals(LEVELS_ELEMENT)){
-                String command = toString(command_element, false);
-                if(command != null && command.length() > 0) {
+                String command = toString(command_element, false);
+                if(command != null && command.length() > 0) {
                 write(buffered_writer, command);
                 buffered_writer.newLine();
                 just_wrote_newline = false;
-                }
-            }
-            }
+                }
+            }
+            }
         }
         buffered_writer.close();
         known_metadata = null;
-        }
-        catch (Exception exception) {
+        }
+        catch (Exception exception) {
         Gatherer.println("Error in CollectionConfiguration.save(boolean): " + exception);
         Gatherer.printStackTrace(exception);
-        }
-    }
-    }
-
-    /** ************************** Private Methods ***************************/
-
-    private String classifyToString(Element command_element, boolean show_extracted_namespace) {
+        }
+    }
+    }
+
+    /** ************************** Private Methods ***************************/
+
+    private String classifyToString(Element command_element, boolean show_extracted_namespace) {
     StringBuffer text = new StringBuffer(CLASSIFY_STR);
     text.append(TAB_CHARACTER);
@@ -515 +515 @@
     int option_elements_length = option_elements.getLength();
     for(int j = 0; j < option_elements_length; j++) {
-        Element option_element = (Element) option_elements.item(j);
-        if(option_element.getAttribute(ASSIGNED_ATTRIBUTE).equals(TRUE_STR)) {
+        Element option_element = (Element) option_elements.item(j);
+        if(option_element.getAttribute(ASSIGNED_ATTRIBUTE).equals(TRUE_STR)) {
         text.append(StaticStrings.MINUS_CHARACTER);
         text.append(option_element.getAttribute(NAME_ATTRIBUTE));
         String value_str = MSMUtils.getValue(option_element);
         if(value_str.length() > 0) {
-            // If the value happens to be the identifier of an extracted metadata element, then remove the namespace.
-            if(!show_extracted_namespace && value_str.startsWith(EXTRACTED_PREFIX)) {
+            // If the value happens to be the identifier of an extracted metadata element, then remove the namespace.
+            if(!show_extracted_namespace && value_str.startsWith(EXTRACTED_PREFIX)) {
             value_str = value_str.substring(EXTRACTED_PREFIX.length());
-            }
-            text.append(SPACE_CHARACTER);
-            if(value_str.indexOf(SPACE_CHARACTER) == -1) {
+            }
+            text.append(SPACE_CHARACTER);
+            if(value_str.indexOf(SPACE_CHARACTER) == -1) {
             text.append(value_str);
-            }
-            else {
+            }
+            else {
             text.append(SPEECH_CHARACTER);
             text.append(value_str);
             text.append(SPEECH_CHARACTER);
-            }
+            }
         }
         value_str = null;
         if(j < option_elements_length - 1) {
-            text.append(SPACE_CHARACTER);
-        }
-        }
-        option_element = null;
+            text.append(SPACE_CHARACTER);
+        }
+        }
+        option_element = null;
     }
     option_elements = null;
     return text.toString();
-    }
-
-    private String formatToString(Element command_element, boolean show_extracted_namespace) {
+    }
+
+    private String formatToString(Element command_element, boolean show_extracted_namespace) {
     StringBuffer text = new StringBuffer(FORMAT_STR);
     text.append(SPACE_CHARACTER);
@@ -553 +553 @@
     String value_str = command_element.getAttribute(VALUE_ATTRIBUTE);
     if(value_str.length() != 0) {
-        text.append(value_str);
+        text.append(value_str);
     }
     else {
@@ -560 +560 @@
        // Remove any references to a namespace for extracted metadata
        if(!show_extracted_namespace) {
-          value_str.replaceAll(EXTRACTED_PREFIX, "");
+          value_str.replaceAll(EXTRACTED_PREFIX, "");
        }
        text.append(SPEECH_CHARACTER);
@@ -568 +568 @@
     value_str = null;
     return text.toString();
-    }
-
-    /** Retrieve or create the indexes Element. */
-    private Element getOrCreateElementByTagName(String name, String conditional_attribute, String required_value) {
+    }
+
+    /** Retrieve or create the indexes Element. */
+    private Element getOrCreateElementByTagName(String name, String conditional_attribute, String required_value) {
     Element document_element = document.getDocumentElement();
     NodeList elements = document_element.getElementsByTagName(name);
     int elements_length = elements.getLength();
     if(elements_length > 0) {
-        if(conditional_attribute == null) {
+        if(conditional_attribute == null) {
         document_element = null;
         return (Element) elements.item(0);
-        }
-        else {
+        }
+        else {
         for(int i = 0; i < elements_length; i++) {
-            Element element = (Element) elements.item(i);
-            if(element.getAttribute(conditional_attribute).equals(required_value)) {
+            Element element = (Element) elements.item(i);
+            if(element.getAttribute(conditional_attribute).equals(required_value)) {
             document_element = null;
             return element;
-            }
-            element = null;
-        }
-        }
+            }
+            element = null;
+        }
+        }
     }
     // Create the element
@@ -595 +595 @@
     // If there was a property set it
     if(conditional_attribute != null) {
-        element.setAttribute(conditional_attribute, required_value);
+        element.setAttribute(conditional_attribute, required_value);
     }
     Node target_node = findInsertionPoint(element);
     if(target_node != null) {
-        document_element.insertBefore(element, target_node);
+        document_element.insertBefore(element, target_node);
     }
     else {
-        document_element.appendChild(element);
+        document_element.appendChild(element);
     }
     document_element = null;
     return element;
-    }
-
-    private String indexesToString(Element command_element, boolean show_extracted_namespace) {
+    }
+
+    private String indexesToString(Element command_element, boolean show_extracted_namespace) {
     boolean comment_only = false;
     StringBuffer text = new StringBuffer("");
     if(command_element.getAttribute(ASSIGNED_ATTRIBUTE).equals(FALSE_STR)) {
-        text.append("#");
-        comment_only = true;
+        text.append("#");
+        comment_only = true;
     }
     text.append(INDEX_STR);
     text.append(TAB_CHARACTER);
     if(!comment_only) {
-        text.append(TAB_CHARACTER);
+        text.append(TAB_CHARACTER);
     }
     NodeList index_elements = command_element.getElementsByTagName(INDEX_ELEMENT);
     if (index_elements.getLength() == 0) { // no indexes
-        return "";
+        return "";
     }
     // For each index, write its level, a colon, then concatenate its child content elements into a single comma separated list
     int index_elements_length = index_elements.getLength();
     for(int j = 0; j < index_elements_length; j++) {
-        Element index_element = (Element) index_elements.item(j);
-        String level_str = index_element.getAttribute(LEVEL_ATTRIBUTE);
-        if(level_str.length() > 0) {
+        Element index_element = (Element) index_elements.item(j);
+        String level_str = index_element.getAttribute(LEVEL_ATTRIBUTE);
+        if(level_str.length() > 0) {
         text.append(level_str);
         text.append(StaticStrings.COLON_CHARACTER);
-        }
-        NodeList content_elements = index_element.getElementsByTagName(CONTENT_ELEMENT);
-        int content_elements_length = content_elements.getLength();
-        // Don't output anything if no indexes are set
-        if(content_elements_length == 0) {
+        }
+        NodeList content_elements = index_element.getElementsByTagName(CONTENT_ELEMENT);
+        int content_elements_length = content_elements.getLength();
+        // Don't output anything if no indexes are set
+        if(content_elements_length == 0) {
         return null;
-        }
-        for(int k = 0; k < content_elements_length; k++) {
+        }
+        for(int k = 0; k < content_elements_length; k++) {
         Element content_element = (Element) content_elements.item(k);
         String name_str = content_element.getAttribute(NAME_ATTRIBUTE);
         if(!show_extracted_namespace && name_str.startsWith(EXTRACTED_PREFIX)) {
-            name_str = name_str.substring(EXTRACTED_PREFIX.length());
+            name_str = name_str.substring(EXTRACTED_PREFIX.length());
         }
         text.append(name_str);
         name_str = null;
         if(k < content_elements_length - 1) {
-            text.append(StaticStrings.COMMA_CHARACTER);
+            text.append(StaticStrings.COMMA_CHARACTER);
         }
         content_element = null;
-        }
-        if(j < index_elements_length - 1) {
+        }
+        if(j < index_elements_length - 1) {
         text.append(SPACE_CHARACTER);
-        }
-        content_elements = null;
-        index_element = null;
+        }
+        content_elements = null;
+        index_element = null;
     }
     index_elements = null;
     return text.toString();
-    }
-
-    private String indexDefaultToString(Element command_element, boolean show_extracted_namespace) {
+    }
+
+    private String indexDefaultToString(Element command_element, boolean show_extracted_namespace) {
     StringBuffer text = new StringBuffer("");
     if(command_element.getAttribute(ASSIGNED_ATTRIBUTE).equals(FALSE_STR)) {
-        text.append("#");
+        text.append("#");
     }
     text.append(INDEX_DEFAULT_STR);
@@ -674 +674 @@
     int content_elements_length = content_elements.getLength();
     for(int j = 0; j < content_elements_length; j++) {
-        Element content_element = (Element) content_elements.item(j);
-        String name_str = content_element.getAttribute(NAME_ATTRIBUTE);
-        if(!show_extracted_namespace && name_str.startsWith(EXTRACTED_PREFIX)) {
+        Element content_element = (Element) content_elements.item(j);
+        String name_str = content_element.getAttribute(NAME_ATTRIBUTE);
+        if(!show_extracted_namespace && name_str.startsWith(EXTRACTED_PREFIX)) {
         name_str = name_str.substring(EXTRACTED_PREFIX.length());
-        }
-        text.append(name_str);
-        name_str = null;
-        if(j < content_elements_length - 1) {
+        }
+        text.append(name_str);
+        name_str = null;
+        if(j < content_elements_length - 1) {
         text.append(StaticStrings.COMMA_CHARACTER);
-        }
-        content_element = null;
+        }
+        content_element = null;
     }
     content_elements = null;
     return text.toString();
-    }
-
-    private String languagesToString(Element command_element) {
+    }
+
+    private String languagesToString(Element command_element) {
     StringBuffer text = new StringBuffer(LANGUAGES_STR);
     text.append(TAB_CHARACTER);
@@ -697 +697 @@
     int language_elements_length = language_elements.getLength();
     if(language_elements_length == 0) {
-        return null;
+        return null;
     }
     for(int j = 0; j < language_elements_length; j++) {
-        Element language_element = (Element) language_elements.item(j);
-        text.append(language_element.getAttribute(NAME_ATTRIBUTE));
-        if(j < language_elements_length - 1) {
+        Element language_element = (Element) language_elements.item(j);
+        text.append(language_element.getAttribute(NAME_ATTRIBUTE));
+        if(j < language_elements_length - 1) {
         text.append(SPACE_CHARACTER);
-        }
+        }
     }
     return text.toString();
-    }
-
-    private String languageDefaultToString(Element command_element) {
+    }
+
+    private String languageDefaultToString(Element command_element) {
     StringBuffer text = new StringBuffer(LANGUAGE_DEFAULT_STR);
     text.append(TAB_CHARACTER);
     text.append(command_element.getAttribute(NAME_ATTRIBUTE));
     return text.toString();
-    }
-
-    private String levelsToString(Element command_element) {
+    }
+
+    private String levelsToString(Element command_element) {
     StringBuffer text = new StringBuffer("");
     if(!command_element.getAttribute(ASSIGNED_ATTRIBUTE).equals(TRUE_STR)) {
-        text.append("#");
+        text.append("#");
     }
     text.append(LEVELS_STR);
@@ -728 +728 @@
     // Don't output anything if no levels are set.
     if(content_elements_length == 0) {
-        return null;
+        return null;
     }
     for(int i = 0; i < content_elements_length; i++) {
-        Element content_element = (Element) content_elements.item(i);
-        text.append(content_element.getAttribute(NAME_ATTRIBUTE));
-        text.append(SPACE_CHARACTER);
+        Element content_element = (Element) content_elements.item(i);
+        text.append(content_element.getAttribute(NAME_ATTRIBUTE));
+        text.append(SPACE_CHARACTER);
     }
     return text.substring(0, text.length() - 1);
-    }
-
-    static public String metadataToString(Element command_element, boolean text_value) {
+    }
+
+    static public String metadataToString(Element command_element, boolean text_value) {
     boolean special = false;
     // If there is no value attribute, then we don't write anything
@@ -745 +745 @@
     // If the name is one of the special four, we don't write the collectionmeta first. Note the maintainer collectionmeta is singled out for 'prittying' reasons.
     if(name_str.equals(COLLECTIONMETADATA_MAINTAINER_STR)) {
-        text.append(name_str);
-        text.append(TAB_CHARACTER);
-        special = true;
+        text.append(name_str);
+        text.append(TAB_CHARACTER);
+        special = true;
     }
     else if(name_str.equals(COLLECTIONMETADATA_BETA_STR) || name_str.equals(COLLECTIONMETADATA_CREATOR_STR) || name_str.equals(COLLECTIONMETADATA_PUBLIC_STR)) {
-        text.append(name_str);
-        text.append(TAB_CHARACTER);
-        text.append(TAB_CHARACTER);
-        special = true;
+        text.append(name_str);
+        text.append(TAB_CHARACTER);
+        text.append(TAB_CHARACTER);
+        special = true;
     }
     else {
-        text.append(COLLECTIONMETADATA_STR);
-        text.append(TAB_CHARACTER);
-        text.append(name_str);
-        text.append(SPACE_CHARACTER);
-        String language_str = command_element.getAttribute(LANGUAGE_ATTRIBUTE);
-        // If this is element is in english, and it is the first one found, we don't need to write the language argument.
-        //if(!language_str.equals(ENGLISH_LANGUAGE_STR) || known_metadata == null || known_metadata.contains(name_str)) {
-        // changed so that we always write the language string
-        text.append(LBRACKET_CHARACTER);
-        text.append(LANGUAGE_ARGUMENT);
-        text.append(language_str);
-        text.append(RBRACKET_CHARACTER);
-        text.append(SPACE_CHARACTER);
-        //}
-        if(known_metadata != null) {
+        text.append(COLLECTIONMETADATA_STR);
+        text.append(TAB_CHARACTER);
+        text.append(name_str);
+        text.append(SPACE_CHARACTER);
+        String language_str = command_element.getAttribute(LANGUAGE_ATTRIBUTE);
+        // If this is element is in english, and it is the first one found, we don't need to write the language argument.
+        //if(!language_str.equals(ENGLISH_LANGUAGE_STR) || known_metadata == null || known_metadata.contains(name_str)) {
+        // changed so that we always write the language string
+        text.append(LBRACKET_CHARACTER);
+        text.append(LANGUAGE_ARGUMENT);
+        text.append(language_str);
+        text.append(RBRACKET_CHARACTER);
+        text.append(SPACE_CHARACTER);
+        //}
+        if(known_metadata != null) {
         known_metadata.add(name_str);
-        }
-        language_str = null;
+        }
+        language_str = null;
     }
     name_str = null;
-    
+
     String value_str = MSMUtils.getValue(command_element);
     // The value string we retrieved will be encoded for xml, so we now decode it - to text if text_value set. This parameter was originally show_extracted_namespace, but sincethis is only true for 'toString()' commands from within the CDM, its good enough to determine if this toString() will be used to display on screen, or write to collect.cfg
     if(text_value == CollectionMeta.TEXT) {
-        value_str = Codec.transform(value_str, Codec.DOM_TO_TEXT);
+        value_str = Codec.transform(value_str, Codec.DOM_TO_TEXT);
     }
     else {
-        value_str = Codec.transform(value_str, Codec.DOM_TO_GREENSTONE);
-    }
-    
+        value_str = Codec.transform(value_str, Codec.DOM_TO_GREENSTONE);
+    }
+
     // We don't wrap the email addresses in quotes, nor the other special metadata
     if(special) {
-        text.append(value_str);
+        text.append(value_str);
     }
     else {
-        text.append(SPEECH_CHARACTER);
-        text.append(value_str);
-        text.append(SPEECH_CHARACTER);
+        text.append(SPEECH_CHARACTER);
+        text.append(value_str);
+        text.append(SPEECH_CHARACTER);
     }
     value_str = null;
     return text.toString();
-    }
-
-    /** Parse a collect.cfg into a DOM model representation. */
-    private void parse(File collect_config_file) {
-    try {
-        Element collect_cfg_element = document.getDocumentElement();
-        // Read in the file one command at a time.
-        FileReader in_reader = new FileReader(collect_config_file);
-        BufferedReader in = new BufferedReader(in_reader);
-        String command_str = null;
-        while((command_str = in.readLine()) != null) {
-        Element command_element = null;
-        // A command may be broken over several lines.
-        command_str = command_str.trim();
-        boolean eof = false;
-        while(!eof && command_str.endsWith(NEWLINE_CHARACTER)) {
-            String next_line = in.readLine();
-            if(next_line != null) {
-            next_line = next_line.trim();
-            if(next_line.length() > 0) {
-                // Remove the new line character
-                command_str = command_str.substring(0, command_str.lastIndexOf(NEWLINE_CHARACTER));
-                // And append the next line, which due to the test above must be non-zero length
-                command_str = command_str + next_line;
-            }
-            next_line = null;
-            }
-            // If we've reached the end of the file theres nothing more we can do
-            else {
-            eof = true;
-            }
-        }
-        // If there is still a new line character, then we remove it and hope for the best
-        if(command_str.endsWith(NEWLINE_CHARACTER)) {
-            command_str = command_str.substring(0, command_str.lastIndexOf(NEWLINE_CHARACTER));
-        }
-        // Now we've either got a command to parse...
-        if(command_str.length() != 0) {
-            // Start trying to figure out what it is
-            StringTokenizer tokenizer = new StringTokenizer(command_str);
-            String command_type = tokenizer.nextToken().toLowerCase();
-            tokenizer = null;
-            // Why can't you switch on strings eh? We pass it to the various subparsers who each have a bash at parsing the command. If none can parse the command, an unknown element is created
-            if(command_element == null && command_type.equals(CLASSIFY_STR)) {
-            command_element = parseClassify(command_str);
-            }
-            if(command_element == null && command_type.equals(FORMAT_STR)) {
-            command_element = parseFormat(command_str, in);
-            }
-            if(command_element == null && (command_type.equals(INDEX_STR)  || command_type.equals(COMMENTED_INDEXES_STR))) {
-            command_element = parseIndex(command_str);
-            }
-            if(command_element == null && (command_type.equals(INDEX_DEFAULT_STR) || command_type.equals(COMMENTED_INDEX_DEFAULT_STR))) {
-            command_element = parseIndexDefault(command_str);
-            }
-            if(command_element == null && command_type.equals(LANGUAGES_STR)) {
-            command_element = parseLanguage(command_str);
-            }
-            if(command_element == null && command_type.equals(LANGUAGE_DEFAULT_STR)) {
-            command_element = parseLanguageDefault(command_str);
-            }
-            if(command_element == null && (command_type.equals(LEVELS_STR) || command_type.equals(COMMENTED_LEVELS_STR))) {
-            command_element = parseLevels(command_str);
-            }
-            if(command_element == null && command_type.equals(COLLECTIONMETADATA_STR)) {
-            // collectionmeta may go over more than one line, so 
-            // pass in the reader
-            command_element = parseMetadata(command_str, in);
-            }
-            if(command_element == null && (command_type.equals(COLLECTIONMETADATA_BETA_STR) || command_type.equals(COLLECTIONMETADATA_PUBLIC_STR) || command_type.equals(COLLECTIONMETADATA_CREATOR_STR) || command_type.equals(COLLECTIONMETADATA_MAINTAINER_STR))) {
-            command_element = parseMetadataSpecial(command_str);
-            }
-            if(command_element == null && command_type.equals(PLUGIN_STR)) {
-            command_element = parsePlugIn(command_str);
-            }
-            if(command_element == null && command_type.equals(SEARCHTYPE_STR)) {
-            command_element = parseSearchType(command_str);
-            }
-            if(command_element == null && command_type.equals(SUBCOLLECTION_STR)) {
-            command_element = parseSubCollection(command_str);
-            }
-            if(command_element == null && command_type.equals(SUBCOLLECTION_DEFAULT_INDEX_STR)) {
-            command_element = parseSubCollectionDefaultIndex(command_str);
-            }
-            if(command_element == null && command_type.equals(SUBCOLLECTION_INDEX_STR)) {
-            command_element = parseSubCollectionIndex(command_str);
-            }
-            if(command_element == null && (command_type.equals(SUPERCOLLECTION_STR) || command_type.equals(CCS_STR))) {
-            command_element = parseSuperCollection(command_str);
-            }
-            // Doesn't match any known type
-            command_type = null;
-            if(command_element == null) {
+    }
+
+    /** Parse a collect.cfg into a DOM model representation. */
+    private void parse(File collect_config_file) {
+        try {
+            Element collect_cfg_element = document.getDocumentElement();
+            // Read in the file one command at a time.
+            FileReader in_reader = new FileReader(collect_config_file);
+            BufferedReader in = new BufferedReader(in_reader);
+            String command_str = null;
+            while((command_str = in.readLine()) != null) {
+                Element command_element = null;
+                // A command may be broken over several lines.
+                command_str = command_str.trim();
+                boolean eof = false;
+                while(!eof && command_str.endsWith(NEWLINE_CHARACTER)) {
+                    String next_line = in.readLine();
+                    if(next_line != null) {
+                        next_line = next_line.trim();
+                        if(next_line.length() > 0) {
+                            // Remove the new line character
+                            command_str = command_str.substring(0, command_str.lastIndexOf(NEWLINE_CHARACTER));
+                            // And append the next line, which due to the test above must be non-zero length
+                            command_str = command_str + next_line;
+                        }
+                        next_line = null;
+                    }
+                    // If we've reached the end of the file theres nothing more we can do
+                    else {
+                        eof = true;
+                    }
+                }
+                // If there is still a new line character, then we remove it and hope for the best
+                if(command_str.endsWith(NEWLINE_CHARACTER)) {
+                    command_str = command_str.substring(0, command_str.lastIndexOf(NEWLINE_CHARACTER));
+                }
+                // Now we've either got a command to parse...
+                if(command_str.length() != 0) {
+                    // Start trying to figure out what it is
+                    //StringTokenizer tokenizer = new StringTokenizer(command_str);
+                    // Instead of a standard string tokenizer I'm going to use the new version of CommandTokenizer, which is not only smart enough to correctly notice speech marks and correctly parse them out, but now also takes the input stream so it can rebuild tokens that stretch over several lines.
+                    CommandTokenizer tokenizer = new CommandTokenizer(command_str, in);
+                    String command_type = tokenizer.nextToken().toLowerCase();
+                    // Why can't you switch on strings eh? We pass it to the various subparsers who each have a bash at parsing the command. If none can parse the command, an unknown element is created
+                    if(command_element == null && command_type.equals(CLASSIFY_STR)) {
+                        command_element = parseClassify(command_str);
+                    }
+                    if(command_element == null && command_type.equals(FORMAT_STR)) {
+                        command_element = parseFormat(tokenizer); // Revised to handle multiple lines
+                    }
+                    if(command_element == null && (command_type.equals(INDEX_STR)  || command_type.equals(COMMENTED_INDEXES_STR))) {
+                        command_element = parseIndex(command_str);
+                    }
+                    if(command_element == null && (command_type.equals(INDEX_DEFAULT_STR) || command_type.equals(COMMENTED_INDEX_DEFAULT_STR))) {
+                        command_element = parseIndexDefault(command_str);
+                    }
+                    if(command_element == null && command_type.equals(LANGUAGES_STR)) {
+                        command_element = parseLanguage(command_str);
+                    }
+                    if(command_element == null && command_type.equals(LANGUAGE_DEFAULT_STR)) {
+                        command_element = parseLanguageDefault(command_str);
+                    }
+                    if(command_element == null && (command_type.equals(LEVELS_STR) || command_type.equals(COMMENTED_LEVELS_STR))) {
+                        command_element = parseLevels(command_str);
+                    }
+                    if(command_element == null && command_type.equals(COLLECTIONMETADATA_STR)) {
+                        command_element = parseMetadata(tokenizer); // Revised to handle multiple lines
+                    }
+                    if(command_element == null && (command_type.equals(COLLECTIONMETADATA_BETA_STR) || command_type.equals(COLLECTIONMETADATA_PUBLIC_STR) || command_type.equals(COLLECTIONMETADATA_CREATOR_STR) || command_type.equals(COLLECTIONMETADATA_MAINTAINER_STR))) {
+                        command_element = parseMetadataSpecial(command_str);
+                    }
+                    if(command_element == null && command_type.equals(PLUGIN_STR)) {
+                        command_element = parsePlugIn(command_str);
+                    }
+                    if(command_element == null && command_type.equals(SEARCHTYPE_STR)) {
+                        command_element = parseSearchType(command_str);
+                    }
+                    if(command_element == null && command_type.equals(SUBCOLLECTION_STR)) {
+                        command_element = parseSubCollection(command_str);
+                    }
+                    if(command_element == null && command_type.equals(SUBCOLLECTION_DEFAULT_INDEX_STR)) {
+                        command_element = parseSubCollectionDefaultIndex(command_str);
+                    }
+                    if(command_element == null && command_type.equals(SUBCOLLECTION_INDEX_STR)) {
+                        command_element = parseSubCollectionIndex(command_str);
+                    }
+                    if(command_element == null && (command_type.equals(SUPERCOLLECTION_STR) || command_type.equals(CCS_STR))) {
+                        command_element = parseSuperCollection(command_str);
+                    }
+            // Doesn't match any known type
+            command_type = null;
+            if(command_element == null) {
             // No-one knows what to do with this command, so we create an Unknown command element
             command_element = document.createElement(UNKNOWN_ELEMENT);
@@ -897 +896 @@
         // Or an empty line to remember for later
         else {
-            command_element = document.createElement(NEWLINE_ELEMENT);
+            command_element = document.createElement(NEWLINE_ELEMENT);
         }
         // Now command element shouldn't be null so we append it to the collection config DOM
         collect_cfg_element.appendChild(command_element);
-        }
+        }
     }
     catch(Exception exception) {
-        Gatherer.println("Error in CollectionConfiguration.parse(java.io.File): " + exception);
-        Gatherer.printStackTrace(exception);
-    }
-    }
-
-    private Element parseClassify(String command_str) {
+        Gatherer.println("Error in CollectionConfiguration.parse(java.io.File): " + exception);
+        Gatherer.printStackTrace(exception);
+    }
+    }
+
+    private Element parseClassify(String command_str) {
     Element command_element = null;
     try {
-        CommandTokenizer tokenizer = new CommandTokenizer(command_str);
-        // Check the token count. The token count from a command tokenizer isn't guarenteed to be correct, but it does give the maximum number of available tokens according to the underlying StringTokenizer (some of which may actually be append together by the CommandTokenizer as being a single argument).
-        if(tokenizer.countTokens() >= 2) {  // Must support "classify Phind" (no args)
+        CommandTokenizer tokenizer = new CommandTokenizer(command_str);
+        // Check the token count. The token count from a command tokenizer isn't guarenteed to be correct, but it does give the maximum number of available tokens according to the underlying StringTokenizer (some of which may actually be append together by the CommandTokenizer as being a single argument).
+        if(tokenizer.countTokens() >= 2) {  // Must support "classify Phind" (no args)
         command_element = document.createElement(CLASSIFY_ELEMENT);
         // First token is classify
@@ -925 +924 @@
         Iterator names = arguments.keySet().iterator();
         while(names.hasNext()) {
-            String name = (String) names.next();
-            String value = (String) arguments.get(name); // Can be null
-            // The metadata argument gets added as the content attribute
-            if(name.equals(METADATA_ARGUMENT) && value != null) {
+            String name = (String) names.next();
+            String value = (String) arguments.get(name); // Can be null
+            // The metadata argument gets added as the content attribute
+            if(name.equals(METADATA_ARGUMENT) && value != null) {
             // The metadata argument must be the fully qualified name of a metadata element, so if it doesn't yet have a namespace, append the extracted metadata namespace.
             if(value.indexOf(MSMUtils.NS_SEP) == -1) {
-                value = Utility.EXTRACTED_METADATA_NAMESPACE + MSMUtils.NS_SEP + value;
+                value = Utility.EXTRACTED_METADATA_NAMESPACE + MSMUtils.NS_SEP + value;
             }
             //command_element.setAttribute(CONTENT_ATTRIBUTE, value);
-            }
-            // Everything else is an Option Element
-            Element option_element = document.createElement(OPTION_ELEMENT);
-            option_element.setAttribute(NAME_ATTRIBUTE, name.substring(1));
-            if(value != null) {
+            }
+            // Everything else is an Option Element
+            Element option_element = document.createElement(OPTION_ELEMENT);
+            option_element.setAttribute(NAME_ATTRIBUTE, name.substring(1));
+            if(value != null) {
             // Remove any speech marks appended in strings containing whitespace
             if(value.startsWith(SPEECH_CHARACTER) && value.endsWith(SPEECH_CHARACTER)) {
-                value = value.substring(1, value.length() - 1);
+                value = value.substring(1, value.length() - 1);
             }
             MSMUtils.setValue(option_element, value);
-            }
-            option_element.setAttribute(ASSIGNED_ATTRIBUTE, TRUE_STR);
-            option_element.setAttribute(CUSTOM_ATTRIBUTE, TRUE_STR);
-            command_element.appendChild(option_element);
-            option_element = null;
-            name = null;
-            value = null;
+            }
+            option_element.setAttribute(ASSIGNED_ATTRIBUTE, TRUE_STR);
+            option_element.setAttribute(CUSTOM_ATTRIBUTE, TRUE_STR);
+            command_element.appendChild(option_element);
+            option_element = null;
+            name = null;
+            value = null;
         }
         names = null;
         arguments = null;
-        }
-        tokenizer = null;
+        }
+        tokenizer = null;
     }
     catch(Exception error) {
     }
     return command_element;
-    }
-
-    private Element parseFormat(String command_str, BufferedReader in) {
+    }
+
+    private Element parseFormat(CommandTokenizer tokenizer) {
+        Element command_element = null;
+        try {
+            command_element = document.createElement(FORMAT_ELEMENT);
+            String name_str = tokenizer.nextToken();
+            String value_str = tokenizer.nextToken();
+            if(name_str != null && value_str != null) {
+                command_element.setAttribute(NAME_ATTRIBUTE, name_str);
+                // If the value is true or false we add it as an attribute
+                if(value_str.equalsIgnoreCase(TRUE_STR) || value_str.equalsIgnoreCase(FALSE_STR)) {
+                    command_element.setAttribute(VALUE_ATTRIBUTE, value_str.toLowerCase());
+                }
+                // Otherwise it gets added as a text node
+                else {
+                    // Ready the value str (which can contain all sorts of funky characters) for writing as a DOM value
+                    value_str = Codec.transform(value_str, Codec.GREENSTONE_TO_DOM);
+                    MSMUtils.setValue(command_element, value_str);
+                }
+            }
+            else {
+                command_element = null;
+            }
+            name_str = null;
+            value_str = null;
+        }
+        catch (Exception exception) {
+            Gatherer.printStackTrace(exception);
+            command_element = null;
+        }
+        return command_element;
+    }
+
+    private Element parseIndex(String command_str) {
     Element command_element = null;
     try {
-        CommandTokenizer tokenizer = new CommandTokenizer(command_str);
-        if(tokenizer.countTokens() >= 3) {
-        command_element = document.createElement(FORMAT_ELEMENT);
-        // First token is format
-        tokenizer.nextToken();
-        command_element.setAttribute(NAME_ATTRIBUTE, tokenizer.nextToken());
-        String value_str = tokenizer.nextToken();
-        // If the value is true or false we add it as an attribute
-        if(value_str.equalsIgnoreCase(TRUE_STR) || value_str.equalsIgnoreCase(FALSE_STR)) {
-            command_element.setAttribute(VALUE_ATTRIBUTE, value_str.toLowerCase());
-        }
-        // Otherwise it gets added as a text node
-        else {
-
-            // now we need to handle the case where the value is enclosed in quotes (single or double) and may extend across multiple lines
-            String start_string = value_str.substring(0,1);
-            if (start_string.equals("\"") || start_string.equals("\'")) {
-            if (value_str.endsWith(start_string) && value_str.length()!=1) {
-                // we remove the quotes from the ends
-                value_str = value_str.substring(1, value_str.length() - 1);
-            } else {
-                
-                // remove the first quote
-                StringBuffer value_raw = new StringBuffer(value_str.substring(1));
-                // add the new line back in
-                value_raw.append(StaticStrings.NEW_LINE_CHAR);
-                int pos = value_raw.indexOf(start_string);
-                int old_pos = 0;
-                while (pos != -1 && value_raw.charAt(pos-1)=='\\') {
-                old_pos = pos+1;
-                pos = value_raw.indexOf(start_string, old_pos);
-                }
-                while(pos == -1) {
-                String next_line = in.readLine();
-                if(next_line != null) {
-                    value_raw.append(next_line);
-                    value_raw.append(StaticStrings.NEW_LINE_CHAR);
-                }
-                next_line = null;
-                pos = value_raw.indexOf(start_string, old_pos);
-                while (pos != -1 && value_raw.charAt(pos-1)=='\\') {
-                    old_pos = pos+1;
-                    pos = value_raw.indexOf(start_string, old_pos);
-                }
-                }
-                
-                value_str = value_raw.substring(0, value_raw.lastIndexOf(start_string));
-                value_raw = null;
-                
-            } // else
-            } // if starts with a quote
-                    
-            if(value_str != null) {
-            // Ready the value str (which can contain all sorts of funky characters) for writing as a DOM value
-            value_str = Codec.transform(value_str, Codec.GREENSTONE_TO_DOM);
-            MSMUtils.setValue(command_element, value_str);
-            }
-            else {
-            command_element = null;
-            }
-            start_string = null;
-        }
-        value_str = null;
-        
-        }
-        tokenizer = null;
-    }
-    catch (Exception exception) {
-    }
-    return command_element;
-    }
-
-    private Element parseIndex(String command_str) {
-    Element command_element = null;
-    try {
-        StringTokenizer tokenizer = new StringTokenizer(command_str);
-        String command = tokenizer.nextToken();
-        command_element = document.createElement(INDEXES_ELEMENT);
-        command_element.setAttribute(ASSIGNED_ATTRIBUTE, (command.equals(INDEX_STR) ? TRUE_STR : FALSE_STR));
-        command = null;
-        if(!tokenizer.hasMoreTokens()) {
-        
+        StringTokenizer tokenizer = new StringTokenizer(command_str);
+        String command = tokenizer.nextToken();
+        command_element = document.createElement(INDEXES_ELEMENT);
+        command_element.setAttribute(ASSIGNED_ATTRIBUTE, (command.equals(INDEX_STR) ? TRUE_STR : FALSE_STR));
+        command = null;
+        if(!tokenizer.hasMoreTokens()) {
+
         // there are no indexes
         command_element.setAttribute(ASSIGNED_ATTRIBUTE, FALSE_STR);
@@ -1052 +1008 @@
         tokenizer = null;
         return command_element;
-        }
-        
-        while(tokenizer.hasMoreTokens()) {
+        }
+
+        while(tokenizer.hasMoreTokens()) {
         Element index_element = document.createElement(INDEX_ELEMENT);
         String index_str = tokenizer.nextToken();
@@ -1060 +1016 @@
         boolean old_index;
         if(index_str.indexOf(COLON_CHARACTER) != -1) {
-            old_index = true;
-            index_element.setAttribute(LEVEL_ATTRIBUTE, index_str.substring(0, index_str.indexOf(StaticStrings.COLON_CHARACTER)));
-            index_str = index_str.substring(index_str.indexOf(StaticStrings.COLON_CHARACTER) + 1);
-            command_element.setAttribute(MGPP_ATTRIBUTE, FALSE_STR);
+            old_index = true;
+            index_element.setAttribute(LEVEL_ATTRIBUTE, index_str.substring(0, index_str.indexOf(StaticStrings.COLON_CHARACTER)));
+            index_str = index_str.substring(index_str.indexOf(StaticStrings.COLON_CHARACTER) + 1);
+            command_element.setAttribute(MGPP_ATTRIBUTE, FALSE_STR);
         }
         else {
-            command_element.setAttribute(MGPP_ATTRIBUTE, TRUE_STR);
-            old_index = false;
+            command_element.setAttribute(MGPP_ATTRIBUTE, TRUE_STR);
+            old_index = false;
         }
         StringTokenizer content_tokenizer = new StringTokenizer(index_str, StaticStrings.COMMA_CHARACTER);
         while(content_tokenizer.hasMoreTokens()) {
-            Element content_element = document.createElement(CONTENT_ELEMENT);
-            String content_str = content_tokenizer.nextToken();
-            // Since the contents of indexes have to be certain keywords, or metadata elements, if the content isn't a keyword and doesn't yet have a namespace, append the extracted metadata namespace.
-            if(content_str.indexOf(MSMUtils.NS_SEP) == -1) {
+            Element content_element = document.createElement(CONTENT_ELEMENT);
+            String content_str = content_tokenizer.nextToken();
+            // Since the contents of indexes have to be certain keywords, or metadata elements, if the content isn't a keyword and doesn't yet have a namespace, append the extracted metadata namespace.
+            if(content_str.indexOf(MSMUtils.NS_SEP) == -1) {
             if(content_str.equals(StaticStrings.TEXT_STR) || (!old_index && content_str.equals(StaticStrings.ALLFIELDS_STR))) {
-                // Our special strings are OK.
+                // Our special strings are OK.
             }
             else {
-                content_str = Utility.EXTRACTED_METADATA_NAMESPACE + MSMUtils.NS_SEP + content_str;
-            }
-            }
-            content_element.setAttribute(NAME_ATTRIBUTE, content_str);
-            index_element.appendChild(content_element);
-            content_element = null;
+                content_str = Utility.EXTRACTED_METADATA_NAMESPACE + MSMUtils.NS_SEP + content_str;
+            }
+            }
+            content_element.setAttribute(NAME_ATTRIBUTE, content_str);
+            index_element.appendChild(content_element);
+            content_element = null;
         }
         content_tokenizer = null;
@@ -1090 +1046 @@
         command_element.appendChild(index_element);
         index_element = null;
-        }
-        tokenizer = null;
+        }
+        tokenizer = null;
     }
     catch (Exception exception) {
-        exception.printStackTrace();
+        exception.printStackTrace();
     }
     return command_element;
-    }
-
-    private Element parseIndexDefault(String command_str) {
+    }
+
+    private Element parseIndexDefault(String command_str) {
     Element command_element = null;
     try {
-        StringTokenizer tokenizer = new StringTokenizer(command_str);
-        if(tokenizer.countTokens() >= 2) {
+        StringTokenizer tokenizer = new StringTokenizer(command_str);
+        if(tokenizer.countTokens() >= 2) {
         command_element = document.createElement(INDEX_DEFAULT_ELEMENT);
         command_element.setAttribute(ASSIGNED_ATTRIBUTE, ((tokenizer.nextToken()).equals(INDEX_DEFAULT_STR) ? TRUE_STR : FALSE_STR));
@@ -1111 +1067 @@
         StringTokenizer content_tokenizer = new StringTokenizer(content_str, StaticStrings.COMMA_CHARACTER);
         while(content_tokenizer.hasMoreTokens()) {
-            Element content_element = document.createElement(CONTENT_ELEMENT);
-            content_element.setAttribute(NAME_ATTRIBUTE, content_tokenizer.nextToken());
-            command_element.appendChild(content_element);
-            content_element = null;
+            Element content_element = document.createElement(CONTENT_ELEMENT);
+            content_element.setAttribute(NAME_ATTRIBUTE, content_tokenizer.nextToken());
+            command_element.appendChild(content_element);
+            content_element = null;
         }
         content_tokenizer = null;
@@ -1120 +1076 @@
         content_str = null;
         index_str = null;
-        }
-        tokenizer = null;
+        }
+        tokenizer = null;
     }
     catch (Exception exception) {
     }
     return command_element;
-    }
-
-    private Element parseLanguage(String command_str) {
+    }
+
+    private Element parseLanguage(String command_str) {
     Element command_element = null;
     try {
-        StringTokenizer tokenizer = new StringTokenizer(command_str);
-        tokenizer.nextToken();
-        if(tokenizer.hasMoreTokens()) {
+        StringTokenizer tokenizer = new StringTokenizer(command_str);
+        tokenizer.nextToken();
+        if(tokenizer.hasMoreTokens()) {
         command_element = document.createElement(LANGUAGES_ELEMENT);
         while(tokenizer.hasMoreTokens()) {
-            Element language_element = document.createElement(LANGUAGE_ELEMENT);
-            language_element.setAttribute(NAME_ATTRIBUTE, tokenizer.nextToken());
-            command_element.appendChild(language_element);
-            language_element = null;
-        }
-        }
-        tokenizer = null;
+            Element language_element = document.createElement(LANGUAGE_ELEMENT);
+            language_element.setAttribute(NAME_ATTRIBUTE, tokenizer.nextToken());
+            command_element.appendChild(language_element);
+            language_element = null;
+        }
+        }
+        tokenizer = null;
     }
     catch (Exception exception) {
     }
     return command_element;
-    }
-
-    private Element parseLanguageDefault(String command_str) {
+    }
+
+    private Element parseLanguageDefault(String command_str) {
     Element command_element = null;
     try {
-        StringTokenizer tokenizer = new StringTokenizer(command_str);
-        if(tokenizer.countTokens() >= 2) {
+        StringTokenizer tokenizer = new StringTokenizer(command_str);
+        if(tokenizer.countTokens() >= 2) {
         command_element = document.createElement(LANGUAGE_DEFAULT_ELEMENT);
         tokenizer.nextToken();
@@ -1160 +1116 @@
         command_element.setAttribute(ASSIGNED_ATTRIBUTE, StaticStrings.TRUE_STR);
         default_language_str = null;
-        }
-        tokenizer = null;
+        }
+        tokenizer = null;
     }
     catch (Exception exception) {
     }
     return command_element;
-    }
-
-    private Element parseLevels(String command_str) {
+    }
+
+    private Element parseLevels(String command_str) {
     Element command_element = null;
     try {
-        StringTokenizer tokenizer = new StringTokenizer(command_str);
-        // First token is command type (levels)
-        String command = tokenizer.nextToken();
-        if(tokenizer.hasMoreTokens()) {
+        StringTokenizer tokenizer = new StringTokenizer(command_str);
+        // First token is command type (levels)
+        String command = tokenizer.nextToken();
+        if(tokenizer.hasMoreTokens()) {
         command_element = document.createElement(LEVELS_ELEMENT);
         command_element.setAttribute(ASSIGNED_ATTRIBUTE, (command.equals(LEVELS_STR) ? TRUE_STR : FALSE_STR));
         while(tokenizer.hasMoreTokens()) {
-            Element level_element = document.createElement(CONTENT_ELEMENT);
-            level_element.setAttribute(NAME_ATTRIBUTE, tokenizer.nextToken());
-            command_element.appendChild(level_element);
-            level_element = null;
-        }
-        }
-        command = null;
+            Element level_element = document.createElement(CONTENT_ELEMENT);
+            level_element.setAttribute(NAME_ATTRIBUTE, tokenizer.nextToken());
+            command_element.appendChild(level_element);
+            level_element = null;
+        }
+        }
+        command = null;
     }
     catch(Exception exception) {
     }
     return command_element;
-    }
-
-    private Element parseMetadata(String command_str, BufferedReader in) {
+    }
+
+    private Element parseMetadata(CommandTokenizer tokenizer) {
+        Element command_element = null;
+        try {
+            command_element = document.createElement(COLLECTIONMETADATA_ELEMENT);
+            String name_str = tokenizer.nextToken();
+            String value_str = tokenizer.nextToken();
+            if(name_str != null && value_str != null) {
+                String language_str = "en"; // By default - why do we assume English???
+                // Check if the value string is actually a language string
+                if(value_str.startsWith(LBRACKET_CHARACTER) && value_str.endsWith(RBRACKET_CHARACTER)) {
+                    language_str = value_str.substring(value_str.indexOf(LANGUAGE_ARGUMENT) + 2, value_str.length() - 1);
+                    value_str = tokenizer.nextToken();
+                }
+                if(value_str != null) {
+                    // Ready the value str (which can contain all sorts of funky characters) for writing as a DOM value
+                    value_str = Codec.transform(value_str, Codec.GREENSTONE_TO_DOM);
+                    command_element.setAttribute(NAME_ATTRIBUTE, name_str);
+                    command_element.setAttribute(LANGUAGE_ATTRIBUTE, language_str);
+                    command_element.setAttribute(ASSIGNED_ATTRIBUTE, TRUE_STR);
+                    MSMUtils.setValue(command_element, value_str);
+                }
+                else {
+                    command_element = null;
+                }
+                language_str = null;
+            }
+            else {
+                command_element = null;
+            }
+            name_str = null;
+            value_str = null;
+        }
+        catch (Exception exception) {
+            Gatherer.printStackTrace(exception);
+            command_element = null;
+        }
+        return command_element;
+    }
+
+    private Element parseMetadataSpecial(String command_str) {
     Element command_element = null;
     try {
-        CommandTokenizer tokenizer = new CommandTokenizer(command_str);
-        if(tokenizer.countTokens() >= 3) {
-        command_element = document.createElement(COLLECTIONMETADATA_ELEMENT);
-        // First token is command type
-        tokenizer.nextToken();
-        String name_str = tokenizer.nextToken();
-        String value_str = tokenizer.nextToken();
-        String language_str = "en"; // By default - why do we assume English???
-        // Check if the value string is actually a language string
-        if(value_str.startsWith(LBRACKET_CHARACTER) && value_str.endsWith(RBRACKET_CHARACTER)) {
-            language_str = value_str.substring(value_str.indexOf(LANGUAGE_ARGUMENT) + 2, value_str.length() - 1);
-            value_str = tokenizer.nextToken();
-        }
-
-        // now we need to handle the case where the value is enclosed in quotes (single or double) and may extend across multiple lines
-        String start_string = value_str.substring(0,1);
-        if (start_string.equals("\"") || start_string.equals("\'")) {
-
-            if (value_str.endsWith(start_string) && value_str.length()!=1) {
-            // we remove the quotes from the ends
-            value_str = value_str.substring(1, value_str.length() - 1);
-            } else {
-            
-            // remove the first quote
-            StringBuffer value_raw = new StringBuffer(value_str.substring(1));
-            // add the new line back in
-            value_raw.append(StaticStrings.NEW_LINE_CHAR);
-
-            int pos = value_raw.indexOf(start_string);
-            int old_pos = 0;
-            while (pos != -1 && value_raw.charAt(pos-1)=='\\') {
-                old_pos = pos+1;
-                pos = value_raw.indexOf(start_string, old_pos);
-            }
-            while(pos == -1) {
-                String next_line = in.readLine();
-                if(next_line != null) {
-                value_raw.append(next_line);
-                value_raw.append(StaticStrings.NEW_LINE_CHAR);
-                }
-                next_line = null;
-                pos = value_raw.indexOf(start_string, old_pos);
-                while (pos != -1 && value_raw.charAt(pos-1)=='\\') {
-                old_pos = pos+1;
-                pos = value_raw.indexOf(start_string, old_pos);
-                }
-            }
-            
-            value_str = value_raw.substring(0, value_raw.lastIndexOf(start_string));
-            value_raw = null;
-            
-            } // else
-        } // if starts with a quote
-                    
-        if(value_str != null) {
-            // Ready the value str (which can contain all sorts of funky characters) for writing as a DOM value
-            value_str = Codec.transform(value_str, Codec.GREENSTONE_TO_DOM);
-            command_element.setAttribute(NAME_ATTRIBUTE, name_str);
-            command_element.setAttribute(LANGUAGE_ATTRIBUTE, language_str);
-            command_element.setAttribute(ASSIGNED_ATTRIBUTE, TRUE_STR);
-            MSMUtils.setValue(command_element, value_str);
-        }
-        else {
-            command_element = null;
-        }
-        language_str = null;
-        value_str = null;
-        name_str = null;
-        }
-        tokenizer = null;
-    }
-    catch (Exception exception) {
-    }
-    return command_element;
-    }
-
-    private Element parseMetadataSpecial(String command_str) {
-    Element command_element = null;
-    try {
-        StringTokenizer tokenizer = new StringTokenizer(command_str);
-        if(tokenizer.countTokens() >= 2) {
+        StringTokenizer tokenizer = new StringTokenizer(command_str);
+        if(tokenizer.countTokens() >= 2) {
         String name_str = tokenizer.nextToken();
         String value_str = tokenizer.nextToken();
         if(name_str.equals(COLLECTIONMETADATA_BETA_STR)) {
-            command_element = document.createElement(COLLECTIONMETADATA_BETA_ELEMENT);
+            command_element = document.createElement(COLLECTIONMETADATA_BETA_ELEMENT);
         }
         else if(name_str.equals(COLLECTIONMETADATA_CREATOR_STR)) {
-            command_element = document.createElement(COLLECTIONMETADATA_CREATOR_ELEMENT);
+            command_element = document.createElement(COLLECTIONMETADATA_CREATOR_ELEMENT);
         }
         else if(name_str.equals(COLLECTIONMETADATA_MAINTAINER_STR)) {
-            command_element = document.createElement(COLLECTIONMETADATA_MAINTAINER_ELEMENT);
+            command_element = document.createElement(COLLECTIONMETADATA_MAINTAINER_ELEMENT);
         }
         else if(name_str.equals(COLLECTIONMETADATA_PUBLIC_STR)) {
-            command_element = document.createElement(COLLECTIONMETADATA_PUBLIC_ELEMENT);
+            command_element = document.createElement(COLLECTIONMETADATA_PUBLIC_ELEMENT);
         }
         if(command_element != null) {
-            command_element.setAttribute(NAME_ATTRIBUTE, name_str);
-            command_element.setAttribute(LANGUAGE_ATTRIBUTE, ENGLISH_LANGUAGE_STR);
-            command_element.setAttribute(SPECIAL_ATTRIBUTE, TRUE_STR);
-            command_element.setAttribute(ASSIGNED_ATTRIBUTE, TRUE_STR);
-            if(value_str.startsWith(SPEECH_CHARACTER) && value_str.endsWith(SPEECH_CHARACTER)) {
+            command_element.setAttribute(NAME_ATTRIBUTE, name_str);
+            command_element.setAttribute(LANGUAGE_ATTRIBUTE, ENGLISH_LANGUAGE_STR);
+            command_element.setAttribute(SPECIAL_ATTRIBUTE, TRUE_STR);
+            command_element.setAttribute(ASSIGNED_ATTRIBUTE, TRUE_STR);
+            if(value_str.startsWith(SPEECH_CHARACTER) && value_str.endsWith(SPEECH_CHARACTER)) {
             value_str = value_str.substring(1, value_str.length() - 1);
-            }
-            MSMUtils.setValue(command_element, value_str);
+            }
+            MSMUtils.setValue(command_element, value_str);
         }
         value_str = null;
         name_str = null;
-        }
-        tokenizer = null;
+        }
+        tokenizer = null;
     }
     catch (Exception exception) {
     }
     return command_element;
-    }
-
-    private Element parsePlugIn(String command_str) {
+    }
+
+    private Element parsePlugIn(String command_str) {
     Element command_element = null;
     boolean use_metadata_files = false;
     boolean show_progress = false;
     try {
-        CommandTokenizer tokenizer = new CommandTokenizer(command_str);
-        // Check the token count. The token count from a command tokenizer isn't guarenteed to be correct, but it does give the maximum number of available tokens according to the underlying StringTokenizer (some of which may actually be append together by the CommandTokenizer as being a single argument).
-        if(tokenizer.countTokens() >= 2) {
+        CommandTokenizer tokenizer = new CommandTokenizer(command_str);
+        // Check the token count. The token count from a command tokenizer isn't guarenteed to be correct, but it does give the maximum number of available tokens according to the underlying StringTokenizer (some of which may actually be append together by the CommandTokenizer as being a single argument).
+        if(tokenizer.countTokens() >= 2) {
         command_element = document.createElement(PLUGIN_ELEMENT);
         // First token is plugin
@@ -1328 +1244 @@
         Iterator names = arguments.keySet().iterator();
         while(names.hasNext()) {
-            String name = (String) names.next();
-            String value = (String) arguments.get(name); // Can be null
-            Element option_element = document.createElement(OPTION_ELEMENT);
-            if(name.substring(1).equals(USE_METADATA_FILES_ARGUMENT)) {
+            String name = (String) names.next();
+            String value = (String) arguments.get(name); // Can be null
+            Element option_element = document.createElement(OPTION_ELEMENT);
+            if(name.substring(1).equals(USE_METADATA_FILES_ARGUMENT)) {
             use_metadata_files = true;
-            }
-            else if(name.substring(1).equals(SHOW_PROGRESS_ARGUMENT)) {
-               show_progress = true;
-            }
-            option_element.setAttribute(NAME_ATTRIBUTE, name.substring(1));
-            option_element.setAttribute(ASSIGNED_ATTRIBUTE, TRUE_STR);
-            option_element.setAttribute(CUSTOM_ATTRIBUTE, TRUE_STR); // All arguments are considered to be custom until matched against base plugins arguments
-            if(value != null) {
+            }
+            else if(name.substring(1).equals(SHOW_PROGRESS_ARGUMENT)) {
+               show_progress = true;
+            }
+            option_element.setAttribute(NAME_ATTRIBUTE, name.substring(1));
+            option_element.setAttribute(ASSIGNED_ATTRIBUTE, TRUE_STR);
+            option_element.setAttribute(CUSTOM_ATTRIBUTE, TRUE_STR); // All arguments are considered to be custom until matched against base plugins arguments
+            if(value != null) {
             // Remove any speech marks appended in strings containing whitespace
             if(value.startsWith(SPEECH_CHARACTER) && value.endsWith(SPEECH_CHARACTER)) {
-                value = value.substring(1, value.length() - 1);
+                value = value.substring(1, value.length() - 1);
             }
             if(name.equals(METADATA_ARGUMENT)) {
-                // The metadata argument must be the fully qualified name of a metadata element, so if it doesn't yet have a namespace, append the extracted metadata namespace.
-                if(value.indexOf(MSMUtils.NS_SEP) == -1) {
+                // The metadata argument must be the fully qualified name of a metadata element, so if it doesn't yet have a namespace, append the extracted metadata namespace.
+                if(value.indexOf(MSMUtils.NS_SEP) == -1) {
                 value = Utility.EXTRACTED_METADATA_NAMESPACE + MSMUtils.NS_SEP + value;
-                }
+                }
             }
             MSMUtils.setValue(option_element, value);
-            }
-            command_element.appendChild(option_element);
-            option_element = null;
-            name = null;
-            value = null;
+            }
+            command_element.appendChild(option_element);
+            option_element = null;
+            name = null;
+            value = null;
         }
 
         // We must have some RecPlug options: use_metadata_files, and show_progress
         if (type.equals(RECPLUG_STR)) {
-            if (!use_metadata_files) {
+            if (!use_metadata_files) {
             Element option_element = document.createElement(OPTION_ELEMENT);
             option_element.setAttribute(NAME_ATTRIBUTE, USE_METADATA_FILES_ARGUMENT);
@@ -1368 +1284 @@
             command_element.appendChild(option_element);
             option_element = null;
-            }
-            if(!show_progress) {
-               Element option_element = document.createElement(OPTION_ELEMENT);
-               option_element.setAttribute(NAME_ATTRIBUTE, SHOW_PROGRESS_ARGUMENT);
-               option_element.setAttribute(ASSIGNED_ATTRIBUTE, TRUE_STR);
-               option_element.setAttribute(CUSTOM_ATTRIBUTE, TRUE_STR);
-               command_element.appendChild(option_element);
-               option_element = null;
-            }
+            }
+            if(!show_progress) {
+               Element option_element = document.createElement(OPTION_ELEMENT);
+               option_element.setAttribute(NAME_ATTRIBUTE, SHOW_PROGRESS_ARGUMENT);
+               option_element.setAttribute(ASSIGNED_ATTRIBUTE, TRUE_STR);
+               option_element.setAttribute(CUSTOM_ATTRIBUTE, TRUE_STR);
+               command_element.appendChild(option_element);
+               option_element = null;
+            }
         }
         type = null;
         names = null;
         arguments = null;
-        }
-        tokenizer = null;
+        }
+        tokenizer = null;
     }
     catch(Exception exception) {
     }
     return command_element;
-    }
-
-    private Element parseSearchType(String command_str) {
+    }
+
+    private Element parseSearchType(String command_str) {
     Element command_element = null;
     try {
-        StringTokenizer tokenizer = new StringTokenizer(command_str);
-        // First token is command type (levels)
-        tokenizer.nextToken();
-        if(tokenizer.hasMoreTokens()) {
+        StringTokenizer tokenizer = new StringTokenizer(command_str);
+        // First token is command type (levels)
+        tokenizer.nextToken();
+        if(tokenizer.hasMoreTokens()) {
         command_element = document.createElement(SEARCHTYPE_ELEMENT);
         command_element.setAttribute(ASSIGNED_ATTRIBUTE, TRUE_STR);
         while(tokenizer.hasMoreTokens()) {
-            Element search_element = document.createElement(CONTENT_ELEMENT);
-            search_element.setAttribute(NAME_ATTRIBUTE, tokenizer.nextToken());
-            command_element.appendChild(search_element);
-            search_element = null;
-        }
-        }
+            Element search_element = document.createElement(CONTENT_ELEMENT);
+            search_element.setAttribute(NAME_ATTRIBUTE, tokenizer.nextToken());
+            command_element.appendChild(search_element);
+            search_element = null;
+        }
+        }
     }
     catch(Exception exception) {
     }
     return command_element;
-    }
-
-    private Element parseSubCollection(String command_str) {
+    }
+
+    private Element parseSubCollection(String command_str) {
     Element command_element = null;
     try {
-        CommandTokenizer tokenizer = new CommandTokenizer(command_str);
-        if(tokenizer.countTokens() >= 3) {
+        CommandTokenizer tokenizer = new CommandTokenizer(command_str);
+        if(tokenizer.countTokens() >= 3) {
         command_element = document.createElement(SUBCOLLECTION_ELEMENT);
         // First token is command type
@@ -1427 +1343 @@
         // Set inclusion/exclusion flag, remove any exclaimation mark and the speech marks
         if(exclusion) {
-            full_pattern_str = full_pattern_str.substring(2, full_pattern_str.length() - 1);
-            command_element.setAttribute(TYPE_ATTRIBUTE, EXCLUDE_STR);
+            full_pattern_str = full_pattern_str.substring(2, full_pattern_str.length() - 1);
+            command_element.setAttribute(TYPE_ATTRIBUTE, EXCLUDE_STR);
         }
         else {
-            full_pattern_str = full_pattern_str.substring(1, full_pattern_str.length() - 1);
-            command_element.setAttribute(TYPE_ATTRIBUTE, INCLUDE_STR);
+            full_pattern_str = full_pattern_str.substring(1, full_pattern_str.length() - 1);
+            command_element.setAttribute(TYPE_ATTRIBUTE, INCLUDE_STR);
         }
         StringTokenizer pattern_tokenizer = new StringTokenizer(full_pattern_str, SEPARATOR_CHARACTER);
         if(pattern_tokenizer.countTokens() >= 2) {
-            String content_str = pattern_tokenizer.nextToken();
-            // Since the contents of indexes have to be certain keywords, or metadata elements, if the content isn't a keyword and doesn't yet have a namespace, append the extracted metadata namespace.
-            if(!content_str.equals(StaticStrings.FILENAME_STR) && content_str.indexOf(MSMUtils.NS_SEP) == -1) {
+            String content_str = pattern_tokenizer.nextToken();
+            // Since the contents of indexes have to be certain keywords, or metadata elements, if the content isn't a keyword and doesn't yet have a namespace, append the extracted metadata namespace.
+            if(!content_str.equals(StaticStrings.FILENAME_STR) && content_str.indexOf(MSMUtils.NS_SEP) == -1) {
             content_str = Utility.EXTRACTED_METADATA_NAMESPACE + MSMUtils.NS_SEP + content_str;
-            }
-            command_element.setAttribute(CONTENT_ATTRIBUTE, content_str);
-            MSMUtils.setValue(command_element, pattern_tokenizer.nextToken());
-            if(pattern_tokenizer.hasMoreTokens()) {
+            }
+            command_element.setAttribute(CONTENT_ATTRIBUTE, content_str);
+            MSMUtils.setValue(command_element, pattern_tokenizer.nextToken());
+            if(pattern_tokenizer.hasMoreTokens()) {
             command_element.setAttribute(OPTIONS_ATTRIBUTE, pattern_tokenizer.nextToken());
-            }
+            }
         }
         pattern_tokenizer = null;
-        }
+        }
     }
     catch(Exception exception) {
-        exception.printStackTrace();
+        exception.printStackTrace();
     }
     return command_element;
-    }
-
-    private Element parseSubCollectionDefaultIndex(String command_str) {
+    }
+
+    private Element parseSubCollectionDefaultIndex(String command_str) {
     Element command_element = null;
     try {
-        StringTokenizer tokenizer = new StringTokenizer(command_str);
-        if(tokenizer.countTokens() == 2) {
+        StringTokenizer tokenizer = new StringTokenizer(command_str);
+        if(tokenizer.countTokens() == 2) {
         command_element = document.createElement(SUBCOLLECTION_DEFAULT_INDEX_ELEMENT);
         tokenizer.nextToken();
@@ -1467 +1383 @@
         StringTokenizer content_tokenizer = new StringTokenizer(content_str, StaticStrings.COMMA_CHARACTER);
         while(content_tokenizer.hasMoreTokens()) {
-            Element content_element = document.createElement(CONTENT_ELEMENT);
-            content_element.setAttribute(NAME_ATTRIBUTE, content_tokenizer.nextToken());
-            command_element.appendChild(content_element);
-            content_element = null;
+            Element content_element = document.createElement(CONTENT_ELEMENT);
+            content_element.setAttribute(NAME_ATTRIBUTE, content_tokenizer.nextToken());
+            command_element.appendChild(content_element);
+            content_element = null;
         }
         content_tokenizer = null;
         content_str = null;
-        }
-        tokenizer = null;
+        }
+        tokenizer = null;
     }
     catch(Exception exception) {
     }
     return command_element;
-    }
-
-    private Element parseSubCollectionIndex(String command_str) {
+    }
+
+    private Element parseSubCollectionIndex(String command_str) {
     Element command_element = null;
     try {
-        StringTokenizer tokenizer = new StringTokenizer(command_str);
-        tokenizer.nextToken();
-        if(tokenizer.hasMoreTokens()) {
+        StringTokenizer tokenizer = new StringTokenizer(command_str);
+        tokenizer.nextToken();
+        if(tokenizer.hasMoreTokens()) {
         command_element = document.createElement(SUBCOLLECTION_INDEXES_ELEMENT);
-        }
-        while(tokenizer.hasMoreTokens()) {
+        }
+        while(tokenizer.hasMoreTokens()) {
         Element subcollectionindex_element = document.createElement(INDEX_ELEMENT);
         //command_element.setAttribute(CONTENT_ATTRIBUTE, tokenizer.nextToken());
@@ -1496 +1412 @@
         StringTokenizer content_tokenizer = new StringTokenizer(content_str, StaticStrings.COMMA_CHARACTER);
         while(content_tokenizer.hasMoreTokens()) {
-            Element content_element = document.createElement(CONTENT_ELEMENT);
-            content_element.setAttribute(NAME_ATTRIBUTE, content_tokenizer.nextToken());
-            subcollectionindex_element.appendChild(content_element);
-            content_element = null;
+            Element content_element = document.createElement(CONTENT_ELEMENT);
+            content_element.setAttribute(NAME_ATTRIBUTE, content_tokenizer.nextToken());
+            subcollectionindex_element.appendChild(content_element);
+            content_element = null;
         }
         content_tokenizer = null;
@@ -1505 +1421 @@
         command_element.appendChild(subcollectionindex_element);
         subcollectionindex_element = null;
-        }
-        tokenizer = null;
+        }
+        tokenizer = null;
     }
     catch (Exception exception) {
     }
     return command_element;
-    }
-
-    private Element parseSuperCollection(String command_str) {
+    }
+
+    private Element parseSuperCollection(String command_str) {
     Element command_element = null;
     try {
-        StringTokenizer tokenizer = new StringTokenizer(command_str);
-        if(tokenizer.countTokens() >= 3) {
+        StringTokenizer tokenizer = new StringTokenizer(command_str);
+        if(tokenizer.countTokens() >= 3) {
         command_element = document.createElement(SUPERCOLLECTION_ELEMENT);
         tokenizer.nextToken();
         while(tokenizer.hasMoreTokens()) {
-            Element collection_element = document.createElement(COLLECTION_ELEMENT);
-            collection_element.setAttribute(NAME_ATTRIBUTE, tokenizer.nextToken());
-            command_element.appendChild(collection_element);
-            collection_element = null;
-        }
-        }
-        tokenizer = null;
+            Element collection_element = document.createElement(COLLECTION_ELEMENT);
+            collection_element.setAttribute(NAME_ATTRIBUTE, tokenizer.nextToken());
+            command_element.appendChild(collection_element);
+            collection_element = null;
+        }
+        }
+        tokenizer = null;
     }
     catch(Exception exception) {
     }
     return command_element;
-    }
-
-    private String pluginToString(Element command_element, boolean show_extracted_namespace) {
+    }
+
+    private String pluginToString(Element command_element, boolean show_extracted_namespace) {
     StringBuffer text = new StringBuffer();
     if(!command_element.getAttribute(SEPARATOR_ATTRIBUTE).equals(TRUE_STR)) {
-        text.append(PLUGIN_STR);
-        text.append(TAB_CHARACTER);
-        text.append(TAB_CHARACTER);
-        text.append(command_element.getAttribute(TYPE_ATTRIBUTE));
-        // Retrieve, and output, the arguments
-        NodeList option_elements = command_element.getElementsByTagName(OPTION_ELEMENT);
-        int option_elements_length = option_elements.getLength();
-        if(option_elements_length > 0) {
+        text.append(PLUGIN_STR);
+        text.append(TAB_CHARACTER);
+        text.append(TAB_CHARACTER);
+        text.append(command_element.getAttribute(TYPE_ATTRIBUTE));
+        // Retrieve, and output, the arguments
+        NodeList option_elements = command_element.getElementsByTagName(OPTION_ELEMENT);
+        int option_elements_length = option_elements.getLength();
+        if(option_elements_length > 0) {
         text.append(SPACE_CHARACTER);
         for(int j = 0; j < option_elements_length; j++) {
-            Element option_element = (Element) option_elements.item(j);
-            if(option_element.getAttribute(ASSIGNED_ATTRIBUTE).equals(TRUE_STR)) {
+            Element option_element = (Element) option_elements.item(j);
+            if(option_element.getAttribute(ASSIGNED_ATTRIBUTE).equals(TRUE_STR)) {
             text.append(StaticStrings.MINUS_CHARACTER);
             text.append(option_element.getAttribute(NAME_ATTRIBUTE));
             String value_str = MSMUtils.getValue(option_element);
             if(!show_extracted_namespace && value_str.startsWith(EXTRACTED_PREFIX)) {
-                value_str = value_str.substring(EXTRACTED_PREFIX.length());
+                value_str = value_str.substring(EXTRACTED_PREFIX.length());
             }
             if(value_str.length() > 0) {
-                text.append(SPACE_CHARACTER);
-                if(value_str.indexOf(SPACE_CHARACTER) == -1) {
+                text.append(SPACE_CHARACTER);
+                if(value_str.indexOf(SPACE_CHARACTER) == -1) {
                 text.append(value_str);
-                }
-                else {
+                }
+                else {
                 text.append(SPEECH_CHARACTER);
                 text.append(value_str);
                 text.append(SPEECH_CHARACTER);
-                }
+                }
             }
             value_str = null;
             if(j < option_elements_length - 1) {
-                text.append(SPACE_CHARACTER);
-            }
-            }
-            option_element = null;
-        }
-        }
-        option_elements = null;
+                text.append(SPACE_CHARACTER);
+            }
+            }
+            option_element = null;
+        }
+        }
+        option_elements = null;
     }
     return text.toString();
-    }
-
-    private String searchtypeToString(Element command_element) {
+    }
+
+    private String searchtypeToString(Element command_element) {
     if(command_element.getAttribute(ASSIGNED_ATTRIBUTE).equals(TRUE_STR)) {
-        StringBuffer text = new StringBuffer(SEARCHTYPE_STR);
-        text.append(TAB_CHARACTER);
-        NodeList search_elements = command_element.getElementsByTagName(CONTENT_ELEMENT);
-        int search_elements_length = search_elements.getLength();
-        for(int i = 0; i < search_elements_length; i++) {
+        StringBuffer text = new StringBuffer(SEARCHTYPE_STR);
+        text.append(TAB_CHARACTER);
+        NodeList search_elements = command_element.getElementsByTagName(CONTENT_ELEMENT);
+        int search_elements_length = search_elements.getLength();
+        for(int i = 0; i < search_elements_length; i++) {
         Element search_element = (Element) search_elements.item(i);
         text.append(search_element.getAttribute(NAME_ATTRIBUTE));
         text.append(SPACE_CHARACTER);
-        }
-        return text.substring(0, text.length() - 1);
+        }
+        return text.substring(0, text.length() - 1);
     }
     else {
-        return null;
-    }
-    }
-
-    private String subcollectionToString(Element command_element, boolean show_extracted_namespace) {
+        return null;
+    }
+    }
+
+    private String subcollectionToString(Element command_element, boolean show_extracted_namespace) {
     StringBuffer text = new StringBuffer(SUBCOLLECTION_STR);
     text.append(SPACE_CHARACTER);
@@ -1605 +1521 @@
     text.append(SPEECH_CHARACTER);
     if(command_element.getAttribute(TYPE_ATTRIBUTE).equals(EXCLUDE_STR)) {
-        text.append(EXCLAIMATION_CHARACTER);
+        text.append(EXCLAIMATION_CHARACTER);
     }
     String content_str = command_element.getAttribute(CONTENT_ATTRIBUTE);
     if(!show_extracted_namespace && content_str.startsWith(EXTRACTED_PREFIX)) {
-        content_str = content_str.substring(EXTRACTED_PREFIX.length());
+        content_str = content_str.substring(EXTRACTED_PREFIX.length());
     }
     text.append(content_str);
@@ -1618 +1534 @@
     String options_str = command_element.getAttribute(OPTIONS_ATTRIBUTE);
     if(options_str.length() > 0) {
-        text.append(options_str);
+        text.append(options_str);
     }
     options_str = null;
     text.append(SPEECH_CHARACTER);
     return text.toString();
-    }
-
-    private String subcollectionDefaultIndexToString(Element command_element) {
+    }
+
+    private String subcollectionDefaultIndexToString(Element command_element) {
     StringBuffer text = new StringBuffer(SUBCOLLECTION_DEFAULT_INDEX_STR);
     text.append(TAB_CHARACTER);
@@ -1631 +1547 @@
     int content_elements_length = content_elements.getLength();
     for(int j = 0; j < content_elements_length; j++) {
-        Element content_element = (Element) content_elements.item(j);
-        text.append(content_element.getAttribute(NAME_ATTRIBUTE));
-        if(j < content_elements_length - 1) {
+        Element content_element = (Element) content_elements.item(j);
+        text.append(content_element.getAttribute(NAME_ATTRIBUTE));
+        if(j < content_elements_length - 1) {
         text.append(StaticStrings.COMMA_CHARACTER);
-        }
+        }
     }
     return text.toString();
-    }
-
-    private String subcollectionIndexesToString(Element command_element) {
+    }
+
+    private String subcollectionIndexesToString(Element command_element) {
     StringBuffer text = new StringBuffer(SUBCOLLECTION_INDEX_STR);
     text.append(TAB_CHARACTER);
@@ -1647 +1563 @@
     int subcollectionindex_elements_length = subcollectionindex_elements.getLength();
     if(subcollectionindex_elements_length == 0) {
-        return null;
+        return null;
     }
     for(int j = 0; j < subcollectionindex_elements_length; j++) {
-        Element subcollectionindex_element = (Element) subcollectionindex_elements.item(j);
-        NodeList content_elements = subcollectionindex_element.getElementsByTagName(CONTENT_ELEMENT);
-        int content_elements_length = content_elements.getLength();
-        for(int k = 0; k < content_elements_length; k++) {
+        Element subcollectionindex_element = (Element) subcollectionindex_elements.item(j);
+        NodeList content_elements = subcollectionindex_element.getElementsByTagName(CONTENT_ELEMENT);
+        int content_elements_length = content_elements.getLength();
+        for(int k = 0; k < content_elements_length; k++) {
         Element content_element = (Element) content_elements.item(k);
         text.append(content_element.getAttribute(NAME_ATTRIBUTE));
         if(k < content_elements_length - 1) {
-            text.append(StaticStrings.COMMA_CHARACTER);
-        }
-        }
-        if(j < subcollectionindex_elements_length - 1) {
+            text.append(StaticStrings.COMMA_CHARACTER);
+        }
+        }
+        if(j < subcollectionindex_elements_length - 1) {
         text.append(SPACE_CHARACTER);
-        }
+        }
     }
     return text.toString();
-    }
-
-    private String supercollectionToString(Element command_element) {
+    }
+
+    private String supercollectionToString(Element command_element) {
     NodeList content_elements = command_element.getElementsByTagName(COLLECTION_ELEMENT);
     int content_elements_length = content_elements.getLength();
     if(content_elements_length > 1) {
-        StringBuffer text = new StringBuffer(SUPERCOLLECTION_STR);
-        text.append(TAB_CHARACTER);
-        for(int j = 0; j < content_elements_length; j++) {
+        StringBuffer text = new StringBuffer(SUPERCOLLECTION_STR);
+        text.append(TAB_CHARACTER);
+        for(int j = 0; j < content_elements_length; j++) {
         Element content_element = (Element) content_elements.item(j);
         text.append(content_element.getAttribute(NAME_ATTRIBUTE));
         if(j < content_elements_length - 1) {
-            text.append(SPACE_CHARACTER);
-        }
-        }
-        return text.toString();
+            text.append(SPACE_CHARACTER);
+        }
+        }
+        return text.toString();
     }
     return null;
-    }
-
-    private String unknownToString(Element command_element) {
+    }
+
+    private String unknownToString(Element command_element) {
     return MSMUtils.getValue(command_element);
-    }
-
-    /** Write the text to the buffer. This is used so we don't have to worry about storing intermediate String values just so we can calaulate length and offset.
-     * @param writer the BufferedWriter to which the str will be written
-     * @param str the String to be written
-     */
-    private void write(BufferedWriter writer, String str)
+    }
+
+    /** Write the text to the buffer. This is used so we don't have to worry about storing intermediate String values just so we can calaulate length and offset.
+     * @param writer the BufferedWriter to which the str will be written
+     * @param str the String to be written
+     */
+    private void write(BufferedWriter writer, String str)
     throws IOException {
     writer.write(str, 0, str.length());
-    }
+    }
 }

trunk/gli/src/org/greenstone/gatherer/cdm/CollectionDesignManager.java

@@ -96 +96 @@
     classifier_manager = new ClassifierManager();
     general_manager = new GeneralManager();
-    
+
     searchtype_manager = new SearchTypeManager(collect_config.getSearchType());
     if(searchtype_manager.isMGPPEnabled()) {
@@ -104 +104 @@
         index_manager = new IndexManager(collect_config.getMGIndexes());
     }
-    
+
     metadataset_view = new MetadataSetView();
     plugin_manager = new PlugInManager();
@@ -156 +156 @@
     general_manager.gainFocus();
     }
-   
+
     /** Retrieve the name of the collection configuration file which is being used as the source of the information in this object.
      * @return The files absolute path as a <strong>String</strong>.
@@ -192 +192 @@
      collection_released = true;
       }
-      
+
       general_manager.loseFocus();
       collect_config.save();
-      
+
       // Readd collection
       ///ystem.err.println("Would have added collection if it had been released.");
@@ -206 +206 @@
       }
     }
-   
+
+   /** Ensures that the collection is now public. Useful for collections that are based on another, or that are about to be exported */
+   public void setCollectionAsPublic() {
+       CollectionMeta public_collectionmeta = new CollectionMeta(CollectionDesignManager.collect_config.getPublic());
+       if(public_collectionmeta != null) {
+            public_collectionmeta.setValue(CollectionConfiguration.TRUE_STR);
+            public_collectionmeta = null;
+       }
+   }
+
     /** Method used during a global search and replace to highlight the appropriate record within the Collection Design Managers version of the Metadata Set Manager (view only).
      * @param element The name of the desired element as a <strong>String</strong>.
@@ -221 +230 @@
     private class CDMChangeListener
     implements ActionListener, DocumentListener {
-    
+
     public void actionPerformed(ActionEvent event) {
         Gatherer.c_man.getCollection().setSaved(false);
@@ -230 +239 @@
         Gatherer.c_man.getCollection().setSaved(false);
     }
-          
+
     /** Gives notification that there was an insert into the document. */
     public void insertUpdate(DocumentEvent e) {
         Gatherer.c_man.getCollection().setSaved(false);
     }
-         
+
     /** Gives notification that a portion of the document has been removed. */
     public void removeUpdate(DocumentEvent e) {

trunk/gli/src/org/greenstone/gatherer/cdm/CommandTokenizer.java

@@ -38 +38 @@
 
 /**************************************************************************************
- * Title:        Gatherer
+ * Title:       Gatherer
  * Description:  The Gatherer: a tool for gathering and enriching a digital collection.
- * Company:      The University of Waikato
- * Written:      07/05/02
- * Revised:      03/10/02 - Commented
+ * Company:   The University of Waikato
+ * Written:   07/05/02
+ * Revised:   03/10/02 - Commented
  **************************************************************************************/
+import java.io.BufferedReader;
 import java.util.StringTokenizer;
+import org.greenstone.gatherer.Gatherer;
+import org.greenstone.gatherer.util.StaticStrings;
 
 /** This class provides an extension to the standard StringTokenizer in that it recognizes quotes (or some form of bracketting) enclose a single token so in something like: <br>format Search '&lt;table&gt;&lt;img src=... &lt;/table&gt;'<br> the formatting string is parsed as a single token. Unfortunately this makes countTokens() unreliable for exact measurement of tokens remaining, and only useful for determining if there are tokens left to be processed (includes any that have already been read into command buffer).
@@ -50 +53 @@
  * @version 2.3
  */
-public class CommandTokenizer
-    extends StringTokenizer {
-
-    private int last_type = -1;
-
-    static final public int BRACKET_ENCLOSED      = 0;
-    static final public int DOUBLE_QUOTE_ENCLOSED = 1;
-    static final public int NORMAL                = 2;
-    static final public int QUOTE_ENCLOSED        = 3;
-
-    /** Constructor.
-     * @param command The command <strong>String</strong> you wish to tokenize.
-     */
-    public CommandTokenizer(String command) {
-    super(command);
-    }
-
-    /* private int getLastType() {
-    return last_type;
-    } */
-
-    /* private boolean isComment() {
-    return (last_type == DOUBLE_QUOTE_ENCLOSED || last_type == QUOTE_ENCLOSED);
-    } */
-
-    /** Method to retrieve the next token from the command, taking care to group tokens enclosed in speech marks.
-     * @return A <strong>String</strong> containing the next token from the command.
-     */
-    public String nextToken() {
-    String result = null;
-    if(hasMoreTokens()) {
-        StringBuffer buffer = new StringBuffer(super.nextToken());
-        switch(buffer.charAt(0)) {
-        case '\"':
-        while((buffer.length() == 1 || buffer.charAt(buffer.length() - 1) != '\"') && hasMoreTokens()) {
-            buffer.append(" ");
-            buffer.append(super.nextToken());
-            ///ystem.err.println("Current Buffer = '" + buffer.toString() + "'");
-        }
-        ///ystem.err.println("Final Buffer = '" + buffer.toString() + "'");
-        last_type = DOUBLE_QUOTE_ENCLOSED;
-        break;
-        case '\'':
-        while((buffer.length() == 1 || buffer.charAt(buffer.length() - 1) != '\'') && hasMoreTokens()) {
-            buffer.append(" ");
-            buffer.append(super.nextToken());
-        }
-        last_type = QUOTE_ENCLOSED;
-        break;
-        case '[':
-        while((buffer.length() == 1 || buffer.charAt(buffer.length() - 1) != ']') && hasMoreTokens()) {
-            buffer.append(" ");
-            buffer.append(super.nextToken());
-        }
-        last_type = BRACKET_ENCLOSED;
-        break;
-        default:
-        last_type = NORMAL;
-        }
-        result = buffer.toString();
-    }
-    return result;
-    }
-
-    /** Unfortunately the StringBuffer doesn't have a built in endsWith method, so I'll just have to implement my own.
-     * @param str The <strong>StringBuffer</strong> we are checking the end of.
-     * @param target The <strong>String</strong> fragment we are searching for.
-     * @return <i>true</i> if str ends with target, <i>false</i> otherwise.
-     */
-    private boolean endsWith(StringBuffer str, String target) {
-    String temp = str.toString();
-    if(temp.endsWith(target) != (str.lastIndexOf(target) == str.length() - target.length())) {
-        ///ystem.err.println("Holy error that'll crash the HFile creator if it happens twice, Batman!");
-        ///ystem.err.println("String = '" + temp + "'");
-        ///ystem.err.println("Target = '" + target + "'");
-    }
-    return str.lastIndexOf(target) == str.length() - target.length();
-    }
+public class CommandTokenizer {
+
+    static final public int BRACKET_ENCLOSED            = 0;
+    static final public int DOUBLE_QUOTE_ENCLOSED   = 1;
+    static final public int NORMAL                      = 2;
+    static final public int QUOTE_ENCLOSED              = 3;
+
+    private BufferedReader in_stream;
+    private int count = -1;
+    private StringTokenizer internal_tokenizer;
+
+    /** Basic Constructor. Used to parse tokens from a string keeping tokens surrounded by speechmarks or square brackets intact. Thus something like:<br>
+     * collectionmeta collectionextra [l = en] "Hello World"<br>
+     * is tokenized thus<br>
+     * {'collectionmeta', 'collectionextra', 'l = en', 'Hello World'}
+     * @param command the command String you wish to tokenize
+     */
+    public CommandTokenizer(String command) {
+        this.internal_tokenizer = new StringTokenizer(command);
+        this.in_stream = null;
+    }
+
+    /** Advanced Constructor. As above but with one major difference. Since it is provided an input stream (presumably where the command string originated from), it is able to parse a quote enclosed command token that stretches over several lines. Each newline is preserved in the resulting token. There is an extra bitchslap here as comething like a collection extra might have html code in them that contain escaped speechmarks, so extra care must be taken not to break at them. Thus something like:<br>
+     * collectionmeta collectionextra [l = en] "<br>
+     *     an example of the crazy as description we sometimes get which includes of all things something like <a href=\"this.html\"<br>
+     *     >this</a> which you could easily see might be a problem if I parse this niavely."<br>
+     * is tokenized thus<br>
+     * {'collectionmeta', 'collectionextra', 'l = en', '\nan example of the crazy as description we sometimes get which includes of all things something like <a href=\"this.html\"\n>this</a> which you could easily see might be a problem if I parse this niavely.'}
+     * @param command the command String you wish to tokenize
+     * @param in_stream a BufferedReader from which the tokenizer can draw further lines as necessary
+     */
+    public CommandTokenizer(String command, BufferedReader in_stream) {
+        ///atherer.println("***** CommandTokenizer *****\nparse:\t" + command + "\n****************************");
+        this.internal_tokenizer = new StringTokenizer(command);
+        this.in_stream = in_stream;
+    }
+
+    /** Returns the minumum number of remaining tokens before the tokenizer runs out of string. There may be more tokens than this count, but never less. The discrepancy is due to internal functionality and the fact we can't read ahead in the string or associated stream without risking the need for unpredictable push-back
+     * @return the minumum number of tokens available as an int
+     */
+    public int countTokens() {
+        if(count == 0 && internal_tokenizer.countTokens() > 1) {
+             return 1;
+        }
+        if(count == -1) {
+             count = internal_tokenizer.countTokens();
+        }
+        return count;
+    }
+
+    /** Determine if there are still tokens available.
+     * @return true if there are more tokens, false otherwise
+     */
+    public boolean hasMoreTokens() {
+         return internal_tokenizer.hasMoreTokens();
+    }
+
+    /** Method to retrieve the next token from the command, taking care to group tokens enclosed in speech marks.
+     * @return a String containing the next token from the command
+     */
+    public String nextToken() {
+        String result = null;
+        if(internal_tokenizer.hasMoreTokens()) {
+            StringBuffer buffer = new StringBuffer(internal_tokenizer.nextToken());
+            switch(buffer.charAt(0)) {
+                case StaticStrings.DOUBLEQUOTE_CHAR:
+                    result = buildToken(buffer, StaticStrings.DOUBLEQUOTE_CHAR, true);
+                    break;
+                case StaticStrings.SINGLEQUOTE_CHAR:
+                    result = buildToken(buffer, StaticStrings.SINGLEQUOTE_CHAR, true);
+                    break;
+                case StaticStrings.OPENBRACKET_CHAR:
+                    result = buildToken(buffer, StaticStrings.CLOSEBRACKET_CHAR, false);
+                    break;
+                default:
+                    result = buffer.toString();
+            }
+            buffer = null;
+        }
+        // Because of our tricky counting system we never want to have negative tokens remaining. In fact, unless the internal string buffer is empty, we will return a count of 1 anyway
+        if(count > 0) {
+            count = count - 1;
+        }
+        ///atherer.println("----- CommandTokenizer -----\ntoken:\t" + result + "\n----------------------------");
+        return result;
+    }
+
+    /** Parse in the next token. paying heed to enclosing characters demands, escaped characters, newlines and empty buffers and consequential unexpected end of tokens
+     * @param buffer the StringBuffer in which the partial token is stored (at the first bit that caused this method to be called)
+     * @param end_char the sentinel char we are watching for as it encloses a token
+     * @param strip_characters a boolean denoting whether the enclosing characters should be stripped off
+     * @return the token, either in its entirity less the enclosing characters if required or, if an unexpected end occured, whatever we parsed without its starting enclosing character, again only if required. In fact if we weren't asked to strip characters then we add the enclosing character back in
+     */
+    private String buildToken(StringBuffer buffer, char end_char, boolean strip_characters) {
+        while(buffer.charAt(buffer.length() - 1) != end_char || (buffer.length() > 3 && buffer.charAt(buffer.length() - 2) == StaticStrings.BACKSLASH_CHAR)) {
+            try {
+                // The first version is for the basic tokenizer which has no idea of an input stream, so runs out tokens at the same time as the internal tokenizer does
+                if(internal_tokenizer.hasMoreTokens()) {
+                    buffer.append(StaticStrings.SPACE_CHAR);
+                    buffer.append(internal_tokenizer.nextToken());
+                }
+                // While the second version can draw more lines from the stream until eof occurs
+                else if(in_stream != null) {
+                    String line_str = null;
+                    while(!internal_tokenizer.hasMoreTokens() && (line_str = in_stream.readLine()) != null) {
+                        ///atherer.println("+++++ CommandTokenizer +++++\nappend:\t" + line_str + "\n+++++++++++++++++++++++++++++");
+                        // Its at this stage the our token count becomes completely patu
+                        internal_tokenizer = new StringTokenizer(line_str);
+                        buffer.append(StaticStrings.NEW_LINE_CHAR); // A new line in the final token
+                    }
+                    line_str = null;
+                    if(internal_tokenizer.hasMoreTokens()) {
+                        // Don't add a space if we just added a newline
+                        if(buffer.charAt(buffer.length() - 1) != StaticStrings.NEW_LINE_CHAR) {
+                            buffer.append(StaticStrings.SPACE_CHAR);
+                        }
+                        buffer.append(internal_tokenizer.nextToken());
+                    }
+                    // We've prematurely run out of content, so throw the dummy, or at least return whatever we managed to parse sans its opening character
+                    else {
+                        if(strip_characters) {
+                            return buffer.substring(1);
+                        }
+                        else {
+                            buffer.append(end_char);
+                            return buffer.toString();
+                        }
+                    }
+                }
+                // We've prematurely run out of content, so throw the dummy, or at least return whatever we managed to parse sans its opening character
+                else {
+                    if(strip_characters) {
+                        return buffer.substring(1);
+                    }
+                    else {
+                        buffer.append(end_char);
+                        return buffer.toString();
+                    }
+                }
+            }
+            // Exception throw when we attempted reading from the input stream, so throw the dummy, or at least return whatever we managed to parse sans its opening character
+            catch(Exception exception) {
+                Gatherer.printStackTrace(exception);
+                if(strip_characters) {
+                    return buffer.substring(1);
+                }
+                else {
+                    buffer.append(end_char);
+                    return buffer.toString();
+                }
+            }
+        }
+        // Return the string sans enclosing characters
+        if(buffer.length() > 0 && strip_characters) {
+            return buffer.substring(1, buffer.length() - 1);
+        }
+        else {
+            return buffer.toString();
+        }
+    }
 }

trunk/gli/src/org/greenstone/gatherer/cdm/GeneralManager.java

@@ -133 +133 @@
     /** This class represents the visual component of the general options stored in the CollectionDesignManager. */
     private class GeneralControl
-    extends JPanel 
+    extends JPanel
     implements Control {
     private boolean ready = false;
@@ -262 +262 @@
         instruction_panel.add(title_label, BorderLayout.NORTH);
         instruction_panel.add(new JScrollPane(instructions_textarea), BorderLayout.CENTER);
-        
+
         creator_panel.setLayout(new BorderLayout());
         creator_panel.add(creator_label, BorderLayout.WEST);
@@ -334 +334 @@
         small_icon_textfield.setText(icon_collection_small_collectionmeta.getValue(CollectionMeta.TEXT));
         small_icon_textfield.setCaretPosition(0);
+        // I forgot to keep the checkboxes up to date. Why hasn't this caused problems before today?
+        public_checkbox.setSelected(public_collectionmeta.getValue(CollectionMeta.TEXT).equals(CollectionConfiguration.TRUE_STR));
+        beta_checkbox.setSelected(beta_collectionmeta.getValue(CollectionMeta.TEXT).equals(CollectionConfiguration.TRUE_STR));
         ready = true;
     }
@@ -343 +346 @@
         beta_collectionmeta.setValue((beta_checkbox.isSelected() ? CollectionConfiguration.TRUE_STR : CollectionConfiguration.FALSE_STR));
         public_collectionmeta.setValue((public_checkbox.isSelected() ? CollectionConfiguration.TRUE_STR : CollectionConfiguration.FALSE_STR));
-        creator_collectionmeta.setValue(creator_emailfield.getText());
+        String creator_email_str = creator_emailfield.getText();
+        creator_collectionmeta.setValue(creator_email_str);
+        Gatherer.config.setEmail(creator_email_str); // Store the email address in the configuration
         collection_extra_collectionmeta.setValue(description_textarea.getText());
         icon_collection_collectionmeta.setValue(icon_textfield.getText());
@@ -356 +361 @@
     private class BrowseListener
         implements ActionListener {
-        
+
         public void actionPerformed(ActionEvent event) {
         // Open an almost standard file browser to the images folder of the current collection
@@ -405 +410 @@
         }
         }
-        
+
         /** ImageFilter.java is a 1.4 example used by FileChooserDemo2.java. */
-        private class ImageFilter 
+        private class ImageFilter
         extends javax.swing.filechooser.FileFilter {
-        
+
         private Pattern pattern = null;
-        
+
         public ImageFilter() {
             pattern = Pattern.compile(".*\\.(gif|png|jpe?g)");
         }
-        
+
         // Accept all directories and all .col files
         public boolean accept(File f) {
@@ -422 +427 @@
             return f.isDirectory() || matcher.matches();
         }
-        
+
         // The description of this filter
         public String getDescription() {

trunk/gli/src/org/greenstone/gatherer/cdm/IndexManager.java

@@ -331 +331 @@
     Gatherer.c_man.configurationChanged();
     }
-    
+
     /** This method is reponsible for changing the underlying Index commands from MG to MGPP and back again. This turns out to be easyish for MG->MGPP and very hard for the reverse. For the former we remove the level fragment and make sure the same levels are set, then we produce a list of the sources involved, breaking down comma seperated lists and making sure each item it unique. Changing back the other way turns out to be impossible, so we don't (beyond generating document:text, section:text and paragraph:text if text is an index and the respective levels are present). In either case we start by creating a comment containing the old index information.
      * @param  state true to enable MGPP indexes, false to use standard MG style ones
@@ -378 +378 @@
             index = null;
             }
-            // Replace mg element with mgpp element 
+            // Replace mg element with mgpp element
             setRoot(mgpp_element);
 
@@ -426 +426 @@
         }
         else {
-            // Replace mg element with mgpp element 
+            // Replace mg element with mgpp element
             setRoot(mgpp_element);
         }
@@ -444 +444 @@
             default_index.setAssigned(true);
         }
-        // If mg element has no indexes, and the current mgpp index include a text one, then generate text indexes for each of the registered levels. 
+        // If mg element has no indexes, and the current mgpp index include a text one, then generate text indexes for each of the registered levels.
         NodeList indexes = mgpp_element.getElementsByTagName(CollectionConfiguration.INDEX_ELEMENT);
         if(indexes.getLength() == 0) {
@@ -489 +489 @@
     /** This class creates a set of controls for editing the indexes. */
     private class IndexControl
-    extends JPanel 
+    extends JPanel
     implements Control {
 
@@ -728 +728 @@
         else if(source_list.isSelectionEmpty()) {
         add_enabled = false;
-        } 
+        }
         // If we get this far, create a dummy index and see if its already assigned in the collection
         else {
@@ -806 +806 @@
         return component;
         }
-          
+
     }
 
     private class MoveListener
         implements ActionListener {
-        
+
         private boolean move_up;
 
@@ -849 +849 @@
     private class SetDefaultListener
         implements ActionListener {
-        
+
         public void actionPerformed(ActionEvent event) {
         Index index = (Index) index_list.getSelectedValue();
@@ -879 +879 @@
         validateAddButton();
         }
-        
+
         /** Gives notification that there was an insert into the document. */
         public void insertUpdate(DocumentEvent e) {
         validateAddButton();
         }
-        
+
         /** Gives notification that a portion of the document has been removed. */
         public void removeUpdate(DocumentEvent e) {
@@ -928 +928 @@
         // Create Indexes
         JPanel indexes_panel = new JPanel();
-        
+
         JPanel current_indexes_panel = new JPanel();
 
@@ -1053 +1053 @@
         index_spacer_panel.add(index_body_panel, BorderLayout.NORTH);
         index_spacer_panel.add(index_empty_panel, BorderLayout.CENTER);
-        
+
         indexes_panel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
         indexes_panel.setLayout(new BorderLayout());
@@ -1061 +1061 @@
         // Create Levels
         JPanel levels_panel = new JPanel();
-        
+
         JPanel current_levels_panel = new JPanel();
 
@@ -1119 +1119 @@
         add_level_button.setMnemonic(KeyEvent.VK_A);
         Dictionary.registerBoth(add_level_button, "CDM.IndexManager.MGPP.Add_Level", "CDM.IndexManager.MGPP.Add_Level_Tooltip");
-        
+
         remove_level_button = new JButton("CDM.IndexManager.MGPP.Remove_Level");
         remove_level_button.setEnabled(false);
@@ -1173 +1173 @@
         level_spacer_panel.add(level_body_panel, BorderLayout.NORTH);
         level_spacer_panel.add(level_empty_panel, BorderLayout.CENTER);
-        
+
         levels_panel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
         levels_panel.setLayout(new BorderLayout());
@@ -1181 +1181 @@
         // Create General
         JPanel header_panel = new JPanel();
-        
+
         title_label = new JLabel();
         title_label.setHorizontalAlignment(JLabel.CENTER);
@@ -1376 +1376 @@
         validateAddButton();
         }
-          
+
         /** Gives notification that a portion of the document has been removed.
          * @param  event a DocumentEvent containing information about the text removed
@@ -1383 +1383 @@
         validateAddButton();
         }
-        
+
         /** Change the enable state of the add button depending on the current value in the search type combobox. */
         public void validateAddButton() {
@@ -1438 +1438 @@
         validateAddButton();
         }
-          
+
         /** Gives notification that a portion of the document has been removed.
          * @param  event a DocumentEvent containing information about the text removed
@@ -1445 +1445 @@
         validateAddButton();
         }
-        
+
         /** Change the enable state of the add button depending on the current value in the search type combobox. */
         public void validateAddButton() {
@@ -1500 +1500 @@
 
     /** Replace really only replaces the string. */
-    private class ReplaceIndexActionListener 
+    private class ReplaceIndexActionListener
         implements ActionListener {
 
@@ -1526 +1526 @@
         }
     }
-    
+
     private class RemoveIndexActionListener
         implements ActionListener {

trunk/gli/src/org/greenstone/gatherer/cdm/MetadataSetView.java

@@ -158 +158 @@
     /** This class creates and lays-out the various controls for reviewing the metadata sets, and their commands as they would appear in the collection configuration file. */
     private class MetadataSetControl
-    extends JPanel 
+    extends JPanel
     implements Control {
     /** The label denoting the element list. */
@@ -324 +324 @@
         String namespace = set.getNamespace();
         // Watch out for the greenstone set, with its namespace of ""
-        if(namespace == null || namespace.length() == 0) {
-        namespace = "greenstone";
-        }
-        return "metadataset " + namespace + " \"" + set.getFile().getName() + "\"";
+        return "metadataset " + namespace + " \"" + set.getName() + "\"";
     }
     }

trunk/gli/src/org/greenstone/gatherer/cdm/PlugInManager.java

@@ -967 +967 @@
      */
     private class RemoveListener
-        implements ActionListener {
-        /** Any implementation of <i>ActionListener</i> must include this method so that we can be informed when an action has occured on one of our target controls.
-         * @param event An <strong>ActionEvent</strong> containing information garnered from the control action.
-         */
-        public void actionPerformed(ActionEvent event) {
-        if(!plugin_list.isSelectionEmpty()) {
-            Object [] objects = plugin_list.getSelectedValues();
-            for(int i = 0; i < objects.length; i++) {
-            if(objects[i] instanceof PlugIn) {
-                removePlugIn((PlugIn)objects[i]);
+        implements ActionListener {
+        /** Any implementation of <i>ActionListener</i> must include this method so that we can be informed when an action has occured on one of our target controls.
+         * @param event An <strong>ActionEvent</strong> containing information garnered from the control action.
+         */
+        public void actionPerformed(ActionEvent event) {
+            int selected_index = plugin_list.getSelectedIndex();
+            if(selected_index != -1) {
+                PlugIn selected_plugin = (PlugIn) plugin_list.getSelectedValue();
+                removePlugIn(selected_plugin);
+                selected_plugin = null;
+                // Select the next plugin if available
+                if(selected_index < plugin_list.getModel().getSize()) {
+                    // If the new selection is above the separator we can remove it
+                    if(selected_index < findSeparatorIndex()) {
+                        plugin_list.setSelectedIndex(selected_index);
+                        remove.setEnabled(true);
+                    }
+                    // Otherwise select the first non-removable plugin
+                    else {
+                        plugin_list.setSelectedIndex(selected_index + 1);
+                        remove.setEnabled(false);
+                    }
+                }
+                else {
+                    remove.setEnabled(false);
+                }
+                // Refresh the available plugins
+                plugin.setModel(new DefaultComboBoxModel(getAvailable()));
             }
-            }
-            // Refresh the available plugins
-            plugin.setModel(new DefaultComboBoxModel(getAvailable()));
-        }
-        remove.setEnabled(false);
-        }
+            else {
+                remove.setEnabled(false);
+            }
+            /*
+            if(!plugin_list.isSelectionEmpty()) {
+                Object [] objects = plugin_list.getSelectedValues();
+                for(int i = 0; i < objects.length; i++) {
+                    if(objects[i] instanceof PlugIn) {
+                        removePlugIn((PlugIn)objects[i]);
+                    }
+                }
+                // Refresh the available plugins
+                plugin.setModel(new DefaultComboBoxModel(getAvailable()));
+            }
+            */
+        }
     }
     }

trunk/gli/src/org/greenstone/gatherer/cdm/SearchTypeManager.java

@@ -29 +29 @@
 /**************************************************************************************
  * Written:      16/07/03
- * Revised:      
+ * Revised:
  **************************************************************************************/
 import java.awt.*;
@@ -82 +82 @@
     return controls;
     }
-    
-    public String getSearchTypes() {
-    StringBuffer search_types = new StringBuffer();
-    ArrayList types = children();
-    for (int i=0; i<types.size(); i++) {
-        if (i>0) {
-        search_types.append(",");
-        }
-        search_types.append(((SearchType)types.get(i)).getName());
-    }
-    return search_types.toString();
-    }
-    /** Be examining the SearchType 'root' we were created with, determine if mgpp is enabled.
-     * @return true if MGPP is enabled, false otherwise
-     */
-    public boolean isMGPPEnabled() {
-    return root.getAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE).equals(CollectionConfiguration.TRUE_STR);
-    }
+
+    /** Return a list of the currently assigned search types as a comma separated string.
+     * @return a String
+     */
+    public String getSearchTypes() {
+        StringBuffer search_types = new StringBuffer();
+        ArrayList types = children();
+        for (int i = 0; i < types.size(); i++) {
+            if (i>0) {
+                search_types.append(",");
+            }
+            search_types.append(((SearchType)types.get(i)).getName());
+        }
+        return search_types.toString();
+    }
+
+    /** Be examining the SearchType 'root' we were created with, determine if mgpp is enabled.
+     * @return true if MGPP is enabled, false otherwise
+     */
+    public boolean isMGPPEnabled() {
+        return root.getAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE).equals(CollectionConfiguration.TRUE_STR);
+    }
 
     public void moveSearchType(SearchType search_type, boolean direction) {
@@ -127 +131 @@
     remove(search_type);
     add(index, search_type);
-    Gatherer.c_man.configurationChanged(); 
+    Gatherer.c_man.configurationChanged();
     }
 
@@ -147 +151 @@
     private JButton move_up_button;
     private JButton remove_button;
-    
+
     private JCheckBox enable_advanced_searches_checkbox;
 
@@ -267 +271 @@
         inner_panel.add(current_search_types_panel, BorderLayout.CENTER);
         inner_panel.add(search_type_panel, BorderLayout.SOUTH);
-        
+
         spacer_panel.setLayout(new BorderLayout());
         spacer_panel.add(inner_panel, BorderLayout.NORTH);
@@ -280 +284 @@
     public void destroy() {
     }
-    
+
     public void gainFocus() {
         instructions_textarea.setCaretPosition(0);
@@ -413 +417 @@
 
     /** Listens for changes in the search types combobox, and enabled add button appropriately. */
-    private class SearchTypesActionDocumentListener 
+    private class SearchTypesActionDocumentListener
         implements ActionListener, DocumentListener {
         /** Called whenever a selection action occurs on the combobox.
@@ -434 +438 @@
         validateAddButton();
         }
-          
+
         /** Gives notification that a portion of the document has been removed.
          * @param  event a DocumentEvent containing information about the text removed
@@ -441 +445 @@
         validateAddButton();
         }
-        
+
         /** Change the enable state of the add button depending on the current value in the search type combobox. */
         private void validateAddButton() {

trunk/gli/src/org/greenstone/gatherer/cdm/SuperCollectionManager.java

@@ -37 +37 @@
 import org.greenstone.gatherer.checklist.CheckList;
 import org.greenstone.gatherer.checklist.Entry;
-import org.greenstone.gatherer.collection.CollectionConfiguration;
+import org.greenstone.gatherer.collection.BasicCollectionConfiguration;
 import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
@@ -43 +43 @@
 
 /** This class contains the information about what supercollection has been specified (if any) and methods for changing this information. Note that there is a major difference between this manager and the others in that its DOM model is never used directly in any list component. It is only used to decide whether a certain entry in the actual checklist is checked. */
-public class SuperCollectionManager 
+public class SuperCollectionManager
     extends DOMProxyListModel {
 
@@ -107 +107 @@
     /** Provides controls for altering the SuperCollection settings. */
     private class SuperCollectionControl
-    extends JPanel 
+    extends JPanel
     implements Control {
 
@@ -119 +119 @@
         // Creation
         JPanel header_panel = new JPanel();
-        
+
         JLabel title_label = new JLabel();
         title_label.setHorizontalAlignment(JLabel.CENTER);
@@ -141 +141 @@
         header_panel.add(title_label, BorderLayout.NORTH);
         header_panel.add(new JScrollPane(instructions), BorderLayout.CENTER);
-        
+
         setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
         setLayout(new BorderLayout());
@@ -198 +198 @@
         File collect_cfg_file = new File(possible_collections[i], Utility.CONFIG_DIR);
         if(collect_cfg_file.exists()) {
-            CollectionConfiguration collect_cfg = new CollectionConfiguration(collect_cfg_file);
+            BasicCollectionConfiguration collect_cfg = new BasicCollectionConfiguration(collect_cfg_file);
             String collection_title = collect_cfg.getName();
             String collection_name = possible_collections[i].getName();
@@ -210 +210 @@
             collection_checklist_model.add(entry);
             entry = null;
-            
+
             }
             collection_name = null;

trunk/gli/src/org/greenstone/gatherer/collection/Collection.java

@@ -43 +43 @@
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.cdm.CollectionDesignManager;
+import org.greenstone.gatherer.cdm.CollectionMeta;
+import org.greenstone.gatherer.cdm.CollectionMetaManager;
 import org.greenstone.gatherer.collection.BuildOptions;
+import org.greenstone.gatherer.collection.BasicCollectionConfiguration;
 import org.greenstone.gatherer.collection.CollectionManager;
 import org.greenstone.gatherer.file.FileNode;
@@ -59 +62 @@
  */
 public class Collection {
-    /** A reference to the BuildOptions. */
-    public BuildOptions build_options;
-    /** A reference to the Collection Design Manager. */
-    public CollectionDesignManager cdm;
-    /** A reference to the Greenstone Directory Metadata Manager. */
-    public GDMManager gdm;
-    /** A reference to the Metadata Set Manager. */
-    public MetadataSetManager msm;
-    /** <i>true</i> if the currently loaded collection has been saved since the last significant change, <i>false</i> otherwise. */
-    private boolean saved = false;
-    /** The collectio configuration file for this collection. */
-    private CollectionConfiguration collect_cfg;
-    /** The document around which this collection class is based. */
-    private Document document;
-    /** The file the collection is in (the file may not actually exist, such in the case of a legacy collection)! */
-    private File file;
+    /** A reference to the BuildOptions. */
+    public BuildOptions build_options;
+    /** A reference to the Collection Design Manager. */
+    public CollectionDesignManager cdm;
+    /** A reference to the Greenstone Directory Metadata Manager. */
+    public GDMManager gdm;
+    /** A reference to the Metadata Set Manager. */
+    public MetadataSetManager msm;
+    /** <i>true</i> if the currently loaded collection has been saved since the last significant change, <i>false</i> otherwise. */
+    private boolean saved = false;
+    /** The document around which this collection class is based. */
+    private Document document;
+    /** The file the collection is in (the file may not actually exist, such in the case of a legacy collection)! */
+    private File file;
    /** The name of the argument element. */
    static final private String ARGUMENT = "Argument";
    static final private String BASE_COLLECTION = "base_collection";
-    /** The name of the build element. */
-    static final private String BUILD = "Build";
-    /** The name of the build config element. */
-    static final private String BUILD_CONFIG = "BuildConfig";
-    /** The name of the collection xml template. */
-    static final private String COLLECTION_XML_TEMPLATE = "xml/template.col";
-    /** The name of the directory mappings element. */
-    static final private String DIRECTORY_MAPPINGS = "DirectoryMappings";
-    /** The name of the file attribute. */
-    static final private String FILE = "file";
-    /** The name of the import element. */
-    static final private String IMPORT = "Import";
-    /** The name of the imported attribute. */
-    static final private String IMPORTED = "imported";
-    /** The name of the mapping element. */
-    static final private String MAPPING = "Mapping";
-    /** The name of the name attribute. */
-    static final private String NAME = "name";
-    /** The name of the true value. */
-    static final private String TRUE = "true";
-    /** Constructor. */
-    public Collection(File collection_xml) {
-    this.file = collection_xml;
-    // Try to load this collections details.
-    document = Utility.parse(collection_xml, false);
-    // If that fails load the default settings for a collection.
-    if(document == null) {
-        document = Utility.parse(COLLECTION_XML_TEMPLATE, true);
-    }
-    // Point the Configuration class at our gatherer config arguments.
-    Gatherer.config.setCollectionConfiguration(document);
-    // We also attempt to parse the collection configuration file.
-    collect_cfg = new CollectionConfiguration(new File(collection_xml.getParentFile(), Utility.CONFIG_DIR));
-    // Finally create all of the child managers that are directly dependant on a collection
-    build_options = new BuildOptions(getBuildValues(), getImportValues());        
-    }
-    /** Add a special directory mapping. */
-    public boolean addDirectoryMapping(String name, File file) {
+    /** The name of the build element. */
+    static final private String BUILD = "Build";
+    /** The name of the build config element. */
+    static final private String BUILD_CONFIG = "BuildConfig";
+    /** The name of the collection xml template. */
+    static final private String COLLECTION_XML_TEMPLATE = "xml/template.col";
+    /** The name of the directory mappings element. */
+    static final private String DIRECTORY_MAPPINGS = "DirectoryMappings";
+    /** The name of the file attribute. */
+    static final private String FILE = "file";
+    /** The name of the import element. */
+    static final private String IMPORT = "Import";
+    /** The name of the imported attribute. */
+    static final private String IMPORTED = "imported";
+    /** The name of the mapping element. */
+    static final private String MAPPING = "Mapping";
+    /** The name of the name attribute. */
+    static final private String NAME = "name";
+    /** The name of the true value. */
+    static final private String TRUE = "true";
+    /** Constructor. */
+    public Collection(File collection_xml) {
+        this.file = collection_xml;
+        // Try to load this collections details.
+        document = Utility.parse(collection_xml, false);
+        // If that fails load the default settings for a collection.
+        if(document == null) {
+            document = Utility.parse(COLLECTION_XML_TEMPLATE, true);
+        }
+        // Point the Configuration class at our gatherer config arguments.
+        Gatherer.config.setCollectionConfiguration(document);
+        // Finally create all of the child managers that are directly dependant on a collection
+        build_options = new BuildOptions(getBuildValues(), getImportValues());
+    }
+
+    /** Add a special directory mapping. */
+    public boolean addDirectoryMapping(String name, File file) {
     boolean result = false;
     try {
-        Element document_element = document.getDocumentElement();
-        Element directory_mappings_element = (Element) MSMUtils.getNodeFromNamed(document_element, DIRECTORY_MAPPINGS);
+        Element document_element = document.getDocumentElement();
+        Element directory_mappings_element = (Element) MSMUtils.getNodeFromNamed(document_element, DIRECTORY_MAPPINGS);
                 // Ensure the name isn't already in use.
-        boolean found = false;
-        NodeList mappings = directory_mappings_element.getElementsByTagName(MAPPING);
-        for(int i = 0; !found && i < mappings.getLength(); i++) {
+        boolean found = false;
+        NodeList mappings = directory_mappings_element.getElementsByTagName(MAPPING);
+        for(int i = 0; !found && i < mappings.getLength(); i++) {
         Element mapping_element = (Element) mappings.item(i);
         if(mapping_element.getAttribute(NAME).equalsIgnoreCase(name)) {
-            found = true;
+            found = true;
         }
         mapping_element = null;
-        }
-        // Otherwise add the mapping.
-        if(!found) {
+        }
+        // Otherwise add the mapping.
+        if(!found) {
         Element mapping_element = document.createElement(MAPPING);
         mapping_element.setAttribute(NAME, name);
@@ -138 +138 @@
         result = true;
         mapping_element = null;
-        }
-        mappings = null;
-        directory_mappings_element = null;
-        document_element = null;
-        saved = false;
+        }
+        mappings = null;
+        directory_mappings_element = null;
+        document_element = null;
+        saved = false;
     }
     catch (Exception error) {
-        Gatherer.printStackTrace(error);
+        Gatherer.printStackTrace(error);
     }
     return result;
-    }
-
-    /** Destructor. 
-     * @see org.greenstone.gatherer.collection.CollectionModel */
-    public void destroy() {
+    }
+
+    /** Destructor.
+     * @see org.greenstone.gatherer.collection.CollectionModel */
+    public void destroy() {
     cdm.destroy();
     gdm.destroy();
@@ -161 +161 @@
     gdm = null;
     msm = null;
-    }
+    }
 
    /** Determine the path to the base collection.
-    * @return the path as a String
-    */
+    * @return the path as a String
+    */
    public String getBaseCollection() {
-      return getString(BASE_COLLECTION);
+      return getString(BASE_COLLECTION);
    }
-   
-    /** Determine the number of documents and folders in this collection. */
-    public int getCount() {
+
+    /** Determine the number of documents and folders in this collection. */
+    public int getCount() {
     return getCount((TreeNode)Gatherer.c_man.getRecordSet().getRoot(), true, true);
-    }
-
-    /** Calculates the number of documents in this collection. */
-    public int getDocumentCount() {
+    }
+
+    /** Calculates the number of documents in this collection. */
+    public int getDocumentCount() {
     return getCount((TreeNode)Gatherer.c_man.getRecordSet().getRoot(), false, true);
-    }
-    /** Retrieve the description of this collection.
-     * @return The description as a <strong>String</strong>.
-     */
-    public String getDescription() {
-    return collect_cfg.getDescription();
-    }
-
-    public String getCollectionType() {
-    return collect_cfg.getBuildType();
-    }
-
-    public String getSearchTypes() {
-    return collect_cfg.getSearchTypes();
-    }
-    /** Retrieve a specific directory mapping associated with this collection.
-     * @param name The name of the mapping to retrieve as a <strong>String</strong>.
-     * @return The <strong>File</strong> this name maps to, or <i>null</i> if no such mapping.
-     */
-    /* private File getDirectoryMapping(String name) {
-    File result = null;
-    try {
-        Element document_element = document.getDocumentElement();
-        Element directory_mappings_element = (Element) MSMUtils.getNodeFromNamed(document_element, DIRECTORY_MAPPINGS);
-                // Ensure the name isn't already in use.
-        boolean found = false;
-        NodeList mappings = directory_mappings_element.getElementsByTagName(MAPPING);
-        for(int i = 0; !found && i < mappings.getLength(); i++) {
-        Element mapping_element = (Element) mappings.item(i);
-        if(mapping_element.getAttribute(NAME).equalsIgnoreCase(name)) {
-            result = new File(MSMUtils.getValue(mapping_element));
-            found = true;
-        }
-        mapping_element = null;
-        }
-        mappings = null;
-        directory_mappings_element = null;
-        document_element = null;
-    }
-    catch(Exception error) {
-        Gatherer.printStackTrace(error);
-    }
-    return result;
-    } */
-    /** Retrieve the special directory mappings associated with this collection.
-     * @return A <strong>HashMap</strong> containing mappings from names to directories.
-     */
-    public HashMap getDirectoryMappings() {
-    HashMap special_directories = new HashMap();
-    try {
-        Element document_element = document.getDocumentElement();
-        Element directory_mappings_element = (Element) MSMUtils.getNodeFromNamed(document_element, DIRECTORY_MAPPINGS);
-                // Ensure the name isn't already in use.
-        boolean found = false;
-        NodeList mappings = directory_mappings_element.getElementsByTagName(MAPPING);
-        for(int i = 0; !found && i < mappings.getLength(); i++) {
-        Element mapping_element = (Element) mappings.item(i);
-        String name = mapping_element.getAttribute(NAME);
-        File file = new File(mapping_element.getAttribute(FILE));
-        special_directories.put(name, file);
-        file = null;
-        name = null;
-        mapping_element = null;
-        }
-        mappings = null;
-        directory_mappings_element = null;
-        document_element = null;
-    }
-    catch(Exception error) {
-        Gatherer.printStackTrace(error);
-    }         
-    return special_directories;
-    }
-    /** Retrieve the authors email for this collection.
-     * @return The email as a <strong>String</strong>.
-     */
-    public String getEmail() {
-    return collect_cfg.getCreator();
-    }
-    /** Counts the number of folders used in the current record set. */
-    /* private int getFolderCount() {
-    return getCount((TreeNode)Gatherer.c_man.getRecordSet().getRoot(), true, false);
-    } */
-    /** Determine if this collection has had an import action run upon it since the last major change.
-     * @return <i>true</i> if an import has occured, <i>false</i> otherwise.
-     */
-    /* private boolean getImported() {
-    return get(IMPORTED);
-    } */
-    /** Retrieve the short name for this collection. 
-     * @return The name as a <strong>String</strong>.
-     */
-    public String getName() {
-    return file.getParentFile().getName();
-    }
-    /** Determine if this collection has been saved since the last major change.
-     * @return <i>true</i> if it has been saved recently, <i>false</i> otherwise.
-     */
-    public boolean getSaved() {
-    return saved;
-    }
-    /** Retrieve the title of this collection.
-     * @return The title as a <strong>String</strong>.
-     */
-    public String getTitle() {
-    return collect_cfg.getName();
-    }
-    /** Remove a previously defined special directory mapping.
-     * @param name The name of the mapping to remove as a <strong>String</strong>.
-     * @return The <strong>File</strong> of the mapping removed.
-     */
-    public File removeDirectoryMapping(String name) {
-    File file = null;
-    try {
-        Element document_element = document.getDocumentElement();
-        Element directory_mappings_element = (Element) MSMUtils.getNodeFromNamed(document_element, DIRECTORY_MAPPINGS);
-                // Ensure the name isn't already in use.
-        boolean found = false;
-        NodeList mappings = directory_mappings_element.getElementsByTagName(MAPPING);
-        for(int i = 0; !found && i < mappings.getLength(); i++) {
-        Element mapping_element = (Element) mappings.item(i);
-        if(mapping_element.getAttribute(NAME).equalsIgnoreCase(name)) {
-            file = new File(MSMUtils.getValue(mapping_element));
-            directory_mappings_element.removeChild(mapping_element);
-            found = true;
-        }
-        mapping_element = null;
-        }
-        mappings = null;
-        directory_mappings_element = null;
-        document_element = null;
-        saved = false;
-    }
-    catch(Exception error) {
-        Gatherer.printStackTrace(error);
-    }   
-    return file;
-    }
-    /** Save this xml document to the given file. */
-    public void save() {
+    }
+
+    /** Retrieve the description of this collection.
+     * @return a String
+     */
+    public String getDescription() {
+        if(cdm == null) {
+            return StaticStrings.EMPTY_STR;
+        }
+        CollectionMeta collection_extra_collectionmeta = cdm.collectionmeta_manager.getMetadatum(StaticStrings.COLLECTIONMETADATA_COLLECTIONEXTRA_STR);
+        return collection_extra_collectionmeta.getValue(CollectionMeta.TEXT);
+    }
+
+    /** Retrieve the special directory mappings associated with this collection.
+     * @return A <strong>HashMap</strong> containing mappings from names to directories.
+     */
+    public HashMap getDirectoryMappings() {
+        HashMap special_directories = new HashMap();
+        try {
+            Element document_element = document.getDocumentElement();
+            Element directory_mappings_element = (Element) MSMUtils.getNodeFromNamed(document_element, DIRECTORY_MAPPINGS);
+            // Ensure the name isn't already in use.
+            boolean found = false;
+            NodeList mappings = directory_mappings_element.getElementsByTagName(MAPPING);
+            for(int i = 0; !found && i < mappings.getLength(); i++) {
+                Element mapping_element = (Element) mappings.item(i);
+                String name = mapping_element.getAttribute(NAME);
+                File file = new File(mapping_element.getAttribute(FILE));
+                special_directories.put(name, file);
+                file = null;
+                name = null;
+                mapping_element = null;
+            }
+            mappings = null;
+            directory_mappings_element = null;
+            document_element = null;
+        }
+        catch(Exception error) {
+            Gatherer.printStackTrace(error);
+        }
+        return special_directories;
+    }
+    /** Retrieve the authors email for this collection.
+     * @return The email as a <strong>String</strong>.
+     */
+    public String getEmail() {
+        if(cdm == null) {
+            return StaticStrings.EMPTY_STR;
+        }
+        CollectionMeta creator_collectionmeta = new CollectionMeta(CollectionDesignManager.collect_config.getCreator());
+        return creator_collectionmeta.getValue(CollectionMeta.TEXT);
+    }
+
+    /** Retrieve the short name for this collection.
+     * @return The name as a <strong>String</strong>.
+     */
+    public String getName() {
+        return file.getParentFile().getName();
+    }
+
+    /** Determine if this collection has been saved since the last major change.
+     * @return <i>true</i> if it has been saved recently, <i>false</i> otherwise.
+     */
+    public boolean getSaved() {
+        return saved;
+    }
+
+    /** Retrieve the title of this collection.
+     * @return The title as a <strong>String</strong>.
+     */
+    public String getTitle() {
+        if(cdm == null) {
+            return StaticStrings.EMPTY_STR;
+        }
+        CollectionMeta collection_name_collectionmeta = cdm.collectionmeta_manager.getMetadatum(StaticStrings.COLLECTIONMETADATA_COLLECTIONNAME_STR);
+        return collection_name_collectionmeta.getValue(CollectionMeta.TEXT);
+    }
+    /** Remove a previously defined special directory mapping.
+     * @param name The name of the mapping to remove as a <strong>String</strong>.
+     * @return The <strong>File</strong> of the mapping removed.
+     */
+    public File removeDirectoryMapping(String name) {
+        File file = null;
+        try {
+            Element document_element = document.getDocumentElement();
+            Element directory_mappings_element = (Element) MSMUtils.getNodeFromNamed(document_element, DIRECTORY_MAPPINGS);
+            // Ensure the name isn't already in use.
+            boolean found = false;
+            NodeList mappings = directory_mappings_element.getElementsByTagName(MAPPING);
+            for(int i = 0; !found && i < mappings.getLength(); i++) {
+                Element mapping_element = (Element) mappings.item(i);
+                if(mapping_element.getAttribute(NAME).equalsIgnoreCase(name)) {
+                    file = new File(MSMUtils.getValue(mapping_element));
+                    directory_mappings_element.removeChild(mapping_element);
+                    found = true;
+                }
+                mapping_element = null;
+            }
+            mappings = null;
+            directory_mappings_element = null;
+            document_element = null;
+            saved = false;
+        }
+        catch(Exception error) {
+            Gatherer.printStackTrace(error);
+        }
+        return file;
+    }
+    /** Save this xml document to the given file. */
+    public void save() {
     Utility.export(document, file);
-    }
+    }
 
    public void setBaseCollection(String base_collection) {
-      set(BASE_COLLECTION, base_collection);
+      set(BASE_COLLECTION, base_collection);
    }
-   
-    /** Set the value of imported to the given value.
-     * @param value The new value for imported, <i>true</i> if the collection has been imported successfully, <i>false</i> otherwise.
-     */
-    public void setImported(boolean value) {
+
+    /** Set the value of imported to the given value.
+     * @param value The new value for imported, <i>true</i> if the collection has been imported successfully, <i>false</i> otherwise.
+     */
+    public void setImported(boolean value) {
     set(IMPORTED, value);
     saved = false;
-    }
-    /** Set the value of saved to the given value.
-     * @param value The new value for saved, <i>true</i> if the collection has been saved recently, <i>false</i> otherwise.
-     */
-    public void setSaved(boolean value) {
+    }
+    /** Set the value of saved to the given value.
+     * @param value The new value for saved, <i>true</i> if the collection has been saved recently, <i>false</i> otherwise.
+     */
+    public void setSaved(boolean value) {
     saved = value;
-    }
-    /** Set the value of title to the given value.
-     * @param title The new <strong>String</strong> title.
-     */
-    public void setTitle(String title) {
-    collect_cfg.setName(title);
-    }
-    /** Method called to return a textual representation of a class, which in this case is the collections title.
-     * @return A <strong>String</strong> containing the collections title.
-     */
-    public String toString() {
-    return collect_cfg.getName();
-    }
-    /** Get the value of a collection argument. */
-    private boolean get(String name) {
+    }
+    /** Set the value of title to the given value.
+     * @param title The new <strong>String</strong> title.
+     */
+    public void setTitle(String title) {
+        if(cdm != null) {
+            CollectionMeta collection_name_collectionmeta = cdm.collectionmeta_manager.getMetadatum(StaticStrings.COLLECTIONMETADATA_COLLECTIONNAME_STR);
+            collection_name_collectionmeta.setValue(title);
+        }
+    }
+    /** Method called to return a textual representation of a class, which in this case is the collections title.
+     * @return A <strong>String</strong> containing the collections title.
+     */
+    public String toString() {
+        return getTitle();
+    }
+    /** Get the value of a collection argument. */
+    private boolean get(String name) {
     boolean result = false;
     try {
-        Element document_element = document.getDocumentElement();
-        NodeList arguments = document_element.getElementsByTagName(ARGUMENT);
-        boolean found = false;
-        for(int i = 0; !found && i < arguments.getLength(); i++) {
+        Element document_element = document.getDocumentElement();
+        NodeList arguments = document_element.getElementsByTagName(ARGUMENT);
+        boolean found = false;
+        for(int i = 0; !found && i < arguments.getLength(); i++) {
         Element argument_element = (Element) arguments.item(i);
         if(argument_element.getParentNode() == document_element) {
-            if(argument_element.getAttribute(NAME).equalsIgnoreCase(name)) {
+            if(argument_element.getAttribute(NAME).equalsIgnoreCase(name)) {
             String value = MSMUtils.getValue(argument_element);
             if(value.equalsIgnoreCase(TRUE)) {
-                result = true;
+                result = true;
             }
             found = true;
             value = null;
-            }
+            }
         }
         argument_element = null;
-        }
-        arguments = null;
-        document_element = null;
+        }
+        arguments = null;
+        document_element = null;
     }
     catch (Exception error) {
-        Gatherer.printStackTrace(error);
+        Gatherer.printStackTrace(error);
     }
     return result;
-    }
-
-    /** Get the value of a collection argument. */
-    private String getString(String name) {
+    }
+
+    /** Get the value of a collection argument. */
+    private String getString(String name) {
     String result = "";
     try {
-        Element document_element = document.getDocumentElement();
-        NodeList arguments = document_element.getElementsByTagName(ARGUMENT);
-        boolean found = false;
-        for(int i = 0; !found && i < arguments.getLength(); i++) {
+        Element document_element = document.getDocumentElement();
+        NodeList arguments = document_element.getElementsByTagName(ARGUMENT);
+        boolean found = false;
+        for(int i = 0; !found && i < arguments.getLength(); i++) {
         Element argument_element = (Element) arguments.item(i);
         if(argument_element.getParentNode() == document_element) {
-            if(argument_element.getAttribute(NAME).equalsIgnoreCase(name)) {
+            if(argument_element.getAttribute(NAME).equalsIgnoreCase(name)) {
             result = MSMUtils.getValue(argument_element);
             found = true;
-            }
+            }
         }
         argument_element = null;
-        }
-        arguments = null;
-        document_element = null;
+        }
+        arguments = null;
+        document_element = null;
     }
     catch (Exception error) {
-        Gatherer.printStackTrace(error);
+        Gatherer.printStackTrace(error);
     }
     return result;
-    }   
-
-    /** Method to retrieve the current build options associated with this Collection. */
-    private Element getBuildValues() {
+    }
+
+    /** Method to retrieve the current build options associated with this Collection. */
+    private Element getBuildValues() {
     Element build_values_element = null;
     try {
-        Element document_element = document.getDocumentElement();
-        Element build_config_element = (Element) MSMUtils.getNodeFromNamed(document_element, BUILD_CONFIG);
-        build_values_element = (Element) MSMUtils.getNodeFromNamed(build_config_element, BUILD);
-        build_config_element = null;
-        document_element = null;
+        Element document_element = document.getDocumentElement();
+        Element build_config_element = (Element) MSMUtils.getNodeFromNamed(document_element, BUILD_CONFIG);
+        build_values_element = (Element) MSMUtils.getNodeFromNamed(build_config_element, BUILD);
+        build_config_element = null;
+        document_element = null;
     }
     catch (Exception error) {
-        Gatherer.printStackTrace(error);
+        Gatherer.printStackTrace(error);
     }
     return build_values_element;
-    }
-
-    /** Count either documents or folders, depending on the state of the given boolean. */
-    private int getCount(TreeNode node, boolean count_folders, boolean count_files) {
+    }
+
+    /** Count either documents or folders, depending on the state of the given boolean. */
+    private int getCount(TreeNode node, boolean count_folders, boolean count_files) {
     int count = 0;
     File file = ((FileNode)node).getFile();
     if(file.isFile() && count_files) {
-        count++;
+        count++;
     }
     else if(file.isDirectory() && count_folders) {
-        count++;
+        count++;
     }
     for(int i = 0; i < node.getChildCount(); i++) {
-        count = count + getCount(node.getChildAt(i), count_folders, count_files);
+        count = count + getCount(node.getChildAt(i), count_folders, count_files);
     }
     return count;
-    }
-
-    /** Method to retrieve the current import options associated with this Collection. */
-    public Element getImportValues() {
+    }
+
+    /** Method to retrieve the current import options associated with this Collection. */
+    public Element getImportValues() {
     Element import_values_element = null;
     try {
-        Element document_element = document.getDocumentElement();
-        Element build_config_element = (Element) MSMUtils.getNodeFromNamed(document_element, BUILD_CONFIG);
-        import_values_element = (Element) MSMUtils.getNodeFromNamed(build_config_element, IMPORT);
-        build_config_element = null;
-        document_element = null;
+        Element document_element = document.getDocumentElement();
+        Element build_config_element = (Element) MSMUtils.getNodeFromNamed(document_element, BUILD_CONFIG);
+        import_values_element = (Element) MSMUtils.getNodeFromNamed(build_config_element, IMPORT);
+        build_config_element = null;
+        document_element = null;
     }
     catch (Exception error) {
-        Gatherer.printStackTrace(error);
+        Gatherer.printStackTrace(error);
     }
     return import_values_element;
-    }
+    }
 
    /** Set the value of a collection argument. */
    private void set(String name, boolean value) {
-      set(name, (value ? StaticStrings.TRUE_STR : StaticStrings.FALSE_STR));
+      set(name, (value ? StaticStrings.TRUE_STR : StaticStrings.FALSE_STR));
    }
-   
+
    private void set(String name, String value) {
-      try {
+      try {
      Element document_element = document.getDocumentElement();
      NodeList arguments = document_element.getElementsByTagName(ARGUMENT);
      boolean found = false;
      for(int i = 0; !found && i < arguments.getLength(); i++) {
-        Element argument_element = (Element) arguments.item(i);
-        if(argument_element.getParentNode() == document_element) {
-           if(argument_element.getAttribute(NAME).equalsIgnoreCase(name)) {
+        Element argument_element = (Element) arguments.item(i);
+        if(argument_element.getParentNode() == document_element) {
+           if(argument_element.getAttribute(NAME).equalsIgnoreCase(name)) {
           // Strip any current value nodes.
           while(argument_element.hasChildNodes()) {
-             argument_element.removeChild(argument_element.getFirstChild());
+             argument_element.removeChild(argument_element.getFirstChild());
           }
           // Append new value
           argument_element.appendChild(document.createTextNode(value));
           found = true;
-           }
-        }
-        argument_element = null;
+           }
+        }
+        argument_element = null;
      }
      // Append it
      if(!found) {
-        Element argument_element = document.createElement(ARGUMENT);
-        argument_element.setAttribute(NAME, name);
-        argument_element.appendChild(document.createTextNode(value));
-        document_element.appendChild(argument_element);
-        argument_element = null;
+        Element argument_element = document.createElement(ARGUMENT);
+        argument_element.setAttribute(NAME, name);
+        argument_element.appendChild(document.createTextNode(value));
+        document_element.appendChild(argument_element);
+        argument_element = null;
      }
      arguments = null;
      document_element = null;
-      }
-      catch (Exception error) {
+      }
+      catch (Exception error) {
      Gatherer.printStackTrace(error);
-      }
+      }
    }
 }

trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -47 +47 @@
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.cdm.CollectionDesignManager;
+import org.greenstone.gatherer.cdm.CollectionMeta;
+import org.greenstone.gatherer.cdm.CollectionMetaManager;
 import org.greenstone.gatherer.collection.Collection;
 import org.greenstone.gatherer.collection.SaveCollectionTask;
@@ -380 +382 @@
         updateCollectionCFG(new File(base_collection_directory, Utility.CONFIG_DIR), new File(a_dir, Utility.CONFIG_DIR), description, email, title);
         }
-        
+
         // Always import the extracted metadata set if we didn't already
         if(collection.msm.getSet(Utility.EXTRACTED_METADATA_NAMESPACE) == null) {
            collection.msm.importMDS(new File(Utility.METADATA_DIR + Utility.EXTRACTED_METADATA_NAMESPACE + StaticStrings.METADATA_SET_EXTENSION), false);
         }
-           
+
         collection.cdm = new CollectionDesignManager(new File(getCollectionConfig()));
+
+        // Now that we have a CDM, update several settings, such as if we created this collection by basing it on another, set it as public automatically
+        if(base_collection_directory != null) {
+            // Update the creator and maintainer
+            CollectionMeta creator_collectionmeta = new CollectionMeta(collection.cdm.collect_config.getCreator());
+            creator_collectionmeta.setValue(email);
+            creator_collectionmeta = null;
+            CollectionMeta maintainer_collectionmeta = new CollectionMeta(collection.cdm.collect_config.getMaintainer());
+            maintainer_collectionmeta.setValue(email);
+            maintainer_collectionmeta = null;
+            // Update the collection title
+            CollectionMeta collection_name_collectionmeta = collection.cdm.collectionmeta_manager.getMetadatum(StaticStrings.COLLECTIONMETADATA_COLLECTIONNAME_STR);
+            collection_name_collectionmeta.setValue(title);
+            collection_name_collectionmeta = null;
+            // And now the description
+            CollectionMeta collection_extra_collectionmeta = collection.cdm.collectionmeta_manager.getMetadatum(StaticStrings.COLLECTIONMETADATA_COLLECTIONEXTRA_STR);
+            collection_extra_collectionmeta.setValue(description);
+            collection_extra_collectionmeta = null;
+            // All collections based on others are automatically public
+            CollectionMeta public_collectionmeta = new CollectionMeta(collection.cdm.collect_config.getPublic());
+            public_collectionmeta.setValue(StaticStrings.TRUE_STR);
+            public_collectionmeta = null;
+            // Finally reset the icons
+            CollectionMeta icon_collection_collectionmeta = collection.cdm.collectionmeta_manager.getMetadatum(StaticStrings.COLLECTIONMETADATA_ICONCOLLECTION_STR);
+            icon_collection_collectionmeta.setValue(StaticStrings.EMPTY_STR);
+            icon_collection_collectionmeta = null;
+            CollectionMeta icon_collection_small_collectionmeta = collection.cdm.collectionmeta_manager.getMetadatum(StaticStrings.COLLECTIONMETADATA_ICONCOLLECTIONSMALL_STR);
+            icon_collection_small_collectionmeta.setValue(StaticStrings.EMPTY_STR);
+            icon_collection_small_collectionmeta = null;
+        }
+
         collection.gdm = new GDMManager();
 
@@ -740 +773 @@
     }
 
-    // Special case of a user trying to open an old greenstone collection. 
+    // Special case of a user trying to open an old greenstone collection.
     File metadata_directory = new File(collection_directory, Utility.META_DIR);
     if(!metadata_directory.exists()) {
-            
+
         Gatherer.println("CollectionManager.loadCollection: trying to load up a non-gatherer collection");
         non_gatherer_collection = true;
@@ -758 +791 @@
         dialog = null;
     }
-    
+
     if(choice != LockFileDialog.YES_OPTION) {
         // user has cancelled
@@ -766 +799 @@
     }
 
-    
+
     try {
         if(lock_file.exists()) {
@@ -787 +820 @@
         msm = collection.msm; // Legacy
         collection.msm.load();
-        
+
         // if non-gatherer collection, need to add some metadata sets
         if (non_gatherer_collection) {
@@ -798 +831 @@
         }
         }
-            
+
         collection.cdm = new CollectionDesignManager(new File(collection_file.getParent(), Utility.CONFIG_DIR));
         if (non_gatherer_collection) {
@@ -806 +839 @@
         lci = null;
         }
-        
+
         // Whether the collection is legacy or not, we should now be able to prepared the GDMManager
         collection.gdm = new GDMManager();
-        
+
         // Tell everyone that it worked.
         String[] args = new String[1];
@@ -836 +869 @@
         }
     }
-    
+
     lock_file = null;
     collection_directory = null;
-    
+
     args2 = null;
     return result;
     }
-    
+
     /** I started giving the user the choice of using an existing meta set or creating a new one. The second option being so that they didn't have to add/merge/ignore each element, they could all be added automatically. However, I am not sure where the merge prompt gets called from, and it is not essential, so I am leaving it for now - it shoudl be added back in and finished. [kjdon] */
     private boolean addSomeMetadataSets(File collection_dir) {
-    
-    
+
+
     ExternalCollectionPrompt external_prompt = new ExternalCollectionPrompt();
     int meta_choice = external_prompt.getMetadataChoice();
@@ -853 +886 @@
     if (cancelled) {
         return false;
-    } 
-    
+    }
+
     /*if (meta_choice == ExternalCollectionPrompt.NEW_META_SET) {
-        NewMetaSetPrompt nmsp = new NewMetaSetPrompt();     
+        NewMetaSetPrompt nmsp = new NewMetaSetPrompt();
         if (nmsp.isCancelled()) {
         return false;
@@ -883 +916 @@
 
     return true;
-    }   
+    }
 
     private boolean searchForMetadata(TreeModel collection_tree, FileNode current_node) {
@@ -1042 +1075 @@
     else if(event.getStatus() == GShell.ERROR) {
         JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CollectionManager.Preview_Ready_Failed"), Dictionary.get("CollectionManager.Preview_Ready_Title"), JOptionPane.ERROR_MESSAGE);
-        Gatherer.g_man.collectionChanged(ready()); 
+        Gatherer.g_man.collectionChanged(ready());
     }
     }
@@ -1084 +1117 @@
     public void registerBuildMonitor(GShellProgressMonitor monitor) {
     build_monitor = monitor;
-    } 
+    }
     /** This method associates the collection copy monitor with the copy monitor created in CreatePane.
      * @param monitor A <strong>GShellProgressMonitor</strong> which we will use as the copy monitor.
@@ -1207 +1240 @@
            Gatherer.println("Index = " + index_dir.getAbsolutePath());
         }
-           
+
         File build_dir = new File(getCollectionBuild(), "temp.txt");
         build_dir = build_dir.getParentFile();
@@ -1287 +1320 @@
      }
 
-    private void updateCollectionCFG(File base_cfg, File new_cfg, String description, String email, String title) {
-    boolean first_name = true;
-    boolean first_extra = true;
-    String collection_path = (base_cfg.getParentFile().getParentFile()).getAbsolutePath();
-
-    HashMap mappings = collection.msm.profiler.getActions(collection_path);
-    if(mappings == null) {
-        Gatherer.println("Mappings is null, which is odd. Leaving all configuration commands which use metadata as they are.");
-    }
-
-    // Now read in base_cfg line by line, parsing important onces and/or replacing them with information pertinent to our collection. Each line is then written back out to the new collect.cfg file.
-    try {
-        BufferedReader in = new BufferedReader(new FileReader(base_cfg));
-        BufferedWriter out = new BufferedWriter(new FileWriter(new_cfg, false)); // Overwrite whats there.
-        String command = null;
-        while((command = in.readLine()) != null) {
-        // We have to test the end of command for the special character '\'. If found, remove it and append the next line, then repeat.
-        while(command.trim().endsWith("\\")) {
-            command = command.substring(0, command.lastIndexOf("\\"));
-            String next_line = in.readLine();
-            if(next_line != null) {
-            command = command + next_line;
-            }
+    private void updateCollectionCFG(File base_cfg, File new_cfg, String description, String email, String title) {
+        boolean first_name = true;
+        boolean first_extra = true;
+        String collection_path = (base_cfg.getParentFile().getParentFile()).getAbsolutePath();
+
+        HashMap mappings = collection.msm.profiler.getActions(collection_path);
+        if(mappings == null) {
+            Gatherer.println("Mappings is null, which is odd. Leaving all configuration commands which use metadata as they are.");
         }
-        ///ystem.err.println("Read: " + command);
-        // Now we've finished parsing a line, determine what to do with it.
-        String command_lc = command.toLowerCase();
-        // We replace the creator string with our own.
-        if(command_lc.startsWith(Utility.CFG_CREATOR)) {
-           ///ystem.err.println("Found creator - replace with current");
-           write(out, Utility.CFG_CREATOR + " " + email);
-        }
-        else if(command_lc.startsWith(Utility.CFG_MAINTAINER)) {
-           ///ystem.err.println("Found maintainer - replace with current");
-           write(out, Utility.CFG_MAINTAINER + " " + email);
-        }
-        else if(command_lc.startsWith(Utility.CFG_COLLECTIONMETA_COLLECTIONNAME)) {
-            if(first_name) {
-            write(out, Utility.CFG_COLLECTIONMETA_COLLECTIONNAME + " \"" + title + "\"");
-            first_name = false;
-            }
-        }
-        else if(command_lc.startsWith(Utility.CFG_COLLECTIONMETA_COLLECTIONEXTRA)) {
-            if(first_extra) {
-            write(out, Utility.CFG_COLLECTIONMETA_COLLECTIONEXTRA + " \"" + description + "\"");
-            first_extra = false;
-            }
-        }
-        else if(command_lc.startsWith(Utility.CFG_COLLECTIONMETA_ICONCOLLECTION)) {
-            write(out, Utility.CFG_COLLECTIONMETA_ICONCOLLECTION + " \"\"");
-        }
-
+
+        // Now read in base_cfg line by line, parsing important onces and/or replacing them with information pertinent to our collection. Each line is then written back out to the new collect.cfg file.
+        try {
+            BufferedReader in = new BufferedReader(new FileReader(base_cfg));
+            BufferedWriter out = new BufferedWriter(new FileWriter(new_cfg, false)); // Overwrite whats there.
+            String command = null;
+            while((command = in.readLine()) != null) {
+            // We have to test the end of command for the special character '\'. If found, remove it and append the next line, then repeat.
+            while(command.trim().endsWith("\\")) {
+                command = command.substring(0, command.lastIndexOf("\\"));
+                String next_line = in.readLine();
+                if(next_line != null) {
+                    command = command + next_line;
+                }
+            }
+            ///ystem.err.println("Read: " + command);
+            // Now we've finished parsing a line, determine what to do with it.
+            String command_lc = command.toLowerCase();
+            // We replace the creator string with our own.
+            /*
+            if(command_lc.startsWith(Utility.CFG_CREATOR)) {
+                ///ystem.err.println("Found creator - replace with current");
+                write(out, Utility.CFG_CREATOR + " " + email);
+            }
+            else if(command_lc.startsWith(Utility.CFG_MAINTAINER)) {
+                ///ystem.err.println("Found maintainer - replace with current");
+                write(out, Utility.CFG_MAINTAINER + " " + email);
+            }
+            else if(command_lc.startsWith(Utility.CFG_COLLECTIONMETA_COLLECTIONNAME)) {
+                if(first_name) {
+                    write(out, Utility.CFG_COLLECTIONMETA_COLLECTIONNAME + " \"" + title + "\"");
+                    first_name = false;
+                }
+            }
+            else if(command_lc.startsWith(Utility.CFG_COLLECTIONMETA_COLLECTIONEXTRA)) {
+                if(first_extra) {
+                    write(out, Utility.CFG_COLLECTIONMETA_COLLECTIONEXTRA + " \"" + description + "\"");
+                    first_extra = false;
+                }
+            }
+            else if(command_lc.startsWith(Utility.CFG_COLLECTIONMETA_ICONCOLLECTION)) {
+                write(out, Utility.CFG_COLLECTIONMETA_ICONCOLLECTION + " \"\"");
+            }
+            */
         // Just before we try more general parsing there are the special cases to check. These are explicit changes required by some collections to produce sensible results.
-        else if(special_case == SPECIAL_DLS && command_lc.equals("classify      hierarchy -hfile azlist.txt -metadata azlist -sort title -buttonname title -hlist_at_top")) {
-            write(out, "classify AZList -metadata dls.Title -buttonname Title");
-        }
-        else if(command_lc.startsWith(Utility.CFG_CLASSIFY)) {
+            if(special_case == SPECIAL_DLS && command_lc.equals("classify      hierarchy -hfile azlist.txt -metadata azlist -sort title -buttonname title -hlist_at_top")) {
+                write(out, "classify AZList -metadata dls.Title -buttonname Title");
+            }
+            else if(command_lc.startsWith(Utility.CFG_CLASSIFY)) {
             StringTokenizer tokenizer = new StringTokenizer(command);
             StringBuffer text = new StringBuffer(tokenizer.nextToken());

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

@@ -65 +65 @@
  */
 public class CollectionPane
-    extends JPanel
-    implements ActionListener, FocusListener {
-    /** The group encompassing all of the components available as drop targets for drag and drop actions. Required so that only one component renders the ghost and higlights itself as a target, which the other members are restored to their original, pristine, condition. */
-    private DragGroup group                  =  null;
-    /** The tree showing the files within the collection. */
-    private DragTree collection_tree         =  null;
-    /** The tree showing the available source workspace. */
-    private WorkspaceTree workspace_tree     =  null;
-    /** The threaded queue that handles the actually movement of files, so that the gui remains responsive. */
-    private FileQueue file_queue          =  null;
-    /** The filter currently applied to the collection tree. */
-    private Filter collection_filter = null;
-    /** The filter currently applied to the workspace tree. */
-    private Filter workspace_filter = null;
-    /** The collection model which is used to build, and hold the data of, the collection tree. */
-    private TreeModel collection    = null;
-    /** The GTree model used as the data source for the workspace tree. */
-    private TreeModel workspace          =  null;
-    /** The button used to cancel all pending file queue jobs. */
-    private JButton stop_action           =  null;
-    /** The button used to create a new folder in the collection tree. */
-    private JButton new_folder            =  null;
-    /** The label shown at the top of the collection tree. */
-    private JLabel collection_label       =  null;
-    /** The label shown in the status area explaining the file apon which action is taking place. */
-    private JLabel filename_label         =  null;
-    /** The label shown explaining the current state of the file queue thread. */
-    private JLabel status_label           =  null;
-    /** The label at the top of the workspace tree. */
-    private JLabel workspace_label        =  null;
-    /** The panel that contains the collection tree. */
-    private JPanel collection_pane        =  null;
-    /** The panel that contains the various controls including the status area. */
-    private JPanel control_pane           =  null;
-    /** The panel that contains the workspace tree. */
-    private JPanel workspace_pane         =  null;
-    /** The scrollable area into which the collection tree is placed. */
-    private JScrollPane collection_scroll =  null;
-    /** The scrollable area into which the workspace tree is placed. */
-    private JScrollPane workspace_scroll  =  null;
-    /** A split pane seperating the two trees, allowing for the screen real-estate for each to be changed. */
-    private JSplitPane tree_pane          =  null;
-    /** Text fragment arguments used to fill in phrases returned from the dictionary. */
-    private String args[]                 =  null;
-    /** Ensures that expansion and selection events between collection trees based on the same model are synchronized. */
-    private TreeSynchronizer collection_tree_sync = null;
-    /** Ensures that expansion and selection events between workspace trees based on the same model are synchronized. */
-    private TreeSynchronizer workspace_tree_sync = null;
-    /** The button used to delete files, which also doubles as a drop target for files from the Trees. */
-    private UndoManager bin_button            =  null;
-    /** The default size of a label in the interface. */
-    static final private Dimension LABEL_SIZE = new Dimension(100,30);
-    /** The default size of a special mapping dialog. */
-    static final Dimension DIALOG_SIZE = new Dimension(400, 120);
-    /** The minimum size a gui component can become. */
-    static private Dimension MIN_SIZE    = new Dimension( 90,  90);
-    /** The default size of the status area. */
-    static private Dimension STATUS_SIZE = new Dimension(450, 120);
-    /** The initial size of the trees. */
-    static private Dimension TREE_SIZE   = new Dimension(400, 430);
-
-    /* Constructor.
-     * @param tree_sync Ensures that expansion events between like trees are synchronized.
-     * @see org.greenstone.gatherer.file.FileManager
-     * @see org.greenstone.gatherer.file.FileQueue
-     */
-    public CollectionPane(TreeSynchronizer workspace_tree_sync, TreeSynchronizer collection_tree_sync) {
+    extends JPanel
+    implements ActionListener, FocusListener {
+    /** The group encompassing all of the components available as drop targets for drag and drop actions. Required so that only one component renders the ghost and higlights itself as a target, which the other members are restored to their original, pristine, condition. */
+    private DragGroup group               =  null;
+    /** The tree showing the files within the collection. */
+    private DragTree collection_tree         =  null;
+    /** The tree showing the available source workspace. */
+    private WorkspaceTree workspace_tree     =  null;
+    /** The threaded queue that handles the actually movement of files, so that the gui remains responsive. */
+    private FileQueue file_queue          =  null;
+    /** The filter currently applied to the collection tree. */
+    private Filter collection_filter = null;
+    /** The filter currently applied to the workspace tree. */
+    private Filter workspace_filter = null;
+    /** The collection model which is used to build, and hold the data of, the collection tree. */
+    private TreeModel collection    = null;
+    /** The GTree model used as the data source for the workspace tree. */
+    private TreeModel workspace       =  null;
+    /** The button used to cancel all pending file queue jobs. */
+    private JButton stop_action        =  null;
+    /** The button used to create a new folder in the collection tree. */
+    private JButton new_folder          =  null;
+    /** The label shown at the top of the collection tree. */
+    private JLabel collection_label    =  null;
+    /** The label shown in the status area explaining the file apon which action is taking place. */
+    private JLabel filename_label        =  null;
+    /** The label shown explaining the current state of the file queue thread. */
+    private JLabel status_label        =  null;
+    /** The label at the top of the workspace tree. */
+    private JLabel workspace_label      =  null;
+    /** The panel that contains the collection tree. */
+    private JPanel collection_pane      =  null;
+    /** The panel that contains the various controls including the status area. */
+    private JPanel control_pane        =  null;
+    /** The panel that contains the workspace tree. */
+    private JPanel workspace_pane        =  null;
+    /** The scrollable area into which the collection tree is placed. */
+    private JScrollPane collection_scroll =  null;
+    /** The scrollable area into which the workspace tree is placed. */
+    private JScrollPane workspace_scroll  =  null;
+    /** A split pane seperating the two trees, allowing for the screen real-estate for each to be changed. */
+    private JSplitPane tree_pane          =  null;
+    /** Text fragment arguments used to fill in phrases returned from the dictionary. */
+    private String args[]                =  null;
+    /** Ensures that expansion and selection events between collection trees based on the same model are synchronized. */
+    private TreeSynchronizer collection_tree_sync = null;
+    /** Ensures that expansion and selection events between workspace trees based on the same model are synchronized. */
+    private TreeSynchronizer workspace_tree_sync = null;
+    /** The button used to delete files, which also doubles as a drop target for files from the Trees. */
+    private UndoManager bin_button          =  null;
+    /** The default size of a label in the interface. */
+    static final private Dimension LABEL_SIZE = new Dimension(100,30);
+    /** The default size of a special mapping dialog. */
+    static final Dimension DIALOG_SIZE = new Dimension(400, 120);
+    /** The minimum size a gui component can become. */
+    static private Dimension MIN_SIZE   = new Dimension( 90,  90);
+    /** The default size of the status area. */
+    static private Dimension STATUS_SIZE = new Dimension(450, 120);
+    /** The initial size of the trees. */
+    static private Dimension TREE_SIZE   = new Dimension(400, 430);
+
+    /* Constructor.
+     * @param tree_sync Ensures that expansion events between like trees are synchronized.
+     * @see org.greenstone.gatherer.file.FileManager
+     * @see org.greenstone.gatherer.file.FileQueue
+     */
+    public CollectionPane(TreeSynchronizer workspace_tree_sync, TreeSynchronizer collection_tree_sync) {
     this.group = new DragGroup();
     this.file_queue = Gatherer.f_man.getQueue();
@@ -149 +149 @@
     new_folder.setPreferredSize(MIN_SIZE);
     Dictionary.registerTooltip(new_folder, "Collection.New_Folder_Tooltip");
-    }
-
-    /** Any implementation of ActionListener requires this method so that when an action is performed the appropriate effect can occur. In this case there are three valid possibilities. If the action occured on the recycle bin, then delete the current selection from the collection tree. If the action instead occured on the new folder button, then create a new folder under the current (single) selection in the collection tree. And finally if the cancel button was pressed, cancel the current, and remaining, jobs on the file queue. */
-    public void actionPerformed(ActionEvent event) {
+    }
+
+    /** Any implementation of ActionListener requires this method so that when an action is performed the appropriate effect can occur. In this case there are three valid possibilities. If the action occured on the recycle bin, then delete the current selection from the collection tree. If the action instead occured on the new folder button, then create a new folder under the current (single) selection in the collection tree. And finally if the cancel button was pressed, cancel the current, and remaining, jobs on the file queue. */
+    public void actionPerformed(ActionEvent event) {
     // If a user has clicked on the bin button directly remove whatever
     // files are selected in the active tree.
     if(event.getSource() == bin_button) {
-        if(!bin_button.ignore()) {
+        if(!bin_button.ignore()) {
         // Find the active tree (you've made selections in).
         DragTree tree = (DragTree) group.getActive();
@@ -164 +164 @@
         TreePath paths[] = tree.getSelectionPaths();
         if(paths != null) {
-            FileNode[] source_nodes = new FileNode[paths.length];
-            for(int i = 0; i < paths.length; i++) {
+            FileNode[] source_nodes = new FileNode[paths.length];
+            for(int i = 0; i < paths.length; i++) {
             source_nodes[i] = (FileNode)(paths[i].getLastPathComponent());
-            }
-            Gatherer.f_man.action(tree, source_nodes, bin_button, null);
-        }
-        }
+            }
+            Gatherer.f_man.action(tree, source_nodes, bin_button, null);
+        }
+        }
     }
     // If a user has clicked on new_folder create a new folder under
     // whatever node is selected.
     else if(event.getSource() == new_folder && collection_tree != null) {
-        int count = collection_tree.getSelectionCount();
-        boolean error = false;
-        if(count == 1) {
+        int count = collection_tree.getSelectionCount();
+        boolean error = false;
+        if(count == 1) {
         TreePath path = collection_tree.getSelectionPath();
         FileNode node = (FileNode) path.getLastPathComponent();
         if(node.getAllowsChildren()) {
-            Gatherer.f_man.newFolder(collection_tree, node);
+            Gatherer.f_man.newFolder(collection_tree, node);
         }
         else {
-            // try the parent
-            FileNode parent = (FileNode)node.getParent();
-            if (parent!=null && parent.getAllowsChildren()) {
+            // try the parent
+            FileNode parent = (FileNode)node.getParent();
+            if (parent!=null && parent.getAllowsChildren()) {
             Gatherer.f_man.newFolder(collection_tree, parent);
-            } else {
+            } else {
             error = true;
-            }
-        }
-        }
-        else {
+            }
+        }
+        }
+        else {
         error = true;
-        }
-        if(error) {
+        }
+        if(error) {
         // instead of an error, we now create a new folder at the root
         FileNode node = (FileNode) collection_tree.getModel().getRoot();
         Gatherer.f_man.newFolder(collection_tree, node);
         //JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("FileActions.No_Parent_For_New_Folder"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
-        }
+        }
     }
     else if(event.getSource() == stop_action) {
-        file_queue.cancelAction();
-    }
-    }
-    /** Called whenever a significant change occurs in the current collections state, such as a new collection being loaded or the current one being closed. Several actions must occur in the GUI to indicate this change to the user, such as en/disabling the collection tree.
-     * @param ready <i>true</i> if a collection is loaded and ready to be modified, <i>false</i> otherwise.
-     * @see org.greenstone.gatherer.Configuration
-     * @see org.greenstone.gatherer.Gatherer
-     * @see org.greenstone.gatherer.collection.CollectionManager
-     * @see org.greenstone.gatherer.gui.Coloring
-     * @see org.greenstone.gatherer.gui.Filter
-     * @see org.greenstone.gatherer.util.TreeSynchronizer
-     */
-    public void collectionChanged(boolean ready) {
+        file_queue.cancelAction();
+    }
+    }
+    /** Called whenever a significant change occurs in the current collections state, such as a new collection being loaded or the current one being closed. Several actions must occur in the GUI to indicate this change to the user, such as en/disabling the collection tree.
+     * @param ready <i>true</i> if a collection is loaded and ready to be modified, <i>false</i> otherwise.
+     * @see org.greenstone.gatherer.Configuration
+     * @see org.greenstone.gatherer.Gatherer
+     * @see org.greenstone.gatherer.collection.CollectionManager
+     * @see org.greenstone.gatherer.gui.Coloring
+     * @see org.greenstone.gatherer.gui.Filter
+     * @see org.greenstone.gatherer.util.TreeSynchronizer
+     */
+    public void collectionChanged(boolean ready) {
     // Try to retrieve the collections record set.
     collection = Gatherer.c_man.getRecordSet();
     if(collection != null) {
-        args = new String[1];
-        args[0] = Gatherer.c_man.getCollection().getName();
-        Dictionary.registerText(collection_label, "Collection.Collection", args);
-        collection_tree.setModel(collection);
-        collection_tree.repaint();
-        collection_filter.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", false));
+        //args = new String[1];
+        //args[0] = Gatherer.c_man.getCollection().getName();
+        Dictionary.registerText(collection_label, "Collection.Collection");
+        collection_tree.setModel(collection);
+        collection_tree.repaint();
+        collection_filter.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", false));
     }
     else {
-        String args[] = new String[1];
-        args[0] = Dictionary.get("Collection.No_Collection");
-        Dictionary.registerText(collection_label, "Collection.Collection", args);
-        args = null;
-        collection_tree.setModel(new DefaultTreeModel(new DefaultMutableTreeNode("Error")));
-        collection_filter.setBackground(Color.lightGray);
+        String args[] = new String[1];
+        args[0] = Dictionary.get("Collection.No_Collection");
+        Dictionary.registerText(collection_label, "Collection.Collection", args);
+        args = null;
+        collection_tree.setModel(new DefaultTreeModel(new DefaultMutableTreeNode("Error")));
+        collection_filter.setBackground(Color.lightGray);
     }
     collection_tree.setEnabled(ready);
@@ -251 +251 @@
     stop_action.setEnabled(ready);
     new_folder.setEnabled(ready);
-    }
-
-    /** Generates the pane on controls used to 'collect' files into the collection. Resposible for creating, connecting and laying out these controls. */
-    public void display() {
+    }
+
+    /** Generates the pane on controls used to 'collect' files into the collection. Resposible for creating, connecting and laying out these controls. */
+    public void display() {
     // Create Components.
     KeyListenerImpl key_listener = new KeyListenerImpl();
@@ -306 +306 @@
     collection_pane.setSize(TREE_SIZE);
 
-    args = new String[1];
-    args[0] = Dictionary.get("Collection.No_Collection");
+    //args = new String[1];
+    //args[0] = Dictionary.get("Collection.No_Collection");
     collection_label = new JLabel();
     collection_label.setOpaque(true);
-    Dictionary.registerText(collection_label, "Collection.Collection", args);
+    Dictionary.registerText(collection_label, "Collection.No_Collection");
 
     collection = Gatherer.c_man.getRecordSet();
     if(collection != null) {
-        collection_tree = new DragTree(Utility.COLLECTION_TREE, collection, null, true);
-        collection_tree.setEnabled(true);
+        collection_tree = new DragTree(Utility.COLLECTION_TREE, collection, null, true);
+        collection_tree.setEnabled(true);
     }
     else {
-        collection_tree = new DragTree(Utility.COLLECTION_TREE, null, true);
-        collection_tree.setEnabled(false);
+        collection_tree = new DragTree(Utility.COLLECTION_TREE, null, true);
+        collection_tree.setEnabled(false);
     }
     group.add(collection_tree);
@@ -340 +340 @@
     collection_filter = Gatherer.g_man.getFilter(collection_tree);
     if(collection != null) {
-        collection_filter.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", false));
+        collection_filter.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", false));
     }
     else {
-        collection_filter.setBackground(Color.lightGray);
+        collection_filter.setBackground(Color.lightGray);
     }
     // Change the default colours of this filters combobox.
@@ -427 +427 @@
     this.add(tree_pane, BorderLayout.CENTER);
     this.add(control_pane, BorderLayout.SOUTH);
-    }
-    /** This method ensures that a certain tree path is visible and selected within the collection tree, expanding nodes if necessary. If the method is successful the bounds of the new selection are returned. */
-    public Rectangle expandPath(TreePath path) {
+    }
+    /** This method ensures that a certain tree path is visible and selected within the collection tree, expanding nodes if necessary. If the method is successful the bounds of the new selection are returned. */
+    public Rectangle expandPath(TreePath path) {
     collection_tree.setImmediate(true);
     collection_tree.scrollPathToVisible(path);
@@ -435 +435 @@
     collection_tree.setImmediate(false);
     return collection_tree.getRowBounds(collection_tree.getRowForPath(path));
-    }
-    /** Called whenever this pane gains focus, this method ensures that the various tree renderers are correctly colouring the tree (as these settings sometimes get lost).
-     * @param event A <strong>FocusEvent</strong> containing details about the focus action performed.
-     */
-    public void focusGained(FocusEvent event) {
+    }
+    /** Called whenever this pane gains focus, this method ensures that the various tree renderers are correctly colouring the tree (as these settings sometimes get lost).
+     * @param event A <strong>FocusEvent</strong> containing details about the focus action performed.
+     */
+    public void focusGained(FocusEvent event) {
     DefaultTreeCellRenderer def = new DefaultTreeCellRenderer();
     DefaultTreeCellRenderer w = (DefaultTreeCellRenderer)workspace_tree.getCellRenderer();
     DefaultTreeCellRenderer c = (DefaultTreeCellRenderer)collection_tree.getCellRenderer();
     if(event.getSource() == workspace_tree) {
-        w.setBackgroundSelectionColor(def.getBackgroundSelectionColor());
-        c.setBackgroundSelectionColor(Color.lightGray);
+        w.setBackgroundSelectionColor(def.getBackgroundSelectionColor());
+        c.setBackgroundSelectionColor(Color.lightGray);
     }
     else if(event.getSource() == collection_tree) {
-        c.setBackgroundSelectionColor(def.getBackgroundSelectionColor());
-        w.setBackgroundSelectionColor(Color.lightGray);
+        c.setBackgroundSelectionColor(def.getBackgroundSelectionColor());
+        w.setBackgroundSelectionColor(Color.lightGray);
     }
     repaint();
-    }
-    /** Implementation side-effect, not used in any way.
-     * @param event A <strong>FocusEvent</strong> containing details about the focus action performed.
-     */
-    public void focusLost(FocusEvent event) {
-    }
-
-    /** Called to inform this control panel that it has just gained focus as an effect of the user clicking on its tab.
-     * @see org.greenstone.gatherer.tree.GTree
-     */
-    public void gainFocus() {
+    }
+    /** Implementation side-effect, not used in any way.
+     * @param event A <strong>FocusEvent</strong> containing details about the focus action performed.
+     */
+    public void focusLost(FocusEvent event) {
+    }
+
+    /** Called to inform this control panel that it has just gained focus as an effect of the user clicking on its tab.
+     * @see org.greenstone.gatherer.tree.GTree
+     */
+    public void gainFocus() {
     // Update the menubar's idea of whats been selected
     if (collection_tree != null) {
-        if (collection_tree.isSelectionEmpty()) {
+        if (collection_tree.isSelectionEmpty()) {
         Gatherer.g_man.menu_bar.setMetaAuditSuffix(null);
-        }
-        else {
+        }
+        else {
         Gatherer.g_man.menu_bar.setMetaAuditSuffix(collection_tree.getSelectionDetails());
-        }
+        }
     }
     // Update the meta-audit view to show the current selection, if any.
     Gatherer.g_man.meta_audit.setRecords(getSelected());
-    }
-
-    /** Retrieve a list of the currently selected file records in the active tree. */
-    public FileNode[] getSelected() {
+    }
+
+    /** Retrieve a list of the currently selected file records in the active tree. */
+    public FileNode[] getSelected() {
     TreePath paths[] = collection_tree.getSelectionPaths();
     FileNode records[] = null;
     if(paths != null) {
-        records = new FileNode[paths.length];
-        for(int i = 0; i < records.length; i++) {
+        records = new FileNode[paths.length];
+        for(int i = 0; i < records.length; i++) {
         records[i] = (FileNode) paths[i].getLastPathComponent();
-        }
+        }
     }
     return records;
-    }
-
-    public String getSelectionDetails() {
+    }
+
+    public String getSelectionDetails() {
     return collection_tree.getSelectionDetails();
-    }
-
-
-    public void refreshCollectionTree(int refresh_reason)
-    {
+    }
+
+
+    public void refreshCollectionTree(int refresh_reason)
+    {
     collection_tree.refresh(null);
-    }
-
-
-    public void refreshWorkspaceTree(int refresh_reason)
-    {
+    }
+
+
+    public void refreshWorkspaceTree(int refresh_reason)
+    {
     workspace_tree.refresh(refresh_reason);
-    }
-
-
-    /** Used to set the enabled state, and hence the colouring, of the two tree labels.
-     * @param label The <strong>JLabel</strong> to be affected.
-     * @param state <i>true</i> for enabled, i.e. when a collection is ready, <i>false</i> otherwise.
-     * @param foreground The <strong>Color</strong> to make the foreground text of the label when enabled.
-     * @param background The <strong>Color</strong> to make the background of the label when enabled.
-     */
-    private void setEnabled(JLabel label, boolean state, Color foreground, Color background) {
+    }
+
+
+    /** Used to set the enabled state, and hence the colouring, of the two tree labels.
+     * @param label The <strong>JLabel</strong> to be affected.
+     * @param state <i>true</i> for enabled, i.e. when a collection is ready, <i>false</i> otherwise.
+     * @param foreground The <strong>Color</strong> to make the foreground text of the label when enabled.
+     * @param background The <strong>Color</strong> to make the background of the label when enabled.
+     */
+    private void setEnabled(JLabel label, boolean state, Color foreground, Color background) {
     ///ystem.err.println("Setting the label color to state " + state);
     if(state) {
-        label.setBackground(background);
-        label.setForeground(foreground);
+        label.setBackground(background);
+        label.setForeground(foreground);
     }
     else {
-        label.setBackground(Color.lightGray);
-        label.setForeground(Color.black);
+        label.setBackground(Color.lightGray);
+        label.setForeground(Color.black);
     }
     label.repaint();
     ///ystem.err.println("Color is now " + label.getBackground());
-    }
-
-    /** When a user right-clicks within the trees on the collection pane view they are presented with a small popup menu of context based options. This class provides such functionality.
-     */
-    private class GPopupMenu
-    extends JPopupMenu
-    implements ActionListener {
-    /** The tree over which the right click action occured. */
-    private DragTree tree = null;
-    /** The file record over which the right click action occured, if any. */
-    private FileNode node = null;
-    /** A menu item enabled if a delete action is appropriate in the menus current context. */
-    private JMenuItem delete = null;
-    /** A menu item enabled if a special directory mapping is appropriate in the menus current context. */
-    private JMenuItem map = null;
-    /** A menu item enabled if a new folder action is appropriate in the menus current context. */
-    private JMenuItem new_folder = null;
-    /** A menu item enabled if a show meta-audit dialog action is appropriate in the menus current context. */
-    private JMenuItem show_metaaudit = null;
-    /** A menu item allowing a user to unmap a special directory, if and only if a special directory is selected. */
-    private JMenuItem unmap = null;
-    /** Constructor. */
-    public GPopupMenu(DragTree tree, MouseEvent event) {
-        super();
-        this.tree = tree;
-        TreePath path = tree.getClosestPathForLocation(event.getX(), event.getY());
-        if(path != null) {
-        node = (FileNode)path.getLastPathComponent();
-        // Set Options based on selection and tree
-        if(tree.getSelectionCount() != 0 && tree == collection_tree) {
-            String[] args = new String[1];
-            args[0] = collection_tree.getSelectionDetails();
-            show_metaaudit = new JMenuItem(Dictionary.get("Menu.Metadata_View", args), KeyEvent.VK_V);
-            show_metaaudit.addActionListener(this);
-            add(show_metaaudit);
-        }
-        if(tree == collection_tree && node != null && node.getFile() != null && node.getFile().isDirectory() && !node.isReadOnly()) {
-            new_folder = new JMenuItem(Dictionary.get("CollectionPopupMenu.New_Folder"), KeyEvent.VK_N);
-            new_folder.addActionListener(this);
-            add(new_folder);
-            add(new JSeparator());
-        }
-        if(tree == collection_tree && tree.getSelectionCount() != 0 && node != null && !node.isReadOnly()) {
-            delete = new JMenuItem(Dictionary.get("CollectionPopupMenu.Delete"), KeyEvent.VK_D);
-            delete.addActionListener(this);
-            add(delete);
-        }
-        if(tree == workspace_tree && node != null && !node.isLeaf()) {
-            String node_name = node.toString();
-            FileNode root = (FileNode) tree.getModel().getRoot();
-            if(!node_name.equals(Dictionary.get("Tree.World")) && !node_name.equals(Dictionary.get("Tree.Root")) && !node_name.equals(Dictionary.get("Tree.Public")) && !node_name.equals(Dictionary.get("Tree.Private"))) {
-            // You can unmap 1st level nodes.
-            if(root.getIndex(node) != -1) {
-                unmap = new JMenuItem(Dictionary.get("MappingPrompt.Unmap"), KeyEvent.VK_U);
-                unmap.addActionListener(this);
-                add(unmap);
+    }
+
+        /** When a user right-clicks within the trees on the collection pane view they are presented with a small popup menu of context based options. This class provides such functionality.
+         */
+        private class GPopupMenu
+            extends JPopupMenu
+            implements ActionListener {
+
+            /** The tree over which the right click action occured. */
+            private DragTree tree = null;
+            /** The file record over which the right click action occured, if any. */
+            private FileNode node = null;
+            private JMenuItem collapse_expand_folder_menuitem;
+            /** A menu item enabled if a delete action is appropriate in the menus current context. */
+            private JMenuItem delete = null;
+            /** A menu item enabled if a special directory mapping is appropriate in the menus current context. */
+            private JMenuItem map = null;
+            /** A menu item enabled if a new folder action is appropriate in the menus current context. */
+            private JMenuItem new_folder = null;
+            /** A menu item enabled if a show meta-audit dialog action is appropriate in the menus current context. */
+            private JMenuItem show_metaaudit = null;
+            /** A menu item allowing a user to unmap a special directory, if and only if a special directory is selected. */
+            private JMenuItem unmap = null;
+            private TreePath path = null;
+            /** Constructor. */
+            public GPopupMenu(DragTree tree, MouseEvent event) {
+                super();
+                this.tree = tree;
+                this.path = tree.getClosestPathForLocation(event.getX(), event.getY());
+                if(path != null) {
+                node = (FileNode)path.getLastPathComponent();
+                    // Any folder node gets a menu item allowing you to collapse or expand it depending on its current status
+                    if(!node.isLeaf()) {
+                        // Collapse
+                        if(tree.isExpanded(path)) {
+                            collapse_expand_folder_menuitem = new JMenuItem(Dictionary.get("Menu.Collapse"), KeyEvent.VK_C);
+                        }
+                        // Expand
+                        else {
+                            collapse_expand_folder_menuitem = new JMenuItem(Dictionary.get("Menu.Expand"), KeyEvent.VK_O);
+                        }
+                        collapse_expand_folder_menuitem.addActionListener(this);
+                        add(collapse_expand_folder_menuitem);
+                    }
+                    // Set Options based on selection and tree
+                    if(tree.getSelectionCount() != 0 && tree == collection_tree) {
+                        String[] args = new String[1];
+                        args[0] = collection_tree.getSelectionDetails();
+                        show_metaaudit = new JMenuItem(Dictionary.get("Menu.Metadata_View", args), KeyEvent.VK_V);
+                        show_metaaudit.addActionListener(this);
+                        add(show_metaaudit);
+                    }
+                    if(tree == collection_tree && node != null && node.getFile() != null && node.getFile().isDirectory() && !node.isReadOnly()) {
+                        new_folder = new JMenuItem(Dictionary.get("CollectionPopupMenu.New_Folder"), KeyEvent.VK_N);
+                        new_folder.addActionListener(this);
+                        add(new_folder);
+                        add(new JSeparator());
+                    }
+                    if(tree == collection_tree && tree.getSelectionCount() != 0 && node != null && !node.isReadOnly()) {
+                        delete = new JMenuItem(Dictionary.get("CollectionPopupMenu.Delete"), KeyEvent.VK_D);
+                        delete.addActionListener(this);
+                        add(delete);
+                    }
+                    if(tree == workspace_tree && node != null && !node.isLeaf()) {
+                        String node_name = node.toString();
+                        FileNode root = (FileNode) tree.getModel().getRoot();
+                        if(!node_name.equals(Dictionary.get("Tree.World")) && !node_name.equals(Dictionary.get("Tree.Root")) && !node_name.equals(Dictionary.get("Tree.Public")) && !node_name.equals(Dictionary.get("Tree.Private"))) {
+                            // You can unmap 1st level nodes.
+                            if(root.getIndex(node) != -1) {
+                                unmap = new JMenuItem(Dictionary.get("MappingPrompt.Unmap"), KeyEvent.VK_U);
+                                unmap.addActionListener(this);
+                                add(unmap);
+                            }
+                            // Or map any other level directories.
+                            else {
+                                map = new JMenuItem(Dictionary.get("MappingPrompt.Map"), KeyEvent.VK_M);
+                                map.addActionListener(this);
+                                add(map);
+                            }
+                        }
+                    }
+                    show(tree, event.getX(), event.getY());
+                }
             }
-            // Or map any other level directories.
-            else {
-                map = new JMenuItem(Dictionary.get("MappingPrompt.Map"), KeyEvent.VK_M);
-                map.addActionListener(this);
-                add(map);
+
+            /** Called whenever one of the menu items is actioned apon, this method then causes the appropriate effect. */
+            public void actionPerformed(ActionEvent event) {
+                Object source = event.getSource();
+                if(source == delete) {
+                    // Retrieve the selection. Of course this gets a bit tricky as the user may have right clicked over a node not in the current selection, in which case we remove only that node.
+                    TreePath[] selection_paths = tree.getSelectionPaths();
+                    if(selection_paths != null) {
+                        FileNode[] source_nodes = new FileNode[selection_paths.length];
+                        boolean found = false;
+                        for(int i = 0; i < selection_paths.length; i++) {
+                            source_nodes[i] = (FileNode) selection_paths[i].getLastPathComponent();
+                            if(node != null) {
+                                found = found || source_nodes[i].equals(node);
+                            }
+                        }
+                        if(node != null && !found) {
+                            source_nodes = null;
+                            source_nodes = new FileNode[1];
+                            source_nodes[0] = node;
+                        }
+                        // Fire a delete action
+                        Gatherer.f_man.action(tree, source_nodes, bin_button, null);
+                        source_nodes = null;
+                    }
+                    selection_paths = null;
+                }
+                else if(source == map && node != null) {
+                    MappingPrompt mp = new MappingPrompt(node.getFile());
+                    mp.destroy();
+                    mp = null;
+                }
+                else if(source == new_folder && node != null) {
+                    Gatherer.f_man.newFolder(tree, node);
+                }
+                else if(source == show_metaaudit) {
+                    Gatherer.g_man.showMetaAuditBox();
+                }
+                else if(source == unmap && node != null) {
+                    Gatherer.c_man.removeDirectoryMapping(node);
+                }
+                else if(source == collapse_expand_folder_menuitem && path != null && node != null && !node.isLeaf()) {
+                    // Collapse
+                    if(tree.isExpanded(path)) {
+                        tree.collapsePath(path);
+                    }
+                    // Expand
+                    else {
+                        tree.expandPath(path);
+                    }
+                }
             }
-            }
-        }
-        show(tree, event.getX(), event.getY());
-        }
-    }
-    /** Called whenever one of the menu items is actioned apon, this method then causes the appropriate effect. */
-    public void actionPerformed(ActionEvent event) {
-        if(event.getSource() == delete) {
-        // Retrieve the selection. Of course this gets a bit tricky as the user may have right clicked over a node not in the current selection, in which case we remove only that node.
-        TreePath[] selection_paths = tree.getSelectionPaths();
-        if(selection_paths != null) {
-            FileNode[] source_nodes = new FileNode[selection_paths.length];
-            boolean found = false;
-            for(int i = 0; i < selection_paths.length; i++) {
-            source_nodes[i] = (FileNode) selection_paths[i].getLastPathComponent();
-            if(node != null) {
-                found = found || source_nodes[i].equals(node);
-            }
-            }
-            if(node != null && !found) {
-            source_nodes = null;
-            source_nodes = new FileNode[1];
-            source_nodes[0] = node;
-            }
-            // Fire a delete action
-            Gatherer.f_man.action(tree, source_nodes, bin_button, null);
-            source_nodes = null;
-        }
-        selection_paths = null;
-        }
-        else if(event.getSource() == map && node != null) {
-        MappingPrompt mp = new MappingPrompt(node.getFile());
-        mp.destroy();
-        mp = null;
-        }
-        else if(event.getSource() == new_folder && node != null) {
-        Gatherer.f_man.newFolder(tree, node);
-        }
-        else if(event.getSource() == show_metaaudit) {
-        Gatherer.g_man.showMetaAuditBox();
-        }
-        else if(event.getSource() == unmap && node != null) {
-        Gatherer.c_man.removeDirectoryMapping(node);
-        }
-    }
-    }
-
-    /** This class listens for certain key presses, such as [Enter] or [Delete], and responds appropriately. */
-    private class KeyListenerImpl
+        }
+
+    /** This class listens for certain key presses, such as [Enter] or [Delete], and responds appropriately. */
+    private class KeyListenerImpl
     extends KeyAdapter {
     /** Called whenever a key that was pressed is released, it is this action that will cause the desired effects (this allows for the key event itself to be processed prior to this listener dealing with it). */
     public void keyReleased(KeyEvent event) {
                 ///ystem.err.println("Key Release detected. " + event.getKeyCode());
-        if(event.getKeyCode() == KeyEvent.VK_DELETE) {
+        if(event.getKeyCode() == KeyEvent.VK_DELETE) {
         // Get the selected files from the tree and removal them using the default dnd removal method.
         // Find the active tree (you've made selections in).
@@ -649 +677 @@
         TreePath paths[] = tree.getSelectionPaths();
         if(paths != null) {
-            FileNode[] source_nodes = new FileNode[paths.length];
-            for(int i = 0; i < source_nodes.length; i++) {
+            FileNode[] source_nodes = new FileNode[paths.length];
+            for(int i = 0; i < source_nodes.length; i++) {
             source_nodes[i] = (FileNode) paths[i].getLastPathComponent();
-            }
-            Gatherer.f_man.action(tree, source_nodes, bin_button, null);
-            source_nodes = null;
-        }
-        }
-        else if(event.getKeyCode() == KeyEvent.VK_ENTER) {
+            }
+            Gatherer.f_man.action(tree, source_nodes, bin_button, null);
+            source_nodes = null;
+        }
+        }
+        else if(event.getKeyCode() == KeyEvent.VK_ENTER) {
         // Get the first selected file.
         DragTree tree = (DragTree)event.getSource();
         TreePath path = tree.getSelectionPath();
         if(path != null) {
-            File file = ((FileNode)path.getLastPathComponent()).getFile();
-            if(file != null && file.isFile()) {
+            File file = ((FileNode)path.getLastPathComponent()).getFile();
+            if(file != null && file.isFile()) {
             Gatherer.self.spawnApplication(file);
-            }
-            else {
-            if(!tree.isExpanded(path)) {
-                tree.expandPath(path);
             }
             else {
-                tree.collapsePath(path);
+            if(!tree.isExpanded(path)) {
+                tree.expandPath(path);
             }
-            }
-        }
-        }
-    }
-    }
-
-    /** This provides a small prompt for gathering addition details about a special directory mapping such as its symbolic name. */
-    private class MappingPrompt
+            else {
+                tree.collapsePath(path);
+            }
+            }
+        }
+        }
+    }
+    }
+
+    /** This provides a small prompt for gathering addition details about a special directory mapping such as its symbolic name. */
+    private class MappingPrompt
     extends JDialog
     implements ActionListener, KeyListener {
@@ -688 +716 @@
     private JTextField name_field = null;
     public MappingPrompt(File file) {
-        super(Gatherer.g_man);
-        setModal(true);
-        setSize(DIALOG_SIZE);
-        Dictionary.setText(this, "MappingPrompt.Title");
-
-        // Creation
-        JPanel content_pane = (JPanel) getContentPane();
-        JPanel center_pane = new JPanel();
-        JPanel file_pane = new JPanel();
-        JLabel file_label = new JLabel();
-        file_label.setPreferredSize(LABEL_SIZE);
-        Dictionary.setText(file_label, "MappingPrompt.File");
-        JLabel file_field = new JLabel(file.getAbsolutePath());
-        JPanel name_pane = new JPanel();
-        JLabel name_label = new JLabel();
-        name_label.setPreferredSize(LABEL_SIZE);
-        Dictionary.setText(name_label, "MappingPrompt.Name");
-        name_field = new JTextField(file.getName());
-        JPanel button_pane = new JPanel();
-        ok_button = new JButton();
-        ok_button.setEnabled(name_field.getText().length() > 0);
-        Dictionary.setBoth(ok_button, "General.OK", "General.OK_Tooltip");
-        cancel_button = new JButton();
-        Dictionary.setBoth(cancel_button, "General.Cancel", "General.Cancel_Tooltip");
-
-        // Connection
-        cancel_button.addActionListener(this);
-        ok_button.addActionListener(this);
-        name_field.addKeyListener(this);
-        // Layout
-        file_pane.setLayout(new BorderLayout());
-        file_pane.add(file_label, BorderLayout.WEST);
-        file_pane.add(file_field, BorderLayout.CENTER);
-
-        name_pane.setLayout(new BorderLayout());
-        name_pane.add(name_label, BorderLayout.WEST);
-        name_pane.add(name_field, BorderLayout.CENTER);
-
-        center_pane.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
-        center_pane.setLayout(new GridLayout(2,1,5,5));
-        center_pane.add(file_pane);
-        center_pane.add(name_pane);
-
-        button_pane.setLayout(new GridLayout(1,2,5,5));
-        button_pane.add(ok_button);
-        button_pane.add(cancel_button);
-
-        content_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
-        content_pane.setLayout(new BorderLayout());
-        content_pane.add(center_pane, BorderLayout.CENTER);
-        content_pane.add(button_pane, BorderLayout.SOUTH);
-        // Display
-        Dimension screen_size = Gatherer.config.screen_size;
-        setLocation((screen_size.width - DIALOG_SIZE.width) / 2, (screen_size.height - DIALOG_SIZE.height) / 2);
-        show();
-        // If not cancelled create mapping.
-        if(!cancelled) {
+        super(Gatherer.g_man);
+        setModal(true);
+        setSize(DIALOG_SIZE);
+        Dictionary.setText(this, "MappingPrompt.Title");
+
+        // Creation
+        JPanel content_pane = (JPanel) getContentPane();
+        JPanel center_pane = new JPanel();
+        JPanel file_pane = new JPanel();
+        JLabel file_label = new JLabel();
+        file_label.setPreferredSize(LABEL_SIZE);
+        Dictionary.setText(file_label, "MappingPrompt.File");
+        JLabel file_field = new JLabel(file.getAbsolutePath());
+        JPanel name_pane = new JPanel();
+        JLabel name_label = new JLabel();
+        name_label.setPreferredSize(LABEL_SIZE);
+        Dictionary.setText(name_label, "MappingPrompt.Name");
+        name_field = new JTextField(file.getName());
+        JPanel button_pane = new JPanel();
+        ok_button = new JButton();
+        ok_button.setEnabled(name_field.getText().length() > 0);
+        Dictionary.setBoth(ok_button, "General.OK", "General.OK_Tooltip");
+        cancel_button = new JButton();
+        Dictionary.setBoth(cancel_button, "General.Cancel", "General.Cancel_Tooltip");
+
+        // Connection
+        cancel_button.addActionListener(this);
+        ok_button.addActionListener(this);
+        name_field.addKeyListener(this);
+        // Layout
+        file_pane.setLayout(new BorderLayout());
+        file_pane.add(file_label, BorderLayout.WEST);
+        file_pane.add(file_field, BorderLayout.CENTER);
+
+        name_pane.setLayout(new BorderLayout());
+        name_pane.add(name_label, BorderLayout.WEST);
+        name_pane.add(name_field, BorderLayout.CENTER);
+
+        center_pane.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
+        center_pane.setLayout(new GridLayout(2,1,5,5));
+        center_pane.add(file_pane);
+        center_pane.add(name_pane);
+
+        button_pane.setLayout(new GridLayout(1,2,5,5));
+        button_pane.add(ok_button);
+        button_pane.add(cancel_button);
+
+        content_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        content_pane.setLayout(new BorderLayout());
+        content_pane.add(center_pane, BorderLayout.CENTER);
+        content_pane.add(button_pane, BorderLayout.SOUTH);
+        // Display
+        Dimension screen_size = Gatherer.config.screen_size;
+        setLocation((screen_size.width - DIALOG_SIZE.width) / 2, (screen_size.height - DIALOG_SIZE.height) / 2);
+        show();
+        // If not cancelled create mapping.
+        if(!cancelled) {
         Gatherer.c_man.addDirectoryMapping(name_field.getText(), file);
-        }
+        }
     }
     public void actionPerformed(ActionEvent event) {
-        if(event.getSource() == cancel_button) {
+        if(event.getSource() == cancel_button) {
         cancelled = true;
-        }
-        dispose();
+        }
+        dispose();
     }
     public void destroy() {
-        cancel_button = null;
-        ok_button = null;
-        name_field = null;
+        cancel_button = null;
+        ok_button = null;
+        name_field = null;
     }
     public void keyPressed(KeyEvent event) {
     }
     public void keyReleased(KeyEvent event) {
-        ok_button.setEnabled(name_field.getText().length() > 0);
+        ok_button.setEnabled(name_field.getText().length() > 0);
 
     }
     public void keyTyped(KeyEvent event) {
     }
-    }
-    /** This class listens for mouse clicks and responds right mouse button clicks (popup menu). */
-    private class MouseListenerImpl
+    }
+    /** This class listens for mouse clicks and responds right mouse button clicks (popup menu). */
+    private class MouseListenerImpl
     extends MouseAdapter {
     /** Any subclass of MouseAdapter can override this method to respond to mouse click events. In this case we want to open a pop-up menu if we detect a right mouse click over one of our registered components, and start an external application if someone double clicks on a certain file record. */
     public void mouseClicked(MouseEvent event) {
-        if(SwingUtilities.isRightMouseButton(event)) {
+        if(SwingUtilities.isRightMouseButton(event)) {
         new GPopupMenu((DragTree)event.getSource(), event);
-        }
-    }
-    }
+        }
+    }
+    }
 }

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

@@ -74 +74 @@
     static final private Dimension SIZE = new Dimension(100,25);
     /** Preprogrammed default filters. */
-    static final private String DEFAULTS[] = {"^.*\\.html?$", "^.*\\.xml$", "^.*\\.txt$", "(^.*\\.jpe?g$)|(^.*\\.png$)|(^.\\.gif$)|(^.\\.bmp$)|(^.\\.tif$)"};
+    static final private String DEFAULTS[] = {"^.*\\.html?$", "^.*\\.xml$", "^.*\\.txt$", "(^.*\\.jpe?g$)|(^.*\\.png$)|(^.*\\.gif$)|(^.*\\.bmp$)|(^.*\\.tif$)"};
 
     /** Constructor.
@@ -129 +129 @@
     }
 
-    /** Used to restore the filter state to enabled, the normal state during collection editing. 
+    /** Used to restore the filter state to enabled, the normal state during collection editing.
      * @param state The new state for the filter. <i>true</i> for enabled, <i>false</i> otherwise.
      */
@@ -282 +282 @@
     }
     /** An object that holds a filter entry. This is string used for the filter pattern and, if not custom built, its name. */
-    private class Entry 
+    private class Entry
     implements Comparable {
     /** The compiled pattern created from a regular expression. */

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

@@ -202 +202 @@
     }
     else if(esrc == menu_bar.file_options) {
+         // Just incase the user has edited the GeneralSettings of a collection without losing focus afterwards. Well I'm forever losing foc... ooh shiney.
+         config_pane.loseFocus();
+         // And spawn a new preferences.
         new Preferences();
     }
@@ -459 +462 @@
 
         preview_pane = new PreviewPane();
-        preview_pane.display(); 
-        if(Gatherer.config.get("workflow.preview", true)) {         
+        preview_pane.display();
+        if(Gatherer.config.get("workflow.preview", true)) {
         tab_pane.addTab("GUI.Preview", Utility.getImage("final.gif"), preview_pane);
         tab_pane.setEnabledAt(tab_pane.indexOfComponent(preview_pane), false);

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

@@ -234 +234 @@
       this.element = element;
       // Transform the raw text to be GREENSTONE and DOM compatible - as that will be its next destination immediately after being added to the value model
-      this.value = Codec.transform(value, Codec.ENCODE_PATH); 
+      this.value = Codec.transform(value, Codec.ENCODE_PATH);
       this.value = Codec.transform(this.value, Codec.REMOVE_SQUARE_BRACKET);
       this.value = Codec.transform(this.value, Codec.TEXT_TO_DOM);
@@ -335 +335 @@
     if(ready) {
         TreeModel collection_model = Gatherer.c_man.getRecordSet();
-        String[] args = new String[1];
-        args[0] = Gatherer.c_man.getCollection().getName();
-        Dictionary.registerText(collection_label, "Collection.Collection", args);
+        //String[] args = new String[1];
+        //args[0] = Gatherer.c_man.getCollection().getName();
+        Dictionary.registerText(collection_label, "Collection.Collection");
         // Update label coloring.
         collection_label.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", false));
@@ -389 +389 @@
     ///atherer.println("\tCreating collection_label");
     collection_label = new JLabel();
-    Dictionary.registerText(collection_label, "Collection.Collection");
+    Dictionary.registerText(collection_label, "Collection.No_Collection");
     collection_label.setOpaque(true);
 
@@ -972 +972 @@
 
 
-    /** Provides a popup menu to display when a right mouse button click is detected over the collection tree. */
-    private class RightButtonMenu
-    extends JPopupMenu
-    implements ActionListener {
-    /** Constructor.
-     * @param event The <strong>MouseEvent</strong> that triggered the creation of this menu. Used to determine where the menu will be located.
-     */
-    private RightButtonMenu(MouseEvent event) {
-        super();
-        // Creation
-        String[] args = new String[1];
-        args[0] = collection_tree.getSelectionDetails();
-        JMenuItem show_metaaudit = new JMenuItem(Dictionary.get("Menu.Metadata_View", args), KeyEvent.VK_V);
-        show_metaaudit.addActionListener(this);
-        add(show_metaaudit);
-        // Display
-        show(collection_tree, event.getX(), event.getY());
-        show_metaaudit = null;
-    }
-
-    /** Called whenever a user clicks on the single menu item, view all assigned metadata.
-     * @param event An <strong>ActionEvent</strong> containing further information about the action.
-     * @see org.greenstone.gatherer.Gatherer
-     * @see org.greenstone.gatherer.gui.GUIManager
-     */
-    public void actionPerformed(ActionEvent event) {
-        Gatherer.g_man.showMetaAuditBox();
-    }
-    }
+    /** Provides a popup menu to display when a right mouse button click is detected over the collection tree. */
+    private class RightButtonMenu
+        extends JPopupMenu
+        implements ActionListener {
+
+        private FileNode node;
+        private JMenuItem collapse_expand_folder_menuitem;
+        private JMenuItem show_metaaudit;
+        private TreePath path;
+
+        /** Constructor.
+         * @param event The <strong>MouseEvent</strong> that triggered the creation of this menu. Used to determine where the menu will be located.
+         */
+        private RightButtonMenu(MouseEvent event) {
+            super();
+            this.path = collection_tree.getClosestPathForLocation(event.getX(), event.getY());
+            this.node = (FileNode)path.getLastPathComponent();
+           // Creation
+            // Any folder node gets a menu item allowing you to collapse or expand it depending on its current status
+            if(!node.isLeaf()) {
+                // Collapse
+                if(collection_tree.isExpanded(path)) {
+                    collapse_expand_folder_menuitem = new JMenuItem(Dictionary.get("Menu.Collapse"), KeyEvent.VK_C);
+                }
+                // Expand
+                else {
+                    collapse_expand_folder_menuitem = new JMenuItem(Dictionary.get("Menu.Expand"), KeyEvent.VK_O);
+                }
+                collapse_expand_folder_menuitem.addActionListener(this);
+                add(collapse_expand_folder_menuitem);
+            }
+            String[] args = new String[1];
+            args[0] = collection_tree.getSelectionDetails();
+            show_metaaudit = new JMenuItem(Dictionary.get("Menu.Metadata_View", args), KeyEvent.VK_V);
+            show_metaaudit.addActionListener(this);
+            add(show_metaaudit);
+            // Display
+            show(collection_tree, event.getX(), event.getY());
+            show_metaaudit = null;
+        }
+
+        /** Called whenever a user clicks on the single menu item, view all assigned metadata.
+         * @param event An <strong>ActionEvent</strong> containing further information about the action.
+         * @see org.greenstone.gatherer.Gatherer
+         * @see org.greenstone.gatherer.gui.GUIManager
+         */
+        public void actionPerformed(ActionEvent event) {
+            Object source = event.getSource();
+            if(source == show_metaaudit) {
+                Gatherer.g_man.showMetaAuditBox();
+            }
+            else if(source == collapse_expand_folder_menuitem && path != null && node != null && !node.isLeaf()) {
+                // Collapse
+                if(collection_tree.isExpanded(path)) {
+                    collection_tree.collapsePath(path);
+                }
+                // Expand
+                else {
+                    collection_tree.expandPath(path);
+                }
+            }
+        }
+    }
 
 

trunk/gli/src/org/greenstone/gatherer/gui/NewCollectionDetailsPrompt.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;
 
@@ -10 +36 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
-import org.greenstone.gatherer.collection.CollectionConfiguration;
+import org.greenstone.gatherer.collection.BasicCollectionConfiguration;
 import org.greenstone.gatherer.util.Utility;
 import org.greenstone.gatherer.gui.SimpleMenuBar;
@@ -60 +86 @@
         File metadata_directory = new File(possible_collections[i], Utility.META_DIR);
         if(collect_cfg_file.exists()) {
-        CollectionConfiguration collect_cfg = new CollectionConfiguration(collect_cfg_file);
+        BasicCollectionConfiguration collect_cfg = new BasicCollectionConfiguration(collect_cfg_file);
         String collection_name = collect_cfg.getName();
         // Even if there is no metadata directory we add it if its one of the 'big five + 1' that we know how to handle.
@@ -74 +100 @@
         // Else not a collection at all. Someones pulling a fast one.
     }
-    
+
     // Sort the result.
     Collections.sort(base_collection_model);
@@ -135 +161 @@
     cancel_button.setMnemonic(KeyEvent.VK_C);
     Dictionary.setBoth(cancel_button, "General.Cancel", "General.Cancel_Tooltip");
-    
+
     //ColorListener email_color_listener = new ColorListener(address, host); No more email
 
@@ -203 +229 @@
     center_pane.setLayout(new BorderLayout());
     center_pane.add(description_pane, BorderLayout.CENTER);
-          
+
     bottom_pane.setLayout(new BorderLayout());
     bottom_pane.add(base_collection_pane, BorderLayout.CENTER);
@@ -245 +271 @@
      * @return the filename as a String
      */
-    public String getName() {
-    // Retrieve the first 8 non-whitespace characters of title_final.
-    StringBuffer name_buffer = new StringBuffer("");
-    int i = 0;
-    while(i < title_final.length() && name_buffer.length() < 8) {
-        char c = title_final.charAt(i);
-        if(!Character.isWhitespace(c)) {
-        name_buffer.append(Character.toLowerCase(c));
-        }
-        i++;
-    }
-    // We need to ensure the filename is unique
-    int counter = 0;
-    while(filenameClashes(name_buffer.toString())) {
-        counter++;
-        String suffix = String.valueOf(counter);
-        name_buffer.replace(name_buffer.length() - suffix.length(), name_buffer.length(), suffix);
-    }
-    // All done
-    return name_buffer.toString();
-    }
+    public String getName() {
+        // Retrieve the first 8 non-whitespace characters of title_final.
+        StringBuffer name_buffer = new StringBuffer("");
+        int i = 0;
+        while(i < title_final.length() && name_buffer.length() < 8) {
+            char c = title_final.charAt(i);
+            if(!Character.isWhitespace(c)) {
+                name_buffer.append(Character.toLowerCase(c));
+            }
+            i++;
+        }
+        // We need to ensure the filename is unique
+        int counter = 0;
+        StringBuffer new_name_buffer = new StringBuffer(name_buffer.toString());
+        while(filenameClashes(new_name_buffer.toString())) {
+            new_name_buffer = new StringBuffer(name_buffer.toString());
+            counter++;
+            String suffix = String.valueOf(counter);
+            // If we have to truncate the namestring so as to fit the suffix
+            if(suffix.length() + new_name_buffer.length() > 8) {
+                new_name_buffer.replace(new_name_buffer.length() - suffix.length(), new_name_buffer.length(), suffix);
+            }
+            // Or just append it if that isn't necessary
+            else {
+                new_name_buffer.append(suffix);
+            }
+
+        }
+        // All done
+        return new_name_buffer.toString();
+    }
 
     private boolean filenameClashes(String filename) {
@@ -283 +319 @@
 
 
-    private class BrowseListener 
+    private class BrowseListener
     implements ActionListener {
     public void actionPerformed(ActionEvent event) {
@@ -298 +334 @@
         if(file != null) {
         file = file.getParentFile();
-        CollectionConfiguration collect_cfg = new CollectionConfiguration(new File(file, Utility.META_DIR));
+        BasicCollectionConfiguration collect_cfg = new BasicCollectionConfiguration(new File(file, Utility.META_DIR));
         Item item = new Item(file, collect_cfg.getName());
         base_collection.addItem(item);
         base_collection.setSelectedItem(item);
-        }           
+        }
     }
     }
@@ -336 +372 @@
     }
 
-    private class CreateListener
-    implements ActionListener {
+    private class CreateListener
+        implements ActionListener {
+
     public void actionPerformed(ActionEvent event) {
-        // Validate.
-        title_final = title.getText();
-        if(title_final.length() == 0) {
-        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("NewCollectionPrompt.Title_Error"), Dictionary.get("NewCollectionPrompt.Error"), JOptionPane.ERROR_MESSAGE);
-        title.setForeground(Gatherer.config.getColor("coloring.error_foreground", false));
-        title.setBackground(Gatherer.config.getColor("coloring.error_background", false));
-        return;
-        }
-        // We must ensure that the collection title is unique. This is a pain in the nether regions as we are forced to load the collect.cfg of each other collection in turn looking for a conflicting title
-        else {
-
-
-        }
+        // Validate.
+        title_final = title.getText();
+        if(title_final.length() == 0) {
+            JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("NewCollectionPrompt.Title_Error"), Dictionary.get("NewCollectionPrompt.Error"), JOptionPane.ERROR_MESSAGE);
+            title.setForeground(Gatherer.config.getColor("coloring.error_foreground", false));
+            title.setBackground(Gatherer.config.getColor("coloring.error_background", false));
+            return;
+        }
+        // We must ensure that the collection title is unique. This is a pain in the nether regions as we are forced to load the collect.cfg of each other collection in turn looking for a conflicting title
+        else {
+            File collection_directory = new File(Utility.getCollectionDir(Gatherer.config.gsdl_path));
+            File children[] = collection_directory.listFiles();
+            for(int i = 0; children != null && i < children.length; i++) {
+                if(children[i].isDirectory()) {
+                    BasicCollectionConfiguration other_collection = new BasicCollectionConfiguration(new File(children[i], Utility.CONFIG_DIR));
+                    if(other_collection.getName().equalsIgnoreCase(title_final)) {
+                        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("NewCollectionPrompt.Title_Clash"), Dictionary.get("NewCollectionPrompt.Error"), JOptionPane.ERROR_MESSAGE);
+                        title.setForeground(Gatherer.config.getColor("coloring.error_foreground", false));
+                        title.setBackground(Gatherer.config.getColor("coloring.error_background", false));
+                        return;
+                    }
+                    other_collection = null;
+                }
+            }
+        }
+
         /* Suppress filename
         name_final = file.getText();
@@ -382 +432 @@
         host.setForeground(Gatherer.config.getColor("coloring.error_foreground", false));
         host.setBackground(Gatherer.config.getColor("coloring.error_background", false));
-        return; 
+        return;
         }
         */
@@ -412 +462 @@
     }
 
-    private class Item 
+    private class Item
     implements Comparable {
     private File file;
@@ -435 +485 @@
 
     /*
-    private class RestrictedTextField 
+    private class RestrictedTextField
     extends JTextField {
     public RestrictedTextField(RestrictedTextDocument document, String value, int cols) {
@@ -445 +495 @@
     }
 
-    private class RestrictedTextDocument 
+    private class RestrictedTextDocument
     extends PlainDocument {
     private char block[];
@@ -468 +518 @@
         }
     }
-    public void insertString(int offs, String str, AttributeSet a) 
+    public void insertString(int offs, String str, AttributeSet a)
         throws BadLocationException {
         // Remove any blocked characters.
@@ -505 +555 @@
         updateFilename();
     }
-          
+
     ** Gives notification that a portion of the document has been removed. *
     public void removeUpdate(DocumentEvent e) {

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

@@ -48 +48 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
-import org.greenstone.gatherer.collection.CollectionConfiguration;
+import org.greenstone.gatherer.collection.BasicCollectionConfiguration;
 import org.greenstone.gatherer.collection.CollectionManager;
+import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
 
-public class OpenCollectionDialog 
+public class OpenCollectionDialog
     extends JFileChooser {
     static final private ImageIcon LOCKED_COLLECTION_ICON = Utility.getImage("lcolicn.gif");
     static final private ImageIcon NORMAL_COLLECTION_ICON = Utility.getImage("ncolicn.gif");
-    /** The name of the mouse listener that initiates editing on a double click. */ 
+    /** The name of the mouse listener that initiates editing on a double click. */
     static final private String SINGLE_CLICK_LISTENER = "SingleClickListener";
 
@@ -81 +82 @@
     }
 
-    public void destroy() { 
+    public void destroy() {
     }
 
@@ -104 +105 @@
      */
     static public void disableRename(Component c) {
-    if (c instanceof JList){             
+    if (c instanceof JList){
         EventListener[] listeners=c.getListeners(MouseListener.class);
         for(int i=0; listeners != null && i < listeners.length; i++) {
@@ -122 +123 @@
         }
     }
-    } 
+    }
 
 
     /* The DescriptionPreview accessory is adapted from the ImagePreview.java (an example used by FileChooserDemo2.java). */
-    private class DescriptionPreview 
+    private class DescriptionPreview
     extends JPanel
     implements PropertyChangeListener {
@@ -153 +154 @@
         if (JFileChooser.DIRECTORY_CHANGED_PROPERTY.equals(prop)) {
         file = null;
-        update = true;           
+        update = true;
         }
         // If a file became selected, find out which one.
@@ -170 +171 @@
             File config_file = new File(file.getParentFile(), Utility.CONFIG_DIR);
             if(config_file.exists()) {
-            CollectionConfiguration collect_cfg = new CollectionConfiguration(config_file);
+            BasicCollectionConfiguration collect_cfg = new BasicCollectionConfiguration(config_file);
+            text.setText(StaticStrings.SPEECH_CHARACTER + collect_cfg.getName() + StaticStrings.SPEECH_CHARACTER + StaticStrings.NEW_LINE_CHAR);
             text.setText(collect_cfg.getDescription());
             text.setCaretPosition(0);
@@ -180 +182 @@
 
     /** ImageFilter.java is a 1.4 example used by FileChooserDemo2.java. */
-    private class GathererFilter 
+    private class GathererFilter
     extends FileFilter {
 
@@ -196 +198 @@
     private class GathererFileSystemView
     extends FileSystemView {
-          
+
     private FileSystemView default_system_view = FileSystemView.getFileSystemView();
-    
+
     /** Creates a new folder with a default folder name. */
-    public File createNewFolder(File containingDir) 
+    public File createNewFolder(File containingDir)
         throws IOException {
         return default_system_view.createNewFolder(containingDir);
-    }          
+    }
 
     /** Gets the list of shown (i.e. */

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

@@ -13 +13 @@
 import org.greenstone.gatherer.checklist.CheckList;
 import org.greenstone.gatherer.checklist.Entry;
+import org.greenstone.gatherer.gui.EmailField;
 import org.greenstone.gatherer.gui.ModalDialog;
 import org.greenstone.gatherer.gui.SimpleMenuBar;
@@ -24 +25 @@
 
     private CheckList warning_preferences_check_list;
+    private EmailField email_field;
     private JButton apply_button;
     private JButton cancel_button;
@@ -39 +41 @@
     private JCheckBox workflow_preview;
     private JComboBox language_combobox;
+    private JLabel email_label;
     private JLabel language_label;
     private JLabel library_path_label;
@@ -51 +54 @@
     private Preferences self;
 
-    static final Dimension LABEL_SIZE = new Dimension(150, 25);
+    static final Dimension LABEL_SIZE = new Dimension(175, 25);
     static final Dimension ROW_SIZE = new Dimension(640, 25);
     static final Dimension SIZE = new Dimension(640, 345);
@@ -136 +139 @@
     proxy_host_label = new JLabel();
     proxy_host_label.setPreferredSize(LABEL_SIZE);
-    Dictionary.registerText(proxy_host_label, "Preferences.Connection.Proxy_Host"); 
+    Dictionary.registerText(proxy_host_label, "Preferences.Connection.Proxy_Host");
     proxy_host_field = new JTextField(Gatherer.config.getString("general.proxy_host", true));
     proxy_host_field.setEnabled(currently_enabled);
@@ -227 +230 @@
     classes_folder = null;
 
+    // Users email
+    JPanel email_pane = new JPanel();
+    email_label = new JLabel();
+    email_label.setPreferredSize(LABEL_SIZE);
+    Dictionary.registerText(email_label, "Preferences.General.Email");
+    email_field = new EmailField(Gatherer.config.getColor("coloring.error_background", false));
+    email_field.setText(Gatherer.config.getEmail());
+    Dictionary.registerTooltip(email_field, "Preferences.General.Email_Tooltip");
+
     // Extracted metadata
     view_extracted_metadata_checkbox = new JCheckBox();
@@ -255 +267 @@
 
     // Layout
+    email_pane.setLayout(new BorderLayout());
+    email_pane.add(email_label, BorderLayout.WEST);
+    email_pane.add(email_field, BorderLayout.CENTER);
+
     language_pane.setLayout(new BorderLayout());
     language_pane.add(language_label, BorderLayout.WEST);
@@ -261 +277 @@
     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(view_extracted_metadata_checkbox);
     general_pane.add(show_file_size_checkbox);
-    general_pane.add(language_pane);
 
     return general_pane;
@@ -399 +416 @@
 
     public void dispose() {
-    // Dispose
-    super.dispose();
+        // Where's my code for unregistering all of the components?!?
+
+        // Dispose
+        super.dispose();
     }
 
@@ -428 +447 @@
 
         // General preferences
+        Gatherer.config.setEmail(email_field.getText());
+
         Gatherer.config.set("general.show_file_size", Configuration.COLLECTION_SPECIFIC, show_file_size_checkbox.isSelected());
         Gatherer.g_man.refreshTrees(DragTree.TREE_DISPLAY_CHANGED);
@@ -472 +493 @@
     }
 
-    private class DictionaryEntry 
+    private class DictionaryEntry
     implements Comparable {
     private Locale locale;
@@ -526 +547 @@
         workflow_design.setSelected(element.getEnabled("design"));
         workflow_export.setSelected(element.getEnabled("export"));
-        workflow_preview.setSelected(element.getEnabled("preview"));            
+        workflow_preview.setSelected(element.getEnabled("preview"));
         }
     }
@@ -570 +591 @@
     public String toString() {
         if(text == null) {
-        text = element.getFirstChild().getNodeValue(); 
+        text = element.getFirstChild().getNodeValue();
         }
         return text;

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

@@ -49 +49 @@
 
 public class PreviewPane
-    extends JPanel {
-
-    private CalHTMLPane view   = null;
-    private int back_count     = 0;
-    private int forward_count  = 0;
-    private JButton back       = null;
-    private JButton forward    = null;
-    private JButton home       = null;
-    private JButton reload = null;
-    private JLabel status      = null;
-    private Observer observer = null;
-    private URL homepage = null;
-
-    static final public String BLANK_PAGE = "<html><head><title>No Page</title></head><body></body></html>";
-
-    public PreviewPane() {
+    extends JPanel {
+
+    private CalHTMLPane view   = null;
+    private int back_count   = 0;
+    private int forward_count  = 0;
+    private JButton back       = null;
+    private JButton forward = null;
+    private JButton home       = null;
+    private JButton reload = null;
+    private JLabel status     = null;
+    private Observer observer = null;
+    private URL homepage = null;
+
+    static final public String BLANK_PAGE = "<html><head><title>No Page</title></head><body></body></html>";
+
+    public PreviewPane() {
     super();
 
@@ -95 +95 @@
 
     status = new JLabel();
-    Dictionary.registerText(status, "Browser.Ready"); 
-    }
-
-    public void collectionChanged(boolean ready) {
+    Dictionary.registerText(status, "Browser.Ready");
+    }
+
+    public void collectionChanged(boolean ready) {
     // If we were showing a page, but that page is no longer available, then return to a blank page
     if(!ready && homepage != null) {
-        homepage = null;
-        view.showHTMLDocument(BLANK_PAGE);
+        homepage = null;
+        view.showHTMLDocument(BLANK_PAGE);
     }
     if (ready && Gatherer.config.exec_address != null) {
-        // reload the home page for the current collection
-        try {
+        // reload the home page for the current collection
+        try {
         // Now load the collection
-        Collection this_coll = Gatherer.c_man.getCollection();
+        Collection this_collection = Gatherer.c_man.getCollection();
+        String search_types = this_collection.cdm.searchtype_manager.getSearchTypes();
         String extra_args = "";
-        String build_type = this_coll.getCollectionType();
-        if (build_type.equals("mgpp")) {
-            // we need some more args on the url
-            String search_types = this_coll.getSearchTypes();
-            if (search_types.equals("")) {
-            extra_args = "&ct=1&qt=0&qto=3";
-            } else if (search_types.equals("plain")) {
-            extra_args = "&ct=1&qt=0&qto=1";
-            } else if (search_types.equals("form")) {
-            extra_args = "&ct=1&qt=1&qto=2";
-            } else if (search_types.equals("plain,form")) {
-            extra_args = "&ct=1&qt=0&qto=3";
-            } else if (search_types.equals("form,plain")) {
-            extra_args = "&ct=1&qt=1&qto=3";
-            }
-        }
-        
-        homepage = new URL(Gatherer.config.exec_address.toString() + "?a=p&p=about&c=" + this_coll.getName()+extra_args);
+        if (search_types.length() > 0) {
+            // we need some more args on the url
+            if (search_types.equals("")) {
+                extra_args = "&ct=1&qt=0&qto=3";
+            } else if (search_types.equals("plain")) {
+                extra_args = "&ct=1&qt=0&qto=1";
+            } else if (search_types.equals("form")) {
+                extra_args = "&ct=1&qt=1&qto=2";
+            } else if (search_types.equals("plain,form")) {
+                extra_args = "&ct=1&qt=0&qto=3";
+            } else if (search_types.equals("form,plain")) {
+                extra_args = "&ct=1&qt=1&qto=3";
+            }
+        }
+
+        homepage = new URL(Gatherer.config.exec_address.toString() + "?a=p&p=about&c=" + this_collection.getName() + extra_args);
         String[] args = new String[1];
         args[0] = homepage.toString();
         Dictionary.registerText(status, "Browser.Loading", args);
         view.showHTMLDocument(homepage, null, true);
-        }
-        catch (MalformedURLException exception) {
+        }
+        catch (MalformedURLException exception) {
         Gatherer.printStackTrace(exception);
-        }
-    }
-    }
-
-    public void display() {
+        }
+    }
+    }
+
+    public void display() {
     JPanel control_pane = new JPanel();
     control_pane.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
@@ -157 +156 @@
     add(a_panel, BorderLayout.CENTER);
     add(status, BorderLayout.SOUTH);
-    }
-
-    /** This method is called when the user selects the 'Preview' tab from the views bar. Can be used to display a particular page or perform some other relevant tests (ensure internet connection to specified server maybe?)
-     */
-    public void gainFocus() {
+    }
+
+    /** This method is called when the user selects the 'Preview' tab from the views bar. Can be used to display a particular page or perform some other relevant tests (ensure internet connection to specified server maybe?)
+     */
+    public void gainFocus() {
     if(Gatherer.c_man.ready() && Gatherer.c_man.built()) {
-        if(homepage == null && Gatherer.config.exec_address != null) {
+        if(homepage == null && Gatherer.config.exec_address != null) {
         try {
-            // Now load the collection
-            homepage = new URL(Gatherer.config.exec_address.toString() + "?a=p&p=about&c=" + Gatherer.c_man.getCollection().getName());
-            String[] args = new String[1];
-            args[0] = homepage.toString();
-            Dictionary.registerText(status, "Browser.Loading", args);
-            view.showHTMLDocument(homepage);
+            // Now load the collection
+            homepage = new URL(Gatherer.config.exec_address.toString() + "?a=p&p=about&c=" + Gatherer.c_man.getCollection().getName());
+            String[] args = new String[1];
+            args[0] = homepage.toString();
+            Dictionary.registerText(status, "Browser.Loading", args);
+            view.showHTMLDocument(homepage);
         }
         catch (MalformedURLException exception) {
-            Gatherer.printStackTrace(exception);
-        }
-        }
+            Gatherer.printStackTrace(exception);
+        }
+        }
     }
     validate();
-    }
-
-    public void configServer(String command) {
+    }
+
+    public void configServer(String command) {
     try {
-        String url = Gatherer.config.exec_address.toString() + command;
-        ///ystem.err.println("Action: " + url);
-        view.setLoadSynchronously(true);
-        view.showHTMLDocument(new URL(url));
-        view.setLoadSynchronously(false);
-        ///ystem.err.println("Complete.");
-        url = null;
+        String url = Gatherer.config.exec_address.toString() + command;
+        ///ystem.err.println("Action: " + url);
+        view.setLoadSynchronously(true);
+        view.showHTMLDocument(new URL(url));
+        view.setLoadSynchronously(false);
+        ///ystem.err.println("Complete.");
+        url = null;
     }
     catch(Exception error) {
-        ///ystem.err.println("Bad URL.");
-    }
-    }
-
-    public void validate() {
+        ///ystem.err.println("Bad URL.");
+    }
+    }
+
+    public void validate() {
     back.setEnabled(back_count > 0);
     home.setEnabled(homepage != null);
     forward.setEnabled(forward_count > 0);
     reload.setEnabled(homepage != null);
-    }
-
-    private class BackListener
+    }
+
+    private class BackListener
     implements ActionListener {
     public void actionPerformed(ActionEvent event) {
-        view.goBack();
-        back_count--;
-        forward_count++;
-        validate();
-    }
-    }
-
-    private class ForwardListener
+        view.goBack();
+        back_count--;
+        forward_count++;
+        validate();
+    }
+    }
+
+    private class ForwardListener
     implements ActionListener {
     public void actionPerformed(ActionEvent event) {
-        view.goForward();
-        back_count++;
-        forward_count--;
-        validate();
-    }
-    }
-
-    private class HomeListener
+        view.goForward();
+        back_count++;
+        forward_count--;
+        validate();
+    }
+    }
+
+    private class HomeListener
     implements ActionListener {
     public void actionPerformed(ActionEvent event) {
-        view.showHTMLDocument(homepage);
-        back_count++;
-        forward_count = 0;
-        validate();
-    }
-    }
-
-    private class ReloadListener
+        view.showHTMLDocument(homepage);
+        back_count++;
+        forward_count = 0;
+        validate();
+    }
+    }
+
+    private class ReloadListener
     implements ActionListener {
     public void actionPerformed(ActionEvent event) {
-        view.reloadDocument();
-    }
-    }
-
-    private class Observer
+        view.reloadDocument();
+    }
+    }
+
+    private class Observer
     extends DefaultCalHTMLObserver {
     public int state = CalCons.DOC_LOADED;
     public void linkActivatedUpdate(CalHTMLPane pane, URL url, String target_frame, String j_name) {
-        back_count++;
-        forward_count = 0;
-        validate();
+        back_count++;
+        forward_count = 0;
+        validate();
     }
 
     public void linkFocusUpdate(CalHTMLPane pane, URL url) {
-        String[] args = new String[1];
-        args[0] = url.toString();
-        Dictionary.registerText(status, "Browser.Follow", args);
+        String[] args = new String[1];
+        args[0] = url.toString();
+        Dictionary.registerText(status, "Browser.Follow", args);
     }
 
     public void statusUpdate(CalHTMLPane pane, int state, URL url, int value, String message) {
-        this.state = state;
-        String[] args = new String[1];
-        args[0] = url.toString();
-
-        switch(state) {
+        this.state = state;
+        String[] args = new String[1];
+        args[0] = url.toString();
+
+        switch(state) {
         // The Pane is attempting to connect to the given URL to receive data.
-        case CalCons.PRE_CONNECT:
+        case CalCons.PRE_CONNECT:
         ///ystem.err.println("Preconnect: " + state + " - " + message);
         break;
         // The Pane was unable to connect to the given URL or was unable to parse the content. Most likely this will be due to an incorrectly specified URL. The message argument may contain further details of the reason for failure.
-        case CalCons.PARSE_FAILED:
+        case CalCons.PARSE_FAILED:
         ///ystem.err.println("Parse Failed: " + state + " - " + message);
         Dictionary.registerText(status, "Browser.CannotConnect", args);
         break;
         // The Pane has established a connection to the given URL and is receiving any content.
-        case CalCons.CONNECTED:
+        case CalCons.CONNECTED:
         ///ystem.err.println("Connected: " + state + " - " + message);
         Dictionary.registerText(status, "Browser.Loading", args);
         break;
         // The size of the content at the given URL is known and is contained in the value argument.
-        case CalCons.DOC_LENGTH:
+        case CalCons.DOC_LENGTH:
         ///ystem.err.println("Doc Length: " + state + " - " + message);
         break;
         // The title of the document for the given URL is known and is contained in the message argument. Only the title of a document in the Pane's top level frame will be sent to this method. If the document has no name, the message will be null, unless the document is a Frameset document in which case the message "Frameset" will be sent.
-        case CalCons.TITLE:
+        case CalCons.TITLE:
         ///ystem.err.println("Title: " + state + " - " + message);
         break;
         // An exception has been thrown during parsing of the data from the URL. This will most likely be an IOException such as a server time-out.
-        case CalCons.PARSE_FAILED_POST_CONNECT:
+        case CalCons.PARSE_FAILED_POST_CONNECT:
         ///ystem.err.println("Parse Failed Post Connect: " + state + " - " + message);
         Dictionary.registerText(status, "Browser.TimedOut", args);
         break;
         // The document has been parsed but formatting cannot be completed because the document contains images of unspecified size. The parsing thread is waiting for image updates to give it the information it needs to format and display the document.
-        case CalCons.WAITING_FOR_IMAGES:
+        case CalCons.WAITING_FOR_IMAGES:
         ///ystem.err.println("Waiting For Images: " + state + " - " + message + " - " + url.toString());
         break;
         // All text and image data has been received, parsed and the document structure determined.
-        case CalCons.DOC_LOADED:
+        case CalCons.DOC_LOADED:
         ///ystem.err.println("Doc Loaded: " + state + " - " + message);
         Dictionary.registerText(status, "Browser.Ready");
         break;
-        }
-    }
-    }
+        }
+    }
+    }
 }

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

@@ -35 +35 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
-import org.greenstone.gatherer.collection.CollectionConfiguration;
+import org.greenstone.gatherer.collection.BasicCollectionConfiguration;
 import org.greenstone.gatherer.gui.ModalDialog;
 import org.greenstone.gatherer.util.StaticStrings;
@@ -71 +71 @@
 
     JPanel center_pane = new JPanel();
-    
+
     JPanel collection_list_pane = new JPanel();
     JLabel collection_list_label = new JLabel();
@@ -155 +155 @@
     private class AdvancedListener
     implements ActionListener {
-    
+
     public void actionPerformed(ActionEvent event) {
         result = BROWSE_OPTION;
@@ -164 +164 @@
     private class CancelListener
     implements ActionListener {
-    
+
     public void actionPerformed(ActionEvent event) {
         result = CANCEL_OPTION;
         SimpleOpenCollectionDialog.this.dispose();
     }
-    }    
+    }
 
     private class CollectionListSelectionListener
@@ -192 +192 @@
         }
         else {
-        CollectionConfiguration collection_configuration = (CollectionConfiguration) collection_list.getSelectedValue();
+        BasicCollectionConfiguration collection_configuration = (BasicCollectionConfiguration) collection_list.getSelectedValue();
         description_textarea.setText(collection_configuration.getDescription());
         description_textarea.setCaretPosition(0);
@@ -214 +214 @@
         String collection_foldername = collection_folder.getName();
         if(!collection_folder.isFile() && !collection_foldername.equals(StaticStrings.MODEL_COLLECTION_NAME)) {
-           CollectionConfiguration collection_configuration = new CollectionConfiguration(new File(collection_folder, Utility.CONFIG_DIR));
+           BasicCollectionConfiguration collection_configuration = new BasicCollectionConfiguration(new File(collection_folder, Utility.CONFIG_DIR));
            if(!collection_configuration.getName().equals(StaticStrings.ERROR_STR)) {
               data.add(collection_configuration);
@@ -247 +247 @@
     private class OpenListener
     implements ActionListener {
-    
+
     public void actionPerformed(ActionEvent event) {
         result = OK_OPTION;
-        CollectionConfiguration collection_configuration = (CollectionConfiguration) collection_list.getSelectedValue();
+        BasicCollectionConfiguration collection_configuration = (BasicCollectionConfiguration) collection_list.getSelectedValue();
         File collect_cfg_file = collection_configuration.getFile();
         File etc_folder = collect_cfg_file.getParentFile();
@@ -261 +261 @@
         SimpleOpenCollectionDialog.this.dispose();
     }
-    }  
+    }
 }

trunk/gli/src/org/greenstone/gatherer/gui/table/GTableModel.java

@@ -50 +50 @@
  * @version 2.3b
  */
-public class GTableModel 
-    extends AbstractTableModel 
+public class GTableModel
+    extends AbstractTableModel
     implements MSMListener {
 
@@ -70 +70 @@
     // Register this model with the msm manager.
     if (Gatherer.c_man.ready()) {
-        Gatherer.c_man.getCollection().msm.addMSMListener(this); 
+        Gatherer.c_man.getCollection().msm.addMSMListener(this);
     }
     }
@@ -200 +200 @@
         // Ensure the position is within the current metadata
         if (i >= current_metadata.size()) {
-        i = current_metadata.size() - 1;
+            i = current_metadata.size() - 1;
         }
 
         // Select the same row as before, except if it would select a different element
         ElementWrapper element = metadatum.getElement();
+        if(i < 0) {
+              Gatherer.println("Could not find suitable row to select!");
+              return;
+         }
         Metadata newly_selected_metadatum = (Metadata) current_metadata.get(i);
         if (!newly_selected_metadatum.getElement().equals(element)) {
-        // Try one row previous
-        i--;
-        newly_selected_metadatum = (Metadata) current_metadata.get(i);
-        if (!newly_selected_metadatum.getElement().equals(element)) {
-            Gatherer.println("Could not find suitable row to select!");
-            return;
-        }
+            // Try one row previous
+            i--;
+            if(i < 0) {
+                  Gatherer.println("Could not find suitable row to select!");
+                  return;
+             }
+
+            newly_selected_metadatum = (Metadata) current_metadata.get(i);
+            if (!newly_selected_metadatum.getElement().equals(element)) {
+                Gatherer.println("Could not find suitable row to select!");
+                return;
+            }
         }
 
@@ -298 +307 @@
     /** Determine if the given metadata is common to all selected file nodes given the context of the current view. */
    public boolean isCommon(Metadata entry) {
-      return (entry.getCount() == file_nodes.length);
+      return (entry.getCount() >= file_nodes.length);
    }
-   
+
     /** Determine if the given metadata is common to all selected file nodes given the context of the current view. */
     public boolean isCommon(int row) {
@@ -352 +361 @@
                 showInheritedMetadataWarning();
                 }
-                
+
                 // If the piece of metadata is in the list, increment its count
                 int index = current_metadata.indexOf(metadatum);
@@ -364 +373 @@
                 index = add(current_metadata, metadatum);
                 fireTableRowsInserted(index, index);
-                
+
                 // Remember we have seen this element
                 if (known_elements.contains(element) == false) {

trunk/gli/src/org/greenstone/gatherer/gui/tree/DragTreeCellRenderer.java

@@ -46 +46 @@
 import org.greenstone.gatherer.util.Utility;
 
-public class DragTreeCellRenderer 
+public class DragTreeCellRenderer
     extends DefaultTreeCellRenderer {
-     
+
     private boolean in_focus = false;
     private Color selection_background;
     private Color selection_foreground;
-     
-    static final private ImageIcon GREY_FOLDER = Utility.getImage("greyfolder.gif", true);
-    static final private ImageIcon GREEN_FILE = Utility.getImage("greenfile.gif", true);
-    static final private ImageIcon GREEN_FOLDER = Utility.getImage("greenfolder.gif", true);
+
+    //static final private ImageIcon GREY_FOLDER = Utility.getImage("greyfolder.gif", true);
+    //static final private ImageIcon GREEN_FILE = Utility.getImage("greenfile.gif", true);
+    //static final private ImageIcon GREEN_FOLDER = Utility.getImage("greenfolder.gif", true);
 
     public DragTreeCellRenderer() {
@@ -74 +74 @@
     if(value instanceof FileNode) {
         FileNode node = (FileNode) value;
-        
+
         String new_value = null;
         if(Gatherer.config.get("general.show_file_size", Configuration.COLLECTION_SPECIFIC) && node.getFile() != null && !node.getAllowsChildren()) {
@@ -85 +85 @@
         tree_cell = (JLabel) super.getTreeCellRendererComponent(tree, new_value, sel, expanded, leaf, row, hasFocus);
 
+        /*
         if(node.getFile() == null || node.isFileSystemRoot()) {
-        ((JLabel)tree_cell).setIcon(GREY_FOLDER);
+            ((JLabel)tree_cell).setIcon(GREY_FOLDER);
         }
         else if(node.isInCurrentCollection()) {
-        if(!node.getFile().isFile()) {
+            if(!node.getFile().isFile()) {
             ((JLabel)tree_cell).setIcon(GREEN_FOLDER);
-        }
-        else {
+            }
+            else {
             ((JLabel)tree_cell).setIcon(GREEN_FILE);
-        }
+            }
         }
+        */
     }
     else {
@@ -102 +104 @@
     return tree_cell;
     }
-          
+
     public void loseFocus() {
     setBackgroundSelectionColor(Color.lightGray);

trunk/gli/src/org/greenstone/gatherer/msm/ElementWrapper.java

@@ -50 +50 @@
 import org.w3c.dom.*;
 
-/** This class provides a convience wrapper around a DOM model Element to allow Components such as the MetadataTable to display this information properly. 
+/** This class provides a convience wrapper around a DOM model Element to allow Components such as the MetadataTable to display this information properly.
  * @author John Thompson
  * @version 2.3
  */
-public class ElementWrapper 
+public class ElementWrapper
     implements Comparable {
     /** The DOM element this wrapper is wrapped around. */
@@ -62 +62 @@
     /** Constructor for elements with no namespace necessary.
      * @param element The DOM <strong>Element</strong> this is to be based on.
-     */ 
+     */
     public ElementWrapper(Element element) {
     this.element = element;
@@ -69 +69 @@
         this.namespace = parent.getAttribute("namespace");
     }
-    
+
     }
 
@@ -94 +94 @@
     return toString().compareTo(object.toString());
     }
-    /** Decrement the number of occurances of this metadata element. 
+    /** Decrement the number of occurances of this metadata element.
      * @see org.greenstone.gatherer.msm.MSMUtils
      */
@@ -179 +179 @@
     }
 
-    /** Increment the number of occurances of this metadata element. 
+    /** Increment the number of occurances of this metadata element.
      * @see org.greenstone.gatherer.msm.MSMUtils
      */
@@ -185 +185 @@
     MSMUtils.setOccurance(element, 1);
     }
-    
+
     public boolean isHierarchy() {
     return element.getAttribute(StaticStrings.HIERARCHY_ATTRIBUTE).equalsIgnoreCase(StaticStrings.TRUE_STR);
@@ -227 +227 @@
 
     // Return just the element name, unless the element identifier differs
-    if (element_name_no_namespace.equals(element_identifier)) {
+    //if (element_name_no_namespace.equals(element_identifier)) {
         return element_name;
-    }
-    else {
-        return element_name + " (" + element_identifier + ")";
-    }
+    //}
+    //else {
+    //    return element_name + " (" + element_identifier + ")";
+    //}
     }
 }

trunk/gli/src/org/greenstone/gatherer/msm/GDMDocument.java

@@ -45 +45 @@
  */
 public class GDMDocument {
-    /** Record if the document this object is based on is up to date. */
-    private boolean up_to_date = true;
-    /** The document this class sources its data from. */
-    private Document base_document;
-    static final private String ACCUMULATE = "accumulate";
-    /** The pattern to match when searching for directory level assignments. */
-    static final private String DIRECTORY_FILENAME = ".*";
-    static final private String DESCRIPTION_ELEMENT = "Description";
-    static final private String FILENAME_ELEMENT = "FileName";
-    static final private String FILESET_ELEMENT = "FileSet";
-    static final private String HVALUE_ATTRIBUTE = "hvalue";
-    static final private String MODE_ATTRIBUTE = "mode";
-    static final private String OVERWRITE = "overwrite";
-
-    /** Constructor which creates a brand new metadata.xml document. */
-    public GDMDocument() {
+    /** Record if the document this object is based on is up to date. */
+    private boolean up_to_date = true;
+    /** The document this class sources its data from. */
+    private Document base_document;
+    static final private String ACCUMULATE = "accumulate";
+    /** The pattern to match when searching for directory level assignments. */
+    static final private String DIRECTORY_FILENAME = ".*";
+    static final private String DESCRIPTION_ELEMENT = "Description";
+    static final private String FILENAME_ELEMENT = "FileName";
+    static final private String FILESET_ELEMENT = "FileSet";
+    static final private String HVALUE_ATTRIBUTE = "hvalue";
+    static final private String MODE_ATTRIBUTE = "mode";
+    static final private String OVERWRITE = "overwrite";
+    static final private String[] ALL_METADATA_TYPES = {StaticStrings.METADATA_ELEMENT, StaticStrings.EXTRACTED_METADATA_ELEMENT};
+
+    /** Constructor which creates a brand new metadata.xml document. */
+    public GDMDocument() {
     // Create new document. We do this by loading a copy of the template. */
     this.base_document = Utility.parse(Utility.GREENSTONEDIRECTORYMETADATA_TEMPLATE, true);
-    }
-
-    /** Constructor which parses an existing metadata.xml document. */
-    public GDMDocument(File file) {
+    }
+
+    /** Constructor which parses an existing metadata.xml document. */
+    public GDMDocument(File file) {
     try {
-        this.base_document = Utility.parse(file.getAbsolutePath(), false);
+        this.base_document = Utility.parse(file.getAbsolutePath(), false);
     }
     catch (Exception error) {
-        // Poorly formed, or completely invalid metadata.xml file!
-    }
-    }
-
-    /** Constructor which wraps around an existing metadata.xml document. */
-    public GDMDocument(Document base_document) {
+        // Poorly formed, or completely invalid metadata.xml file!
+    }
+    }
+
+    /** Constructor which wraps around an existing metadata.xml document. */
+    public GDMDocument(Document base_document) {
     this.base_document = base_document;
-    }
-
-    /** Add this metadata to the named file. There is one tricky thing to consider. Whenever a metadata entry is added it is taken to be accumulating except if it is the first added, in which case it overwrites! Actually this gets worse, as we could have been told to append this metadata to a document which already inherits metadata. Thus we need a new argument to determine whether this add was triggered by an append or a replace. */
-    public void addMetadata(String filename, Metadata metadata, boolean force_accumulate) {
+    }
+
+    /** Add this metadata to the named file. There is one tricky thing to consider. Whenever a metadata entry is added it is taken to be accumulating except if it is the first added, in which case it overwrites! Actually this gets worse, as we could have been told to append this metadata to a document which already inherits metadata. Thus we need a new argument to determine whether this add was triggered by an append or a replace. */
+    public void addMetadata(String filename, Metadata metadata, boolean force_accumulate) {
     Gatherer.println("Add '" + metadata + "' to " + (filename != null ? filename : "directory."));
     try {
-        // Retrieve the document element.
-        Element directorymetadata_element = base_document.getDocumentElement();
-        // Iterate through the filesets looking for one that matches the given filename.
-        Element fileset_element = null;
-        boolean found = false;
-        NodeList fileset_elements = directorymetadata_element.getElementsByTagName(FILESET_ELEMENT);
-        for(int i = 0; !found && i < fileset_elements.getLength(); i++) {
+        // Retrieve the document element.
+        Element directorymetadata_element = base_document.getDocumentElement();
+        // Iterate through the filesets looking for one that matches the given filename.
+        Element fileset_element = null;
+        boolean found = false;
+        NodeList fileset_elements = directorymetadata_element.getElementsByTagName(FILESET_ELEMENT);
+        for(int i = 0; !found && i < fileset_elements.getLength(); i++) {
         fileset_element = (Element) fileset_elements.item(i);
         NodeList filename_elements = fileset_element.getElementsByTagName(FILENAME_ELEMENT);
         for(int j = 0; !found && j < filename_elements.getLength(); j++) {
-            Element filename_element = (Element) filename_elements.item(j);
-            String filename_pattern = MSMUtils.getValue(filename_element);
-            // Have we found a match. If so break out of for loop.
-            if(filename != null && filename.matches(filename_pattern) && !filename_pattern.equals(DIRECTORY_FILENAME)) {
+            Element filename_element = (Element) filename_elements.item(j);
+            String filename_pattern = MSMUtils.getValue(filename_element);
+            // Have we found a match. If so break out of for loop.
+            if(filename != null && filename.matches(filename_pattern) && !filename_pattern.equals(DIRECTORY_FILENAME)) {
             ///ystem.err.println("Adding to existing file fileset!");
             found = true;
-            }
-            else if(filename == null && filename_pattern.equals(DIRECTORY_FILENAME)) {
+            }
+            else if(filename == null && filename_pattern.equals(DIRECTORY_FILENAME)) {
             ///ystem.err.println("Adding to existing folder fileset!");
             ///ystem.err.println("filename_pattern = '" + filename_pattern + "'");
             found = true;
-            }
-            // No match. On to the next one.
-            else {
+            }
+            // No match. On to the next one.
+            else {
             fileset_element = null;
-            }
-            filename_pattern = null;
-            filename_element = null;
-        }
-        }
-        fileset_elements = null;
-        // If we still haven't found an existing fileset, then its time to create one.
-        if(fileset_element == null) {
+            }
+            filename_pattern = null;
+            filename_element = null;
+        }
+        }
+        fileset_elements = null;
+        // If we still haven't found an existing fileset, then its time to create one.
+        if(fileset_element == null) {
         ///ystem.err.println("Creating a new fileset.");
         fileset_element = base_document.createElement(FILESET_ELEMENT);
@@ -126 +127 @@
         // If the filename is null then we add a directory metadata set as directorymetadata_element's first child
         if(filename == null) {
-            filename_text = base_document.createTextNode(DIRECTORY_FILENAME);
-            if(directorymetadata_element.hasChildNodes()) {
+            filename_text = base_document.createTextNode(DIRECTORY_FILENAME);
+            if(directorymetadata_element.hasChildNodes()) {
             directorymetadata_element.insertBefore(fileset_element, directorymetadata_element.getFirstChild());
-            }
-            else {
+            }
+            else {
             directorymetadata_element.appendChild(fileset_element);
-            }
+            }
         }
         // Otherwise we just append the new fileset to directorymetadata_element's children.
         else {
-            filename_text = base_document.createTextNode(filename);
-            directorymetadata_element.appendChild(fileset_element);
+            filename_text = base_document.createTextNode(filename);
+            directorymetadata_element.appendChild(fileset_element);
         }
         filename_element.appendChild(filename_text);
@@ -143 +144 @@
         description_element = null;
         filename_element = null;
-        }
-        // Now, finally, we can add the metadata.
-        Element metadata_element = base_document.createElement(StaticStrings.METADATA_ELEMENT);
-        String name = metadata.getElement().getName();
-        if(name.startsWith(Utility.EXTRACTED_METADATA_NAMESPACE)) {
-        name = name.substring(Utility.EXTRACTED_METADATA_NAMESPACE.length() + 1);
-        }
-        metadata_element.setAttribute(StaticStrings.NAME_ATTRIBUTE, name);
-
-        // To determine if this metadata entry should overwrite or accumulate we check if there are other entries with the same element in this fileset.
-        boolean will_accumulate = false;
-        NodeList sibling_description_elements = fileset_element.getElementsByTagName(DESCRIPTION_ELEMENT);
-        for(int k = 0; !will_accumulate && k < sibling_description_elements.getLength(); k++) {
+        }
+        // Now, finally, we can add the metadata.
+        Element metadata_element = null;
+        String name = metadata.getElement().getName();
+        // If this is extracted metadata, we use a special element name that won't be recognized by greenstone
+        if(name.startsWith(Utility.EXTRACTED_METADATA_NAMESPACE)) {
+              metadata_element = base_document.createElement(ALL_METADATA_TYPES[1]);
+              name = name.substring(Utility.EXTRACTED_METADATA_NAMESPACE.length() + 1);
+         }
+         else {
+              metadata_element = base_document.createElement(ALL_METADATA_TYPES[0]);
+         }
+        metadata_element.setAttribute(StaticStrings.NAME_ATTRIBUTE, name);
+
+        // To determine if this metadata entry should overwrite or accumulate we check if there are other entries with the same element in this fileset.
+        boolean will_accumulate = false;
+        NodeList sibling_description_elements = fileset_element.getElementsByTagName(DESCRIPTION_ELEMENT);
+        for(int k = 0; !will_accumulate && k < sibling_description_elements.getLength(); k++) {
         Element sibling_description_element = (Element) sibling_description_elements.item(k);
-        NodeList sibling_metadata_elements = sibling_description_element.getElementsByTagName(StaticStrings.METADATA_ELEMENT);
-        for(int l = 0; !will_accumulate && l < sibling_metadata_elements.getLength(); l++) {
-            Element sibling_metadata_element = (Element) sibling_metadata_elements.item(l);
-            // It appears that its possible that we can be asked to add the same metadata twice (especially after a copy action is cancelled then repeated). So we check if we have been asked to add exactly the same value twice.
-            if(sibling_metadata_element.getAttribute(StaticStrings.NAME_ATTRIBUTE).equals(metadata_element.getAttribute(StaticStrings.NAME_ATTRIBUTE))) {
-                // Check the values and return if they are the same.
-               if(metadata.getAbsoluteValue().equals(MSMUtils.getValue(sibling_metadata_element))) {
-              return;
-               }
-               will_accumulate = true;
-            }
-            sibling_metadata_element = null;
-        }
-        sibling_metadata_elements = null;
+        // We have to do this for each type of metadata
+        for(int z = 0; z < ALL_METADATA_TYPES.length; z++) {
+            NodeList sibling_metadata_elements = sibling_description_element.getElementsByTagName(ALL_METADATA_TYPES[z]);
+            for(int l = 0; !will_accumulate && l < sibling_metadata_elements.getLength(); l++) {
+                Element sibling_metadata_element = (Element) sibling_metadata_elements.item(l);
+                // It appears that its possible that we can be asked to add the same metadata twice (especially after a copy action is cancelled then repeated). So we check if we have been asked to add exactly the same value twice.
+                if(sibling_metadata_element.getAttribute(StaticStrings.NAME_ATTRIBUTE).equals(metadata_element.getAttribute(StaticStrings.NAME_ATTRIBUTE))) {
+                    // Check the values and return if they are the same.
+                   if(metadata.getAbsoluteValue().equals(MSMUtils.getValue(sibling_metadata_element))) {
+                      return;
+                   }
+                   will_accumulate = true;
+                }
+                sibling_metadata_element = null;
+            }
+            sibling_metadata_elements = null;
+        }
         sibling_description_element = null;
-        }
-        sibling_description_elements = null;
-        if(will_accumulate || force_accumulate) { //mode.equals(ACCUMULATE)) {
+        }
+        sibling_description_elements = null;
+        if(will_accumulate || force_accumulate) { //mode.equals(ACCUMULATE)) {
         metadata_element.setAttribute(MODE_ATTRIBUTE, ACCUMULATE);
-        }
+        }
         // As we can't possibly store all the metadata in memory, nor can we ensure that the indexes written to file remain the same until the new time we look at this file, and to avoid having to open a rewrite every collection document whenever any value tree changes, I'm writing the value out as a full path string
         GValueModel model = Gatherer.c_man.getCollection().msm.getValueTree(metadata.getElement());
@@ -186 +195 @@
             node_value = metadata.getAbsoluteValue();
         }
-        ///ystem.err.println("Creating node in GDMDocument: '" + node_value + "'");
-        metadata_element.appendChild(base_document.createTextNode(node_value));
-        // Retrieve the first description element for this fileset (there should only be one, but I'll play it safe).
-        NodeList description_elements = fileset_element.getElementsByTagName("Description");
-        Element description_element = (Element) description_elements.item(0);
-        description_element.appendChild(metadata_element);
-        description_element = null;
-        metadata_element = null;
+        ///ystem.err.println("Creating node in GDMDocument: '" + node_value + "'");
+        metadata_element.appendChild(base_document.createTextNode(node_value));
+        // Retrieve the first description element for this fileset (there should only be one, but I'll play it safe).
+        NodeList description_elements = fileset_element.getElementsByTagName("Description");
+        Element description_element = (Element) description_elements.item(0);
+        description_element.appendChild(metadata_element);
+        description_element = null;
+        metadata_element = null;
                 //mode = null;
-        fileset_element = null;
-        directorymetadata_element = null;
-        up_to_date = false;
+        fileset_element = null;
+        directorymetadata_element = null;
+        up_to_date = false;
     }
     catch (Exception error) {
-        Gatherer.printStackTrace(error);
-    }
-    }
-
-    public int countMetadata() {
+        Gatherer.printStackTrace(error);
+    }
+    }
+
+    public int countMetadata() {
     int count = 0;
     try {
-        // Retrieve the document element.
-        Element directorymetadata_element = base_document.getDocumentElement();
-        // Iterate through the filesets, checking the FileName child element against    the target file's name using regular expression matching.
-        NodeList fileset_elements = directorymetadata_element.getElementsByTagName(FILESET_ELEMENT);
-        for(int i = 0; i < fileset_elements.getLength(); i++) {
+        // Retrieve the document element.
+        Element directorymetadata_element = base_document.getDocumentElement();
+        // Iterate through the filesets, checking the FileName child element against    the target file's name using regular expression matching.
+        NodeList fileset_elements = directorymetadata_element.getElementsByTagName(FILESET_ELEMENT);
+        for(int i = 0; i < fileset_elements.getLength(); i++) {
         Element fileset_element = (Element) fileset_elements.item(i);
         NodeList description_elements = fileset_element.getElementsByTagName(DESCRIPTION_ELEMENT);
         for(int k = 0; k < description_elements.getLength(); k++) {
-            Element description_element = (Element) description_elements.item(k);
-            NodeList metadata_elements = description_element.getElementsByTagName(StaticStrings.METADATA_ELEMENT);
-            count = count + metadata_elements.getLength();
-            metadata_elements = null;
-            description_element = null;
+            Element description_element = (Element) description_elements.item(k);
+            // We have to do this for each type of metadata
+            for(int z = 0; z < ALL_METADATA_TYPES.length; z++) {
+                NodeList metadata_elements = description_element.getElementsByTagName(ALL_METADATA_TYPES[z]);
+                count = count + metadata_elements.getLength();
+                metadata_elements = null;
+            }
+            description_element = null;
         }
         description_elements = null;
         fileset_element = null;
-        }
-        fileset_elements = null;
-        directorymetadata_element = null;
+        }
+        fileset_elements = null;
+        directorymetadata_element = null;
     }
     catch (Exception error) {
-        Gatherer.printStackTrace(error);
+        Gatherer.printStackTrace(error);
     }
     return count;
-    }
-
-    /** Retrieve the document this class is wrapping. */
-    public Document getDocument() {
+    }
+
+    /** Retrieve the document this class is wrapping. */
+    public Document getDocument() {
     return base_document;
-    }
-    /** Get all of the metadata, including directory level, associated with this file. */
-    public ArrayList getMetadata(String filename, boolean remove, ArrayList metadatum_so_far, File file, boolean append_folder_level) {
+    }
+    /** Get all of the metadata, including directory level, associated with this file. */
+    public ArrayList getMetadata(String filename, boolean remove, ArrayList metadatum_so_far, File file, boolean append_folder_level) {
     return getMetadata(filename, remove, metadatum_so_far, file, append_folder_level, false);
-    }
-    /** Retrieve the metadata associated with the given filename. Keep track of what metadata should be overwritten and what should be accumulated. Also make note of the source file, and remove the metadata if required. Finally if purge is set retrieve every piece of metadata in this file. */
-    public ArrayList getMetadata(String filename, boolean remove, ArrayList metadatum_so_far, File file, boolean append_folder_level, boolean purge) {
+    }
+    /** Retrieve the metadata associated with the given filename. Keep track of what metadata should be overwritten and what should be accumulated. Also make note of the source file, and remove the metadata if required. Finally if purge is set retrieve every piece of metadata in this file. */
+    public ArrayList getMetadata(String filename, boolean remove, ArrayList metadatum_so_far, File file, boolean append_folder_level, boolean purge) {
     Gatherer.println("Get metadata for " + filename);
     ArrayList metadatum = null;
     if(metadatum_so_far == null) {
-        metadatum = new ArrayList();
+        metadatum = new ArrayList();
     }
     else {
-        metadatum = metadatum_so_far;
+        metadatum = metadatum_so_far;
     }
     try {
-        // Retrieve the document element.
-        Element directorymetadata_element = base_document.getDocumentElement();
-        // Iterate through the filesets, checking the FileName child element against    the target file's name using regular expression matching.
-        NodeList fileset_elements = directorymetadata_element.getElementsByTagName(FILESET_ELEMENT);
-        for(int i = 0; i < fileset_elements.getLength(); i++) {
+        // Retrieve the document element.
+        Element directorymetadata_element = base_document.getDocumentElement();
+        // Iterate through the filesets, checking the FileName child element against    the target file's name using regular expression matching.
+        NodeList fileset_elements = directorymetadata_element.getElementsByTagName(FILESET_ELEMENT);
+        for(int i = 0; i < fileset_elements.getLength(); i++) {
         Element fileset_element = (Element) fileset_elements.item(i);
         NodeList filename_elements = fileset_element.getElementsByTagName(FILENAME_ELEMENT);
         for(int j = 0; j < filename_elements.getLength(); j++) {
-            Element filename_element = (Element) filename_elements.item(j);
-            String filename_text = MSMUtils.getValue(filename_element);
-            if((filename != null && (filename.matches(filename_text) || (append_folder_level && filename.indexOf(File.separator) != -1 && filename_text.equals(filename.substring(0, filename.indexOf(File.separator)))))) || ((filename == null || append_folder_level) && filename_text.equals(DIRECTORY_FILENAME)) || purge) {
+            Element filename_element = (Element) filename_elements.item(j);
+            String filename_text = MSMUtils.getValue(filename_element);
+            if((filename != null && (filename.matches(filename_text) || (append_folder_level && filename.indexOf(File.separator) != -1 && filename_text.equals(filename.substring(0, filename.indexOf(File.separator)))))) || ((filename == null || append_folder_level) && filename_text.equals(DIRECTORY_FILENAME)) || purge) {
             // If they match add all of the metadata found in the Description child element, remembering to abide by desired mode (accumulate vs. overwrite).
+            // Normal metadata
             NodeList description_elements = fileset_element.getElementsByTagName(DESCRIPTION_ELEMENT);
             for(int k = 0; k < description_elements.getLength(); k++) {
-                Element description_element = (Element) description_elements.item(k);
-                NodeList metadata_elements = description_element.getElementsByTagName(StaticStrings.METADATA_ELEMENT);
-                for(int l = 0; l < metadata_elements.getLength(); l++) {
-                Element metadata_element = (Element) metadata_elements.item(l);
-                String raw_element = metadata_element.getAttribute(StaticStrings.NAME_ATTRIBUTE);
-                //String language = metadata_element.getAttribute("language");
-                String mode = metadata_element.getAttribute(MODE_ATTRIBUTE);
-                String raw_value = MSMUtils.getValue(metadata_element);
-                // Raw value is in GREENSTONE form, convert to DOM
-                raw_value = Codec.transform(raw_value, Codec.GREENSTONE_TO_DOM);
-                // ***** LEGACY SUPPORT *****
-                // If this raw_value contains a '\' character, but no '\\', '[' or ']' characters, then replace the '\' with a '\\'
-                if(raw_value.indexOf(StaticStrings.ESCAPE_STR) != -1) {
-                    Gatherer.println("Detected Legacy Path: " + raw_value);
-                    raw_value = raw_value.replaceAll(StaticStrings.ESCAPE_PATTERN, StaticStrings.PIPE_STR);
-                    Gatherer.println("Updated Path To: " + raw_value);
-                    MSMUtils.setValue(metadata_element, raw_value);
+                Element description_element = (Element) description_elements.item(k);
+                // We have to do this for each type of metadata
+                for(int z = 0; z < ALL_METADATA_TYPES.length; z++) {
+                    NodeList metadata_elements = description_element.getElementsByTagName(ALL_METADATA_TYPES[z]);
+                    for(int l = 0; l < metadata_elements.getLength(); l++) {
+                         Element metadata_element = (Element) metadata_elements.item(l);
+                         String raw_element = metadata_element.getAttribute(StaticStrings.NAME_ATTRIBUTE);
+                         //String language = metadata_element.getAttribute("language");
+                         String mode = metadata_element.getAttribute(MODE_ATTRIBUTE);
+                         String raw_value = MSMUtils.getValue(metadata_element);
+                         // Raw value is in GREENSTONE form, convert to DOM
+                         raw_value = Codec.transform(raw_value, Codec.GREENSTONE_TO_DOM);
+                         // ***** LEGACY SUPPORT *****
+                         // If this raw_value contains a '\' character, but no '\\', '[' or ']' characters, then replace the '\' with a '\\'
+                         if(raw_value.indexOf(StaticStrings.ESCAPE_STR) != -1) {
+                             Gatherer.println("Detected Legacy Path: " + raw_value);
+                             raw_value = raw_value.replaceAll(StaticStrings.ESCAPE_PATTERN, StaticStrings.PIPE_STR);
+                             Gatherer.println("Updated Path To: " + raw_value);
+                             MSMUtils.setValue(metadata_element, raw_value);
+                         }
+                         // **************************
+                         // Using the element string and value, retrieve a matching Metadata object from the cache
+                         Metadata metadata = null;
+                         // If this element has hierarchy values then we must ensure the raw value is a full path, not an index.
+                         // Try to retrieve an already comstructed piece of metadata from file - but not if we are purging, as this will stuff up anything that is still using that metadata - such as the GTable
+                         if(GDMManager.metadata_cache.contains(raw_element, raw_value) && !purge) {
+                             ///ystem.err.println("HIT! Retrieve metadata from cache: " + raw_element + " -> " + raw_value + "\n");
+                             metadata = (Metadata) GDMManager.metadata_cache.get(raw_element, raw_value);
+                         }
+                         else {
+                             ElementWrapper element = Gatherer.c_man.getCollection().msm.getElement(raw_element);
+                             if (element != null) {
+                                 GValueNode value = Metadata.getDefaultValueNode(element, raw_value);
+                                 ///ystem.err.println("Miss. Create new metadata: " + raw_element + " -> " + raw_value + "\n");
+                                 metadata = new Metadata(element, value);
+                                 if(!purge) {
+                                     GDMManager.metadata_cache.put(raw_element, raw_value, metadata);
+                                 }
+                                 ///ystem.err.println("Added metadata to cache: " + raw_element + " -> " + raw_value + "\n");
+                                 value = null;
+                                 element = null;
+                             }
+                         }
+                         // check whether the metadata is null
+                         if (metadata != null) {
+                             // We determine whether this metadata is file or folder level
+                             if(filename != null) {
+                                 ///ystem.err.println("Filename   = " + filename);
+                                 ///ystem.err.println("filename_text = " + filename_text);
+                                 // If can only be file level if there is no folder path details in filename and if the filename matched the filename text node (it may have matched .* instead)!
+                                 if(filename.indexOf(File.separator) == -1 && filename.equals(filename_text)) {
+                                     metadata.setFileLevel(true);
+                                     ///ystem.err.println("File level!!!");
+                                 }
+                                 else {
+                                     metadata.setFileLevel(false);
+                                     ///ystem.err.println("Inherited!!!");
+                                 }
+                             }
+                             else {
+                                 ///ystem.err.println("Filename is null therefore this is file level metadata.");
+                                 metadata.setFileLevel(true);
+                             }
+                             metadata.setFile(file);
+                             // If mode is overwrite, then remove any previous values for this metadata element.
+                             if(mode.equals("accumulate")) {
+                                 metadata.setAccumulate(true);
+                             }
+                             else {
+                                 metadata.setAccumulate(false);
+                                 ///ystem.err.println("Metadata overwrites: " + metadata);
+                                 for(int m = metadatum.size() - 1; m >= 0; m--) {
+                                     Metadata old_metadata = (Metadata) metadatum.get(m);
+                                     if(old_metadata.getElement().equals(metadata.getElement())) {
+                                         metadatum.remove(m);
+                                         ///ystem.err.println("Removing overridden metadata: " + old_metadata);
+                                     }
+                                     old_metadata = null;
+                                 }
+                             }
+                             mode = null;
+                             // Add the completed metadata and clean up
+                             ///ystem.err.println("Adding metadata: " + metadata);
+                             metadatum.add(metadata);
+                             // Having found our metadata check if the value from the xml matches the one from the gvaluenode. If not update it. This happens whenever hierarchy information is involved (indexes rapidly become obsolete).
+                             // If remove was set, remove it. We can only remove pure file level metadata, or folder level iff we were asked for folder level.
+                             if(remove && ((filename != null && filename.matches(filename_text) && !filename_text.equals(DIRECTORY_FILENAME)) || (filename == null && filename_text.equals(DIRECTORY_FILENAME)))) {
+                                 ///ystem.err.println("Removing " + metadata + " from " + file);
+                                 description_element.removeChild(metadata_element);
+                                 // Remove the description element if empty.
+                                 if(!description_element.hasChildNodes()) {
+                                     fileset_element.removeChild(description_element);
+                                 }
+                             }
+                             else {
+                                 //String current_value = metadata.getAbsoluteValue();
+                                 String current_value = Codec.transform(metadata.getValueNode().getFullPath(false), Codec.TEXT_TO_DOM);
+                                 ///ystem.err.println("Checking the current hfile: " + current_value);
+                                 ///ystem.err.println("Against whats in the hfile: " + current_value);
+                                 if(!raw_value.equals(current_value)) {
+                                     // Remove old text
+                                     while(metadata_element.hasChildNodes()) {
+                                         metadata_element.removeChild(metadata_element.getFirstChild());
+                                     }
+                                     // Add new.
+                                     metadata_element.appendChild(base_document.createTextNode(current_value));
+                                 }
+                             }
+                         }
+                         metadata = null;
+                         raw_value = null;
+                         raw_element = null;
+                         metadata_element = null;
+                     }
+                     metadata_elements = null;
                 }
-                // **************************
-                // Using the element string and value, retrieve a matching Metadata object from the cache
-                Metadata metadata = null;
-                // If this element has hierarchy values then we must ensure the raw value is a full path, not an index. 
-                // Try to retrieve an already comstructed piece of metadata from file - but not if we are purging, as this will stuff up anything that is still using that metadata - such as the GTable
-                if(GDMManager.metadata_cache.contains(raw_element, raw_value) && !purge) {
-                    ///ystem.err.println("HIT! Retrieve metadata from cache: " + raw_element + " -> " + raw_value + "\n");
-                    metadata = (Metadata) GDMManager.metadata_cache.get(raw_element, raw_value);
-                }
-                else {
-                    ElementWrapper element = Gatherer.c_man.getCollection().msm.getElement(raw_element);
-                    if (element != null) {
-
-                    GValueNode value = Metadata.getDefaultValueNode(element, raw_value);
-                    ///ystem.err.println("Miss. Create new metadata: " + raw_element + " -> " + raw_value + "\n");
-                    metadata = new Metadata(element, value);
-                    if(!purge) {
-                        GDMManager.metadata_cache.put(raw_element, raw_value, metadata);
-                    }
-                    ///ystem.err.println("Added metadata to cache: " + raw_element + " -> " + raw_value + "\n");
-                    value = null;
-                    element = null;
-                    }
-                }
-                // check whether the metadata is null
-                if (metadata != null) {
-                // We determine whether this metadata is file or folder level
-                    if(filename != null) {
-                    ///ystem.err.println("Filename      = " + filename);
-                    ///ystem.err.println("filename_text = " + filename_text);
-                    // If can only be file level if there is no folder path details in filename and if the filename matched the filename text node (it may have matched .* instead)!
-                    if(filename.indexOf(File.separator) == -1 && filename.equals(filename_text)) {
-                        metadata.setFileLevel(true);
-                        ///ystem.err.println("File level!!!");
-                    }
-                    else {
-                        metadata.setFileLevel(false);
-                        ///ystem.err.println("Inherited!!!");
-                    }
-                    }
-                    else {
-                    ///ystem.err.println("Filename is null therefore this is file level metadata.");
-                    metadata.setFileLevel(true);
-                    }
-                    metadata.setFile(file);
-
-                // If mode is overwrite, then remove any previous values for this metadata element.
-                    if(mode.equals("accumulate")) {
-                    metadata.setAccumulate(true);
-                    }
-                    else {
-                    metadata.setAccumulate(false);
-                    ///ystem.err.println("Metadata overwrites: " + metadata);
-                    for(int m = metadatum.size() - 1; m >= 0; m--) {
-                        Metadata old_metadata = (Metadata) metadatum.get(m);
-                    if(old_metadata.getElement().equals(metadata.getElement())) {
-                        metadatum.remove(m);
-                        ///ystem.err.println("Removing overridden metadata: " + old_metadata);
-                    }
-                    old_metadata = null;
-                    }
-                    }
-                    mode = null;
-
-                // Add the completed metadata and clean up
-                ///ystem.err.println("Adding metadata: " + metadata);
-                    metadatum.add(metadata);
-
-                // Having found our metadata check if the value from the xml matches the one from the gvaluenode. If not update it. This happens whenever hierarchy information is involved (indexes rapidly become obsolete).
-                // If remove was set, remove it. We can only remove pure file level metadata, or folder level iff we were asked for folder level.
-                    if(remove && ((filename != null && filename.matches(filename_text) && !filename_text.equals(DIRECTORY_FILENAME)) || (filename == null && filename_text.equals(DIRECTORY_FILENAME)))) {
-                    ///ystem.err.println("Removing " + metadata + " from " + file);
-                    description_element.removeChild(metadata_element);
-                    // Remove the description element if empty.
-                    if(!description_element.hasChildNodes()) {
-                        fileset_element.removeChild(description_element);
-                    }
-                    }
-                    else {
-                    //String current_value = metadata.getAbsoluteValue();
-                    String current_value = Codec.transform(metadata.getValueNode().getFullPath(false), Codec.TEXT_TO_DOM);
-                    ///ystem.err.println("Checking the current hfile: " + current_value);
-                    ///ystem.err.println("Against whats in the hfile: " + current_value);
-                    if(!raw_value.equals(current_value)) {
-                        // Remove old text
-                        while(metadata_element.hasChildNodes()) {
-                        metadata_element.removeChild(metadata_element.getFirstChild());
-                        }
-                        // Add new.
-                        metadata_element.appendChild(base_document.createTextNode(current_value));
-                    }
-                    }
-                }
-                metadata = null;
-                raw_value = null;
-                raw_element = null;
-                metadata_element = null;
-                }
-                metadata_elements = null;
-                description_element = null;
+                description_element = null;
             }
             description_elements = null;
-            }
-            filename_text = null;
-            filename_element = null;
+            }
+            filename_text = null;
+            filename_element = null;
         }
         // If the file set no longer has any description entries, remove it entirely
         NodeList description_elements = fileset_element.getElementsByTagName(DESCRIPTION_ELEMENT);
         if(description_elements.getLength() == 0) {
-            directorymetadata_element.removeChild(fileset_element);
+            directorymetadata_element.removeChild(fileset_element);
         }
         description_elements = null;
         filename_elements = null;
         fileset_element = null;
-        }
-        fileset_elements = null;
-        directorymetadata_element = null;
+        }
+        fileset_elements = null;
+        directorymetadata_element = null;
     }
     catch (Exception error) {
-        Gatherer.self.printStackTrace(error);
+        Gatherer.self.printStackTrace(error);
     }
     ///ystem.err.println("Found " + metadatum.size() + " pieces of metadata.");
     return metadatum;
-    }
-
-    /** Determine if this document has been saved recently, and thus xml file version is up to date. */
-    public boolean isUpToDate() {
+    }
+
+    /** Determine if this document has been saved recently, and thus xml file version is up to date. */
+    public boolean isUpToDate() {
     return false;
-    }
-
-    /** Determine is this is a valid Greenstone Directory Metadata file. It may of course just be some xml file with the name metadata.xml. */
-    public boolean isValid() {
+    }
+
+    /** Determine is this is a valid Greenstone Directory Metadata file. It may of course just be some xml file with the name metadata.xml. */
+    public boolean isValid() {
     // Just determine if the doctype is GreenstoneDirectoryMetadata and root node is called DirectoryMetadata.
     String doctype_name = base_document.getDoctype().getName();
     String root_name = base_document.getDocumentElement().getTagName();
     return ((doctype_name.equals("GreenstoneDirectoryMetadata") && root_name.equals("GreenstoneDirectoryMetadata")) || (doctype_name.equals("DirectoryMetadata") && root_name.equals("DirectoryMetadata")));
-    }
-    /** Remove the given directory level metadata from this document. All directory level metadata is available under the FileSet with filename '.*'. There is at least one nasty case to consider, where the first overwriting metadata entry, of several with the same element, is removed. In this case the next entry must become overwrite to ensure proper inheritance. */
-    public void removeMetadata(String filename, Metadata metadata) {
+    }
+    /** Remove the given directory level metadata from this document. All directory level metadata is available under the FileSet with filename '.*'. There is at least one nasty case to consider, where the first overwriting metadata entry, of several with the same element, is removed. In this case the next entry must become overwrite to ensure proper inheritance. */
+    public void removeMetadata(String filename, Metadata metadata) {
+    Gatherer.println("Remove metadata: " + metadata + "\nFrom filename: " + filename);
     try {
-        boolean found = false;
-        boolean first_metadata_element_found = true;
-        boolean make_next_metadata_element_overwrite = false;
-        boolean remove_fileset = false;
-        // Retrieve the document element.
-        Element directorymetadata_element = base_document.getDocumentElement();
-        // Iterate through the filesets looking for the directory level one.
-        NodeList fileset_elements = directorymetadata_element.getElementsByTagName(FILESET_ELEMENT);
-        for(int i = 0; !found && i < fileset_elements.getLength(); i++) {
+        boolean found = false;
+        boolean first_metadata_element_found = true;
+        boolean make_next_metadata_element_overwrite = false;
+        boolean remove_fileset = false;
+        // Retrieve the document element.
+        Element directorymetadata_element = base_document.getDocumentElement();
+        // Iterate through the filesets looking for the directory level one.
+        NodeList fileset_elements = directorymetadata_element.getElementsByTagName(FILESET_ELEMENT);
+        for(int i = 0; !found && i < fileset_elements.getLength(); i++) {
         Element fileset_element = (Element) fileset_elements.item(i);
         NodeList filename_elements = fileset_element.getElementsByTagName(FILENAME_ELEMENT);
         for(int j = 0; !found && j < filename_elements.getLength(); j++) {
-            Element filename_element = (Element) filename_elements.item(j);
-            String filename_text = MSMUtils.getValue(filename_element);
-            if((filename != null && filename.matches(filename_text) && !filename.equals(DIRECTORY_FILENAME)) || (filename == null && filename_text.equals(DIRECTORY_FILENAME))) {
+            Element filename_element = (Element) filename_elements.item(j);
+            String filename_text = MSMUtils.getValue(filename_element);
+            if((filename != null && filename.matches(filename_text) && !filename.equals(DIRECTORY_FILENAME)) || (filename == null && filename_text.equals(DIRECTORY_FILENAME))) {
             // Retrieve the Metadata Element for this fileset, and iterate through them looking for the one which we are to remove.
             NodeList description_elements = fileset_element.getElementsByTagName("Description");
             for(int k = 0; !found && k < description_elements.getLength(); k++) {
-                Element description_element = (Element) description_elements.item(k);
-                NodeList metadata_elements = description_element.getElementsByTagName(StaticStrings.METADATA_ELEMENT);
-                for(int l = 0; (!found || !make_next_metadata_element_overwrite) && l < metadata_elements.getLength(); l++) {
-                Element metadata_element = (Element) metadata_elements.item(l);
-                String element = metadata_element.getAttribute("name");
-                String value = MSMUtils.getValue(metadata_element);
-                // See if this is the metadata we wish to remove
-                if(element.equals(metadata.getElement().getName())) {
-                    if(value.equals(metadata.getAbsoluteValue())) {
-                    // Remove it
-                    ///ystem.err.println("Remove " + element + "-" + value);
-                    description_element.removeChild(metadata_element);
-                    found = true;
-                    // If this was the first metadata with this element found, and it was set to overwrite, then we have to ensure that the next metadata with this element found (if any) is changed to be overwrite now.
-                    if(first_metadata_element_found && !metadata.accumulates()) {
-                        ///ystem.err.println("First of this element found!");
-                        make_next_metadata_element_overwrite = true;
-                    }
-                    }
-                    // If this was the first metadata we've found with the element of the one to be removed set first found to false.
-                    else if(first_metadata_element_found) {
-                    ///ystem.err.println("Found a matching element: " + element + "=" + value);
-                    first_metadata_element_found = false;
-                    }
-                    // Otherwise we should make this metadata overwrite as requested.
-                    else if(make_next_metadata_element_overwrite) {
-                    ///ystem.err.println("Changing to overwrite: " + element + "=" + value);
-                    metadata_element.setAttribute(MODE_ATTRIBUTE, "");
-                    }
+                Element description_element = (Element) description_elements.item(k);
+                // We have to do this for each type of metadata
+                for(int z = 0; z < ALL_METADATA_TYPES.length; z++) {
+                     NodeList metadata_elements = description_element.getElementsByTagName(ALL_METADATA_TYPES[z]);
+                     for(int l = 0; (!found || !make_next_metadata_element_overwrite) && l < metadata_elements.getLength(); l++) {
+                     Element metadata_element = (Element) metadata_elements.item(l);
+                     String element = metadata_element.getAttribute("name");
+                     String value = MSMUtils.getValue(metadata_element);
+                     // See if this is the metadata we wish to remove
+                     if(element.equals(metadata.getElement().getName())) {
+                         if(value.equals(metadata.getAbsoluteValue())) {
+                         // Remove it
+                         ///ystem.err.println("Remove " + element + "-" + value);
+                         description_element.removeChild(metadata_element);
+                         found = true;
+                         // If this was the first metadata with this element found, and it was set to overwrite, then we have to ensure that the next metadata with this element found (if any) is changed to be overwrite now.
+                         if(first_metadata_element_found && !metadata.accumulates()) {
+                             ///ystem.err.println("First of this element found!");
+                             make_next_metadata_element_overwrite = true;
+                         }
+                         }
+                         // If this was the first metadata we've found with the element of the one to be removed set first found to false.
+                         else if(first_metadata_element_found) {
+                         ///ystem.err.println("Found a matching element: " + element + "=" + value);
+                         first_metadata_element_found = false;
+                         }
+                         // Otherwise we should make this metadata overwrite as requested.
+                         else if(make_next_metadata_element_overwrite) {
+                         ///ystem.err.println("Changing to overwrite: " + element + "=" + value);
+                         metadata_element.setAttribute(MODE_ATTRIBUTE, "");
+                         }
+                     }
+                     value = null;
+                     element = null;
+                     metadata_element = null;
+                     }
+                     metadata_elements = description_element.getElementsByTagName(ALL_METADATA_TYPES[z]);
+                     // If we found it, removed it, and now the description tag has no children, mark the fileset for removal
+                     if(metadata_elements.getLength() == 0) {
+                     remove_fileset = true;
+                     }
+                     metadata_elements = null;
                 }
-                value = null;
-                element = null;
-                metadata_element = null;
-                }
-                metadata_elements = description_element.getElementsByTagName(StaticStrings.METADATA_ELEMENT);
-                // If we found it, removed it, and now the description tag has no children, mark the fileset for removal
-                if(metadata_elements.getLength() == 0) {
-                remove_fileset = true;
-                }
-                metadata_elements = null;
-                description_element = null;
+                description_element = null;
             }
             description_elements = null;
-            }
-            filename_text = null;
-            filename_element = null;
+            }
+            filename_text = null;
+            filename_element = null;
         }
         filename_elements = null;
         if(found && remove_fileset) {
-            directorymetadata_element.removeChild(fileset_element);
+            directorymetadata_element.removeChild(fileset_element);
         }
         fileset_element = null;
-        }
-        fileset_elements = null;
-        directorymetadata_element = null;
-        up_to_date = false;
+        }
+        fileset_elements = null;
+        directorymetadata_element = null;
+        up_to_date = false;
     }
     catch (Exception error) {
-        Gatherer.printStackTrace(error);
-    }
-    }
-
-    /** Change the up to date flag. */
-    public void setUpToDate(boolean up_to_date) {
+        Gatherer.printStackTrace(error);
+    }
+    }
+
+    /** Change the up to date flag. */
+    public void setUpToDate(boolean up_to_date) {
     this.up_to_date = up_to_date;
-    }
+    }
 }

trunk/gli/src/org/greenstone/gatherer/msm/GreenstoneArchiveParser.java

@@ -139 +139 @@
                 for(int k = 0; !found && k < metadatum.size(); k++) {
                     Metadata sibling = (Metadata) metadatum.get(k);
+                    ///ystem.err.println("Comparing " + element + " to " + sibling.getElement());
                     if(element.equals(sibling.getElement())) {
+                          ///ystem.err.println("Removing metadata for: " + sibling);
                     Gatherer.c_man.getCollection().gdm.metadataChanged(new MSMEvent(this, System.currentTimeMillis(), target_file, sibling, null));
                     }

trunk/gli/src/org/greenstone/gatherer/shell/GShell.java

@@ -108 +108 @@
     return process_running;
     }
-    
+
     /** Constructor gatherer all the data required to create a new process, and emit meaningfull messages.
      * @param args A <strong>String[]</strong> containing the arguments to the process thread, including the name of the executable.
@@ -143 +143 @@
     } */
     /** Any threaded class must include this method to allow the thread body to be run. */
-    public void run() {
-    if(progress != null) {
-        progress.start();
-    }
-    // Determine if the user has asked for an outfile.
-    String out_name = null;
-    BufferedOutputStream bos = null;
-    if(type == IMPORT || type == BUILD) {
-        if(type == IMPORT) {
-        out_name = (String) Gatherer.c_man.getCollection().build_options.getImportValue("out");
-        }
-        else {
-        out_name = (String) Gatherer.c_man.getCollection().build_options.getBuildValue("out");
-        }
-        if(out_name != null && out_name.length() > 0) {
+    public void run() {
+        if(progress != null) {
+            progress.start();
+        }
+        // Determine if the user has asked for an outfile.
+        String out_name = null;
+        BufferedOutputStream bos = null;
+        if(type == IMPORT || type == BUILD) {
+            if(type == IMPORT) {
+            out_name = (String) Gatherer.c_man.getCollection().build_options.getImportValue("out");
+            }
+            else {
+            out_name = (String) Gatherer.c_man.getCollection().build_options.getBuildValue("out");
+            }
+            if(out_name != null && out_name.length() > 0) {
+            try {
+                bos = new BufferedOutputStream(new FileOutputStream(new File(out_name), true));
+            }
+            catch (Exception error) {
+                Gatherer.printStackTrace(error);
+            }
+            }
+        }
+        // Issue a processBegun event
+        fireProcessBegun(type, status);
         try {
-            bos = new BufferedOutputStream(new FileOutputStream(new File(out_name), true));
-        } 
-        catch (Exception error) {
-            Gatherer.printStackTrace(error);
-        }
-        }
-    }
-    // Issue a processBegun event
-    fireProcessBegun(type, status);
-    try {
 
         String command = "";
@@ -176 +176 @@
         ///ystem.err.println("Command: " + command);
         fireMessage(type, Dictionary.get("GShell.Command") + ": " + command, status);
-                
+
         Runtime rt = Runtime.getRuntime();
         Process prcs = rt.exec(args);
@@ -184 +184 @@
         //BufferedReader stdinbr = new BufferedReader( stdinisr );
         // Captures the std err of a program and pipes it into std in of java
-        
+
         StringBuffer eline_buffer = new StringBuffer();
         StringBuffer stdline_buffer = new StringBuffer();
@@ -191 +191 @@
         if(eisr.ready()) {
             int c = eisr.read();
+            ///atherer.println("eisr: '" + (char) c + "'");
             if(c == '\n' || c == '\r') {
             if(eline_buffer.length() > 0) {
                 String eline = eline_buffer.toString();
-                ///ystem.err.print("*");
+                ///atherer.println("* " + eline + " *");
                 if(progress != null) {
                 progress.parse(eline);
@@ -218 +219 @@
         else if(stdisr.ready()) {
             int c = stdisr.read();
+            ///atherer.println("eisr: '" + (char) c + "'");
             if(c == '\n' || c == '\r') {
             if(stdline_buffer.length() > 0) {
                 String stdline = stdline_buffer.toString();
-                ///ystem.err.print("+");
+                ///atherer.println("+ " + stdline + " +");
                 fireMessage(type, typeAsString(type) + "> " + stdline, status);
                 stdline = null;
@@ -240 +242 @@
         }
 
+            // Of course, just because the process is finished doesn't mean the incoming streams are empty. Unfortunately I've got no chance of preserving order, so I'll process the error stream first, then the out stream
+            while(eisr.ready()) {
+                int c = eisr.read();
+                ///atherer.println("eisr: '" + (char) c + "'");
+                if(c == '\n' || c == '\r') {
+                    if(eline_buffer.length() > 0) {
+                        String eline = eline_buffer.toString();
+                        ///atherer.println("* " + eline + " *");
+                        if(progress != null) {
+                            progress.parse(eline);
+                        }
+                        if(bos != null) {
+                            try {
+                                bos.write(eline.getBytes(), 0, eline.length());
+                            }
+                            catch(Exception error) {
+                                Gatherer.printStackTrace(error);
+                            }
+                        }
+                        fireMessage(type, typeAsString(type) + "> " + eline, status);
+                        eline = null;
+                        eline_buffer = new StringBuffer();
+                    }
+                }
+                else {
+                    eline_buffer.append((char)c);
+                }
+            }
+            while(stdisr.ready()) {
+                int c = stdisr.read();
+                ///atherer.println("eisr: '" + (char) c + "'");
+                if(c == '\n' || c == '\r') {
+                    if(stdline_buffer.length() > 0) {
+                        String stdline = stdline_buffer.toString();
+                        ///atherer.println("+ " + stdline + " +");
+                        fireMessage(type, typeAsString(type) + "> " + stdline, status);
+                        stdline = null;
+                        stdline_buffer = new StringBuffer();
+                    }
+                }
+                else {
+                    stdline_buffer.append((char)c);
+                }
+            }
+
+        // Ensure that any messages still remaining in the string buffers are fired off.
+        if(eline_buffer.length() > 0) {
+            String eline = eline_buffer.toString();
+            if(progress != null) {
+                progress.parse(eline);
+            }
+            if(bos != null) {
+                try {
+                    bos.write(eline.getBytes(), 0, eline.length());
+                }
+                catch(Exception error) {
+                    Gatherer.printStackTrace(error);
+                }
+            }
+            fireMessage(type, typeAsString(type) + "> " + eline, status);
+            eline = null;
+        }
+
+        if(stdline_buffer.length() > 0) {
+            String stdline = stdline_buffer.toString();
+            fireMessage(type, typeAsString(type) + "> " + stdline, status);
+            stdline = null;
+        }
+
         if(!hasSignalledStop()) {
         // Now display final message based on exit value
         prcs.waitFor();
-                     
+
         if(prcs.exitValue() == 0) {
             status = OK;
@@ -332 +403 @@
     }
 
-    /** Method to determine if the user, via the progress monitor, has signalled stop. 
+    /** Method to determine if the user, via the progress monitor, has signalled stop.
      * @return A <strong>boolean</strong> indicating if the user wanted to stop.
      */

trunk/gli/src/org/greenstone/gatherer/util/Codec.java

@@ -147 +147 @@
     // Transform plain html text into greenstone encoding
     String[] text_to_greenstone = {
-        
+
         "\\[", "[",
         "\\]", "]",
         "\"", """,
-        "\'", "'",
         "\n", "\\\\n"
     };
+    //      "\'", "'",
     // removed "\\\\", "\\|",
     TRANSFORMS.put(TEXT_TO_GREENSTONE, text_to_greenstone);
@@ -179 +179 @@
     }
 
-    static public String transform(String raw, String transform) {
+    static public String transform(String raw, String transform) {
+        if(raw == null) {
+             return raw;
+        }
     ///ystem.err.println("Transforming by "+transform+":\n" + raw);
     String processed = (String) CACHE.get(transform, raw);

trunk/gli/src/org/greenstone/gatherer/util/StaticStrings.java

@@ -32 +32 @@
 /** Were you to guess that this is a class object choc-a-block full of static stringy goodness, you'd be right. They come in several flavours: Those ending _STR are strings you might find as values in XML, _ELEMENT are element names, _ATTRIBUTE are attribute names, _CHAR are particular characters while _CHARACTER are also characters but expressed as strings (for regex purposes ie startsWith, endsWith, indexOf and replaceAll); _PATTERN are strings which require extra escaping to put them through regex. Finally anything else is just a static string used within GLI. */
 public class StaticStrings {
+     static final public char   CLOSEBRACKET_CHAR                          = ']';
+    static final public char   DOUBLEQUOTE_CHAR                           = '\"';
+    static final public char   BACKSLASH_CHAR                             = '\\';
     static final public char   FORWARDSLASH_CHAR                          = '/';
     static final public char   NEW_LINE_CHAR                              = '\n';
+    static final public char   OPENBRACKET_CHAR                           = '[';
     static final public char   PIPE_CHAR                                  = '|';
+    static final public char   SINGLEQUOTE_CHAR                           = '\'';
+    static final public char   SPACE_CHAR                                 = ' ';
     static final public char   STAR_CHAR                                  = '*';
     static final public String ABSTRACT_ELEMENT                           = "Abstract";
@@ -41 +47 @@
     static final public String ASSIGNED_ATTRIBUTE                         = "assigned";
     static final public String AT_CHARACTER                               = "@";
+    static final public String BUILD_TYPE_STR                             = "buildtype";
     static final public String CCS_STR                                    = "ccs";
     static final public String CLASSES_FOLDER                             = "classes";
@@ -76 +83 @@
     static final public String ENGLISH_LANGUAGE_STR                       = "en";
     static final public String ENUM_STR                                   = "enum";
+    static final public String EQUALS_CHARACTER                           = "=";
     static final public String ERROR_STR                                  = "Error";
     static final public String ESCAPE_PATTERN                             = "\\\\";
@@ -81 +89 @@
     static final public String EXCLAIMATION_CHARACTER                     = "!";
     static final public String EXCLUDE_STR                                = "exclude";
+    static final public String EXTRACTED_METADATA_ELEMENT                 = "XMetadata";
     static final public String EXTRACTED_NAMESPACE                        = "ex.";
     static final public String FALSE_STR                                  = "false";
@@ -146 +155 @@
     static final public String PROPERTIES_FILE_EXTENSION                  = ".properties";
     static final public String PSEUDO_COLLECTCONFIGURATION_XML            = "xml/CollectionConfig.xml";
-    //static final public String QUOTE_CHARACTER                            = "\"";
     static final public String RBRACKET_CHARACTER                         = "]";
     static final public String RBRACKET_PATTERN                           = "\\]";