Changeset 5294

Timestamp:

2003-08-27T15:03:07+12:00 (21 years ago)

Author:

jmt12

Message:

Fixing escaped path problem

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• util/Codec.java (modified) (4 diffs)
• valuetree/GValueModel.java (modified) (8 diffs)
• valuetree/GValueNode.java (modified) (6 diffs)

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

@@ -41 +41 @@
     static final public String DOM_TO_TEXT = "DOM_TO_TEXT";
     static final public String GREENSTONE_TO_DOM = "GREENSTONE_TO_DOM";
+    static final public String GREENSTONE_TO_TEXT = "GREENSTONE_TO_TEXT";
     static final public String TEXT_TO_DOM = "TEXT_TO_DOM";
+    static final public String TEXT_TO_GREENSTONE = "TEXT_TO_GREENSTONE";
     static final public String TEXT_TO_SHELL_UNIX = "TEXT_TO_SHELL_UNIX";
     static final public String TEXT_TO_SHELL_WINDOWS = "TEXT_TO_SHELL_WINDOWS";
@@ -86 +88 @@
     greenstone_to_dom = null;
 
+    // Transform Greenstone encoded text to plain text
+    String[] greenstone_to_text = {
+        "\\\\\"", "\"",
+        "\\\\\'", "\'",
+        "\\\\n", "\n",
+        """, "\"",
+        "'", "\'",
+        "\\\\\\[", "\\[",
+        "\\\\\\]", "\\]",
+        "\\\\\\\\", "\\\\"
+    };
+    TRANSFORMS.put(GREENSTONE_TO_TEXT, greenstone_to_text);
+    greenstone_to_text = null;
+
     // Transform plain html text into something that can be placed in a DOM
     String[] text_to_dom = {
@@ -92 +108 @@
         ">", ">",
         "\"", """,
-        "\'", "'"};
+        "\'", "'"
+    };
     TRANSFORMS.put(TEXT_TO_DOM, text_to_dom);
     text_to_dom = null;
 
-// Transform plain html text into something that can be placed in a shell command
+    // Transform plain html text into greenstone encoding
+    String[] text_to_greenstone = {
+        "\\\\", "\\\\\\\\",
+        "\\[", "\\\\[",
+        "\\]", "\\\\]",
+        "\"", """,
+        "\'", "'",
+        "\n", "\\\\n"
+    };
+    TRANSFORMS.put(TEXT_TO_GREENSTONE, text_to_greenstone);
+    text_to_greenstone = null;
+
+    // Transform plain html text into something that can be placed in a shell command
     String[] text_to_shell_unix = {
         "\"", "\\\\\"",
@@ -225 +254 @@
         System.err.println("Processed: '" + processed + "'");
 
+        transform = "GREENSTONE_TO_TEXT";
+        System.err.println("Test " + transform);
+        raw = "These \\[ \\] should be escaped, and so should \\\\ that. These " ' \\n are encoded.";
+        System.err.println("Raw:       '" + raw + "'");
+        processed = transform(raw, transform);
+        System.err.println("Processed: '" + processed + "'");
+
         transform = "TEXT_TO_DOM";
         System.err.println("Test " + transform);
         raw = "A &lt;\nand a <a href=\"here.html\"><font size='2'>URL</font></a>";
+        System.err.println("Raw:       '" + raw + "'");
+        processed = transform(raw, transform);
+        System.err.println("Processed: '" + processed + "'");
+
+        transform = "TEXT_TO_GREENSTONE";
+        System.err.println("Test " + transform);
+        raw = "These [ ] should be escaped, and so should \\ that. These \" \' \n are encoded.";
         System.err.println("Raw:       '" + raw + "'");
         processed = transform(raw, transform);

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

@@ -7 +7 @@
  * University of Waikato, New Zealand.
  *
- * <BR><BR>
- *
  * Author: John Thompson, Greenstone Digital Library, University of Waikato
  *
- * <BR><BR>
- *
  * Copyright (C) 1999 New Zealand Digital Library Project
- *
- * <BR><BR>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22 +16 @@
  * (at your option) any later version.
  *
- * <BR><BR>
- *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * <BR><BR>
  *
  * You should have received a copy of the GNU General Public License
@@ -42 +32 @@
 import org.greenstone.gatherer.msm.MetadataSetManager;
 import org.greenstone.gatherer.msm.MSMUtils;
+import org.greenstone.gatherer.util.Codec;
+import org.greenstone.gatherer.util.PatternTokenizer;
 import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.SynchronizedTreeModelTools;
@@ -53 +45 @@
     extends DefaultTreeModel {
 
+    static final public String PATH_SEP = "\\\\";
+    static final public String PATH_SEP_PATTERN = "\\\\\\\\";
+
     private ElementWrapper element;
 
@@ -84 +79 @@
     public GValueNode addValue(String value) {
     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);
+        // Tokenize the string using the escaped character
+        PatternTokenizer tokenizer = new PatternTokenizer(value, PATH_SEP);
         GValueNode subject = (GValueNode) root;
         while(tokenizer.hasMoreTokens() && subject != null) {
@@ -101 +94 @@
     }
 
-    /** 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();
-    }
-
     public GValueNode addValue(String value, GValueNode subject, String alias) {
     // To add a value we must first ensure it isn't already present in -this- nodes children. The bummer is that the nice getElements functions search the whole tree so...
-    GValueNode value_node = subject.getValue(Utility.stripNL(value));
+    GValueNode value_node = subject.getValue(value);
     if(value_node == null) {
         // Now add the new value.
@@ -275 +247 @@
     }
 
-    /**
-    public void updateValue(String new_value, String old_value) {
-    ///ystem.err.println("Updating '" + old_value + "' to '" + new_value + "'"); 
-    StringTokenizer tokenizer = new StringTokenizer(new_value, "\\");
-    GValueNode subject = (GValueNode) root;
-    while(tokenizer.hasMoreTokens()) {
-        String token = tokenizer.nextToken();
-        subject = updateValue(token, old_value, subject);
-    }
-    }
-    */
-
     /** Called to update a certain value of metadata within a specific
      * subject within a sbject hierarchy. 
@@ -326 +286 @@
         }
         value = value.substring(next.toString().length());
-        if(value.startsWith(StaticStrings.ESCAPE_STR + StaticStrings.ESCAPE_STR)) {
+        if(value.startsWith(PATH_SEP)) {
             value = value.substring(2);
             index = getHIndex(next, value, index);

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

@@ -55 +55 @@
 import org.greenstone.gatherer.msm.ElementWrapper;
 import org.greenstone.gatherer.msm.MSMUtils;
+import org.greenstone.gatherer.util.Codec;
 import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
@@ -176 +177 @@
      * @return A <strong>String</strong> representing the path, ie "Titles\Modern\The Green Mile"
      */
-    public String getFullPath() {
+    public String getFullPath(boolean as_text) {
     if(default_value != null) {
         return default_value;
@@ -184 +185 @@
     while(node != null && !node.getElement().getNodeName().equalsIgnoreCase("AssignedValues")) {
         path.insert(0, StaticStrings.ESCAPE_STR + StaticStrings.ESCAPE_STR);
-        String temp = node.toString();
-        temp = temp.replaceAll(StaticStrings.LBRACKET_PATTERN, StaticStrings.ESCAPE_PATTERN + StaticStrings.LBRACKET_PATTERN);
-        temp = temp.replaceAll(StaticStrings.RBRACKET_PATTERN, StaticStrings.ESCAPE_PATTERN + StaticStrings.RBRACKET_PATTERN);
-        path.insert(0, temp);
+        path.insert(0, node.toString());
         node = (GValueNode) node.getParent();
     }
-    return path.toString();
+    if(as_text) {
+        return Codec.transform(path.toString(), Codec.GREENSTONE_TO_TEXT);
+    }
+    else {
+        return path.toString();
+    }
     }
 
@@ -226 +229 @@
         map();
     }
-    GValueNode result = null;
-    for(int i = 0; result == null && i < children.size(); i++) {
-        Object child = children.get(i);
-        if(child.toString().equalsIgnoreCase(value)) {
-        result = (GValueNode) child;
-        }
-    }
-    return result;
+    for(int i = 0; i < children.size(); i++) {
+        GValueNode child = (GValueNode) children.get(i);
+        if(child.toString(false).equalsIgnoreCase(value)) {
+        return child;
+        }
+    }
+    return null;
     }
 
@@ -320 +322 @@
      */
     public String toString() {
+    return toString(true);
+    }
+    
+    public String toString(boolean as_text) {
     if(default_value != null) {
         return default_value;
@@ -327 +333 @@
     String result = null;
     if(name.equals("Subject")) {
-        result = MSMUtils.getValue(element);
+        if(as_text) {
+        result = Codec.transform(MSMUtils.getValue(element), Codec.GREENSTONE_TO_TEXT);
+        }
+        else {
+        result = MSMUtils.getValue(element);
+        }
     }
     else if(name.equals("AssignedValues")) {
         result = getMetadataElementName();
     }
-    return Utility.stripNL(result);
+    return result;
     }