Changeset 5877

Timestamp:

2003-11-18T15:32:46+13:00 (20 years ago)

Author:

jmt12

Message:

Introduced two new codec transforms to correctly handle path information

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• gui/MetaEditPane.java (modified) (2 diffs)
• util/Codec.java (modified) (9 diffs)
• valuetree/GValueNode.java (modified) (2 diffs)

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

@@ -233 +233 @@
       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.REMOVE_SQUARE_BRACKET);
+      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);
        }
@@ -1198 +1199 @@
         TreePath path = tree.getSelectionPath();
         GValueNode node = (GValueNode) path.getLastPathComponent();
-        setSelectedValue(node.getFullPath(false));
+        setSelectedValue(node.getFullPath(true));
         }
     }

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

@@ -38 +38 @@
 public class Codec {
 
+    static final public String DECODE_PATH = "DECODE_PATH";
    static final public String DOM_TO_GREENSTONE = "DOM_TO_GREENSTONE";
    static final public String DOM_TO_TEXT = "DOM_TO_TEXT";
+    static final public String ENCODE_PATH = "ENCODE_PATH";
    static final public String GREENSTONE_TO_DOM = "GREENSTONE_TO_DOM";
    static final public String GREENSTONE_TO_TEXT = "GREENSTONE_TO_TEXT";
@@ -58 +60 @@
     TRANSFORMS = new HashMap();
 
+    String[] decode_path = {
+        "\\|", "\\\\"
+    };
+    TRANSFORMS.put(DECODE_PATH, decode_path);
+    decode_path = null;
+
     // Translate DOM encoded text into Greenstone encoding
     String[] dom_to_greenstone = {
@@ -64 +72 @@
         "&lt;", "<",
         "&quot;", "\\\\\"",
-        "&amp;", "&",
-        "\\|", "\\\\"
+        "&amp;", "&"
     };
     //  removed "\n", "\\\\n", - config files are allowed new lines
@@ -81 +88 @@
        "&lt;", "<",
        "&quot;", "\"",
-       "&amp;", "&",
-       "\\|", "\\\\"
+       "&amp;", "&"
     };
     TRANSFORMS.put(DOM_TO_TEXT, dom_to_text);
     dom_to_text = null;
+
+    String[] encode_path = {
+        "\\\\", "\\|"
+    };
+    TRANSFORMS.put(ENCODE_PATH, encode_path);
+    encode_path = null;
 
     // Transform Greenstone encoded text to DOM encoding
@@ -93 +105 @@
         ">", "&gt;",
         "\\\\\"", "&quot;",
-        "\\\\\'", "&apos;",
-        "\\\\", "\\|"
+        "\\\\\'", "&apos;"
     };
     // removed"\\\\n", "\n", added "\\\\", "\\|"
@@ -109 +120 @@
         "&#091;", "\\[",
         "&#093;", "\\]"
-        
     };
     // removed    "\\\\n", "\n", "\\|", "\\\\"
@@ -130 +140 @@
         ">", "&gt;",
         "\"", "&quot;",
-        "\'", "&apos;",
-        "\\\\", "\\|",
+        "\'", "&apos;"
     };
     TRANSFORMS.put(TEXT_TO_DOM, text_to_dom);
@@ -171 +180 @@
 
     static public String transform(String raw, String transform) {
-    ///ystem.err.println("transforming "+transform);
+    ///ystem.err.println("Transforming by "+transform+":\n" + raw);
     String processed = (String) CACHE.get(transform, raw);
     if(processed == null) {
@@ -183 +192 @@
         }
         }
-        ///atherer.println("*** Transform: " + transform + " ***");
-        ///atherer.println("*** Raw      : '" + raw + "'");
-        ///atherer.println("*** Processed: '" + processed + "'");
+        //Gatherer.println("\n*** Transform: " + transform + " ***");
+        //Gatherer.println("*** Raw      : '" + raw + "'");
+        //Gatherer.println("*** Processed: '" + processed + "'");
         // If cache is at maximum size, empty it and start again
         if(CACHE.size() == MAX_CACHE_SIZE) {

trunk/gli/src/org/greenstone/gatherer/valuetree/GValueNode.java

@@ -192 +192 @@
     }
     if(as_text) {
-        return Codec.transform(path.toString(), Codec.GREENSTONE_TO_TEXT);
+        String temp = Codec.transform(path.toString(), Codec.GREENSTONE_TO_TEXT);
+        return Codec.transform(temp, Codec.DECODE_PATH);
     }
     else {
@@ -339 +340 @@
     if(name.equals("Subject")) {
        result = MSMUtils.getValue(element);
+       result = Codec.transform(result, Codec.DECODE_PATH);
        switch(decode_type) {
           case GValueNode.GREENSTONE: