Changeset 8695 for trunk/gli/src/org/greenstone/gatherer/gui

Timestamp:

2004-11-29T17:08:52+13:00 (20 years ago)

Author:

mdewsnip

Message:

Now remove invalid characters from metadata values when they are entered. This prevents the problem of writing out XML files with invalid characters, which are barfed on when reading them back in.

File:

• trunk/gli/src/org/greenstone/gatherer/gui/EnrichPane.java (modified) (2 diffs)

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

@@ -64 +64 @@
 import org.greenstone.gatherer.util.TreeSynchronizer;
 import org.greenstone.gatherer.util.Utility;
-
-
-/** Provides a view of controls for the editing of metadata. It makes use of several other important components such as a GTree, GTable and MetadataValueTree. While much of the gui content is left to these components, the EnrichPane is resposible for actioning metadata edit requests, listing for mouse clicks within its scope and other data functionality (such as providing a list of the selected files).
+import org.greenstone.gatherer.util.XMLTools;
+
+
+/** Provides a view of controls for the editing of metadata.
  */
 public class EnrichPane
@@ -1094 +1095 @@
     public String getSelectedValue()
     {
-        return metadata_value_text_field.getText().replaceAll("\\\\", MetadataValueTreeNode.METADATA_VALUE_TREE_NODE_HIERARCHY_TOKEN);
+        String metadata_value_raw = metadata_value_text_field.getText();
+        String metadata_value = XMLTools.removeInvalidCharacters(metadata_value_raw);
+        return metadata_value.replaceAll("\\\\", MetadataValueTreeNode.METADATA_VALUE_TREE_NODE_HIERARCHY_TOKEN);
     }