Changeset 5153 for trunk/gli/src/org/greenstone/gatherer/valuetree/GValueModel.java

Timestamp:

2003-08-18T13:55:21+12:00 (21 years ago)

Author:

jmt12

Message:

Fix 203B143

File:

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

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

@@ -42 +42 @@
 import org.greenstone.gatherer.msm.MetadataSetManager;
 import org.greenstone.gatherer.msm.MSMUtils;
+import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.SynchronizedTreeModelTools;
 import org.greenstone.gatherer.util.Utility;
@@ -80 +81 @@
     }
 
-    /** Value may include path ie news/newssw */
+    /** Value may include path ie news\newssw */
     public GValueNode addValue(String value) {
-    StringTokenizer tokenizer = new StringTokenizer(value, "\\");
-    GValueNode subject = (GValueNode) root;
-    while(tokenizer.hasMoreTokens() && subject != null) {
-        String token = tokenizer.nextToken();
-        subject = addValue(token, subject, null);
-        ///ystem.err.println("Found or created a node " + token);
-    }
-    return subject;
+    try {
+        // Remove any single escape characters
+        value = stripEscapes(value);
+        // Now we can tokenize the string using the double escaped characters
+        StringTokenizer tokenizer = new StringTokenizer(value, StaticStrings.ESCAPE_STR);
+        GValueNode subject = (GValueNode) root;
+        while(tokenizer.hasMoreTokens() && subject != null) {
+        String token = tokenizer.nextToken();
+        subject = addValue(token, subject, null);
+        }
+        return subject;
+    }
+    catch (Exception error) {
+        error.printStackTrace();
+    }
+    return null;
+    }
+
+    /** Replace all current double escapes with single escapes, and remove all currently single escapes. */
+    static final private char ESCAPE_CHARACTER = '\\';
+    private String stripEscapes(String raw) {
+    StringBuffer processed_buffer = new StringBuffer();
+    int raw_length = raw.length();
+    for(int i = 0; i < raw_length; i++) {
+        char c = raw.charAt(i);
+        switch(c) {
+        case ESCAPE_CHARACTER:
+        if(i < raw_length - 1 && raw.charAt(i+1) == ESCAPE_CHARACTER) {
+            i = i + 1;
+            processed_buffer.append(c);
+        }
+        break;
+        default:
+        processed_buffer.append(c);
+        }
+    }
+    return processed_buffer.toString();
     }
 
@@ -245 +275 @@
     }
 
+    /**
     public void updateValue(String new_value, String old_value) {
     ///ystem.err.println("Updating '" + old_value + "' to '" + new_value + "'"); 
@@ -254 +285 @@
     }
     }
+    */
 
     /** Called to update a certain value of metadata within a specific
@@ -294 +326 @@
         }
         value = value.substring(next.toString().length());
-        if(value.startsWith("\\")) {
-            value = value.substring(1);
+        if(value.startsWith(StaticStrings.ESCAPE_STR + StaticStrings.ESCAPE_STR)) {
+            value = value.substring(2);
             index = getHIndex(next, value, index);
         }