Changeset 5672

Timestamp:

2003-10-17T04:50:35+13:00 (21 years ago)

Author:

jmt12

Message:

Not only did I rewrite the toString method to require a parameter specifying what sort of string should be returned, RAW, DOM or GREENSTONE, I also fixed a stupid bug when removing child nodes, which has made the MEM a thousand times more stable (OK so its probably closer to 5. Perhaps 2, yes 2 times more stable)

File:

• trunk/gli/src/org/greenstone/gatherer/valuetree/GValueNode.java (modified) (5 diffs)

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

@@ -62 +62 @@
     extends DefaultMutableTreeNode {
 
+   static final public int DOM = 0;
+   static final public int GREENSTONE = 1;
+   static final public int TEXT = 2;
+   
     private String element_name = null;
     private String default_value = null;
@@ -221 +225 @@
     }
 
-    public GValueNode getValue(String value) {
-    if(default_value != null) {
-        return this;
-    }
-    if(children == null) {
-        map();
-    }
-    for(int i = 0; i < children.size(); i++) {
-        GValueNode child = (GValueNode) children.get(i);
-        if(child.toString(false).equalsIgnoreCase(value)) {
-        return child;
-        }
-    }
-    return null;
-    }
+   public GValueNode getValue(String value) {
+      ///ystem.err.println("GValueNode.getValue(" + value + ")");
+      if(default_value != null) {
+     return this;
+      }
+      if(children == null) {
+     map();
+      }
+      for(int i = 0; i < children.size(); i++) {
+     GValueNode child = (GValueNode) children.get(i);
+     ///ystem.err.println("Comparing value and '" + child.toString(GValueNode.DOM));
+     if(child.toString(GValueNode.DOM).equalsIgnoreCase(value)) {
+        return child;
+     }
+      }
+      return null;
+   }
 
     /** Adds <I>child</I> to the receiever at <I>index</I>. <I>child</I> will
@@ -321 +327 @@
      */
     public String toString() {
-    return toString(true);
+    return toString(GValueNode.TEXT);
     }
     
-    public String toString(boolean as_text) {
+    public String toString(int decode_type) {
     if(default_value != null) {
         return default_value;
@@ -332 +338 @@
     String result = null;
     if(name.equals("Subject")) {
-        if(as_text) {
-        result = Codec.transform(MSMUtils.getValue(element), Codec.GREENSTONE_TO_TEXT);
-        }
-        else {
-        result = MSMUtils.getValue(element);
-        }
+       result = MSMUtils.getValue(element);
+       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.");
+       }
     }
     else if(name.equals("AssignedValues")) {
@@ -364 +380 @@
     public void remove(MutableTreeNode node) {
     children.remove(node);
-    parent = null;
+    node.setParent(null);
     // Remove from DOM
-    Node child_node = (Node) userObject;
-    Node parent_node = child_node.getParentNode();
-    parent_node.removeChild(child_node);
+    Element child_element = ((GValueNode)node).getElement();
+    Node parent_node = child_element.getParentNode();
+    parent_node.removeChild(child_element);
     }