Changeset 6069 for trunk/gli/src/org/greenstone/gatherer/gui/MetaEditPane.java

Timestamp:

2003-12-01T19:52:02+13:00 (20 years ago)

Author:

jmt12

Message:

Have rearranged where and how strings are feed through the Codec. After several hours work and a dozen paper trials I discovered the TEXT_TO_DOM conversion was completely pointless (DOM does it itself). Also the quotes only need to be dealt to if they are being sent to the collect.cfg file. Hopefully I've got it all going now - including using that pesky pipe character that I would rather not have to deal with. And everything seems to be ok - I tested all the dangerous characters including square brackets and amperstamp. I also tried hierarchies, and then as the piece'd'resistance I tried a hierarchies with dangerous characters. All good. I'm all about the working metadata.

File:

• trunk/gli/src/org/greenstone/gatherer/gui/MetaEditPane.java (modified) (8 diffs)

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

@@ -231 +231 @@
        private String value = null;
 
-       private AppendMetadataTask(ElementWrapper element, String value) {
+       private AppendMetadataTask(ElementWrapper element, String raw_value) {
       this.element = element;
+      this.value = raw_value;
       // 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(this.value, Codec.REMOVE_SQUARE_BRACKET);
-      this.value = Codec.transform(this.value, Codec.TEXT_TO_DOM);
+      //this.value = /odec.transform(value, /odec.ENCODE_PATH);
+      //this.value = /odec.transform(this.value, /odec.REMOVE_SQUARE_BRACKET);
+      //this.value = /odec.transform(this.value, /odec.TEXT_TO_DOM);
        }
 
@@ -267 +268 @@
        private String value;
 
-    private UpdateMetadataTask(ElementWrapper element, String value) {
+    private UpdateMetadataTask(ElementWrapper element, String raw_value) {
       this.element = element;
+      this.value = raw_value;
       // Transform the raw text to be DOM compatible - as that will be its next destination immediately after being added to the value model
-      this.value = Codec.transform(value, Codec.REMOVE_SQUARE_BRACKET);
-      this.value = Codec.transform(this.value, Codec.TEXT_TO_DOM);
+      //this.value = /odec.transform(value, /odec.REMOVE_SQUARE_BRACKET);
+      //this.value = /odec.transform(this.value, /odec.TEXT_TO_DOM);
     }
 
@@ -1103 +1105 @@
         JPanel value_field_pane = new JPanel();
         TransformCharacterTextField value_init = new TransformCharacterTextField();
-        value_init.replaceCharacter(StaticStrings.PIPE_CHAR, StaticStrings.FORWARDSLASH_CHAR);
+        //value_init.replaceCharacter(StaticStrings.PIPE_CHAR, StaticStrings.FORWARDSLASH_CHAR);
         value = value_init;
         value_init = null;
@@ -1189 +1191 @@
 
     public String getSelectedValue() {
-        return Codec.transform(Codec.transformUnicode(value.getText()), Codec.TEXT_TO_GREENSTONE);
+        //return /odec.transform(/odec.transformUnicode(value.getText()), /odec.TEXT_TO_GREENSTONE);
+        String raw_value = value.getText();
+        raw_value = Codec.transformUnicode(raw_value);
+        raw_value = Codec.transform(raw_value, Codec.ENCODE_PATH);
+        raw_value = Codec.transform(raw_value, Codec.ENCODE_SQUARE_BRACKETS);
+        return raw_value;
     }
 
@@ -1256 +1263 @@
         // Setting the text of the field causes the DocumentListener to be notified, and
         //   updating the tree is handled there (DocumentListenerImpl::validate())
-        ///ystem.err.println("Setting selected value to: " + val);
         if (!card_showing.equals(NONE)) {
+        // Decode val
+        //System.err.println("Before transforms: " + val);
+        //val = Codec.transform(val, Codec.DECODE_SQUARE_BRACKETS);
+        //val = Codec.transform(val, Codec.DECODE_PATH);
+        //System.err.println("Setting selected value to: " + val);
         manual_text_edit_event = val.equals("");  // Set to false unless val == ""
-        value.setText(Codec.transform(val, Codec.GREENSTONE_TO_TEXT));
+        value.setText(val); ///odec.transform(val, /odec.GREENSTONE_TO_TEXT));
         value.setCaretPosition(0);
         manual_text_edit_event = true;
@@ -1269 +1280 @@
     private TreePath getClosestPath(String val)
     {
+        System.err.println("Select closest path to: " + val);
         // Start at the root of the tree
         GValueNode tree_node = (GValueNode) tree.getModel().getRoot();
 
-        // Hierarchical values are separated using '\'
-        PatternTokenizer tokenizer = new PatternTokenizer(val, "\\");  // StaticStrings.PIPE_STR);
+        // Hierarchical values are separated using '|'
+        PatternTokenizer tokenizer = new PatternTokenizer(val, StaticStrings.PIPE_STR);
         while (tokenizer.hasMoreTokens()) {
         String token = tokenizer.nextToken();
@@ -1336 +1348 @@
             TreePath path = tree.getSelectionPath();
             GValueNode node = (GValueNode) path.getLastPathComponent();
-            value.setText(node.getFullPath(true));
+            String val = node.getFullPath(true);
+            System.err.println("Setting value to: " + val);
+            value.setText(val);
+            val = null;
             }
         }
@@ -1374 +1389 @@
         private void validate()
         {
-        String value_text = Codec.transform(getSelectedValue(), Codec.TEXT_TO_DOM);
+        String value_text = getSelectedValue(); ///odec.transform(getSelectedValue(), /odec.TEXT_TO_DOM);
         ///ystem.err.println("\n(Validate) Value text: " + value_text);