Changeset 6069 for trunk/gli/src/org/greenstone/gatherer/valuetree/GValueNode.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/valuetree/GValueNode.java (modified) (2 diffs)

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

@@ -162 +162 @@
         return default_value;
     }
-    StringBuffer path = new StringBuffer(toString());
+    StringBuffer path = new StringBuffer(toString(DOM));
     GValueNode node = (GValueNode) getParent();
     while(node != null && !node.getElement().getNodeName().equalsIgnoreCase("AssignedValues")) {
         path.insert(0, StaticStrings.PIPE_STR);
-        path.insert(0, node.toString());
+        path.insert(0, node.toString(DOM));
         node = (GValueNode) node.getParent();
     }
     if(as_text) {
-        String temp = Codec.transform(path.toString(), Codec.GREENSTONE_TO_TEXT);
-        return Codec.transform(temp, Codec.DECODE_PATH);
+        String temp = path.toString(); ///odec.transform(path.toString(), codec.GREENSTONE_TO_TEXT);
+        System.err.println("Raw: " + temp);
+        temp = Codec.transform(temp, Codec.DECODE_PATH);
+        temp = Codec.transform(temp, Codec.DECODE_SQUARE_BRACKETS);
+        System.err.println("Decoded: " + temp);
+        return temp;
     }
     else {
@@ -313 +317 @@
     String result = null;
     if(name.equals("Subject")) {
-       result = MSMUtils.getValue(element);
-       result = Codec.transform(result, Codec.DECODE_PATH);
-       switch(decode_type) {
-          case GValueNode.GREENSTONE:
-         // We want this as greenstone format
-         ///ystem.err.print(result);
-         result = Codec.transform(result, Codec.DOM_TO_GREENSTONE);
-         ///ystem.err.println(" -> D2G decode -> " + result);
-         break;
-          case GValueNode.TEXT:
-         ///ystem.err.print(result);
-         result = Codec.transform(result, Codec.DOM_TO_TEXT);
-         ///ystem.err.println(" -> D2T decode -> " + result);
-         break;
-          default:
-         ///ystem.err.println(result + " -> nothing to do.");
-       }
+        result = MSMUtils.getValue(element);
+        ///ystem.err.print(result);
+        switch(decode_type) {
+        case GValueNode.GREENSTONE:
+        // We want this as greenstone format
+        ///ystem.err.print(result);
+        //result = /odec.transform(result, /odec.DOM_TO_GREENSTONE);
+        ///ystem.err.println(" -> D2G decode -> " + result);
+        break;
+        case GValueNode.TEXT:
+        //result = /odec.transform(result, /odec.DOM_TO_TEXT);
+        result = Codec.transform(result, Codec.DECODE_PATH);
+        result = Codec.transform(result, Codec.DECODE_SQUARE_BRACKETS);
+        ///ystem.err.println(" -> D2T decode -> " + result);
+        break;
+        default:
+        ///ystem.err.println(result + " -> nothing to do.");
+        }
     }
     else if(name.equals("AssignedValues")) {