Changeset 5805 for trunk/gli/src/org/greenstone/gatherer/util

Timestamp:

2003-11-07T13:20:43+13:00 (21 years ago)

Author:

jmt12

Message:

Several changes needed to make pipe the hierarchy separator while keeping backslash as what the user sees

Location:

trunk/gli/src/org/greenstone/gatherer/util

Files:

• Codec.java (modified) (9 diffs)
• MetadataXML.java (modified) (2 diffs)
• StaticStrings.java (modified) (1 diff)

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

@@ -37 +37 @@
  */
 public class Codec {
-    
+
    static final public String DOM_TO_GREENSTONE = "DOM_TO_GREENSTONE";
    static final public String DOM_TO_TEXT = "DOM_TO_TEXT";
@@ -49 +49 @@
 
     static final private int MAX_CACHE_SIZE = 100;
-    
+
     static private HashMap TRANSFORMS;
     static private HashMap3D CACHE;
 
-    
+
     /** Static function called to construct TRANSFORMS mappings */
     static {
     TRANSFORMS = new HashMap();
-    
+
     // Translate DOM encoded text into Greenstone encoding
     String[] dom_to_greenstone = {
@@ -69 +69 @@
     TRANSFORMS.put(DOM_TO_GREENSTONE, dom_to_greenstone);
     dom_to_greenstone = null;
-    
+
     // Transform DOM encoded text into plain text
     String[] dom_to_text = {
@@ -78 +78 @@
        "&lt;", "<",
        "&quot;", "\"",
-       "&amp;", "&"
+       "&amp;", "&",
+       "\\|", "\\\\"
     };
     TRANSFORMS.put(DOM_TO_TEXT, dom_to_text);
@@ -104 +105 @@
         "&#091;", "\\[",
         "&#093;", "\\]",
-        "\\\\\\\\", "\\\\"
+        "\\|", "\\\\"
     };
     TRANSFORMS.put(GREENSTONE_TO_TEXT, greenstone_to_text);
@@ -116 +117 @@
     TRANSFORMS.put(REMOVE_SQUARE_BRACKET, remove_square_bracket);
     remove_square_bracket = null;
-    
+
     // Transform plain html text into something that can be placed in a DOM
     String[] text_to_dom = {
@@ -123 +124 @@
         ">", "&gt;",
         "\"", "&quot;",
-        "\'", "&apos;"
+        "\'", "&apos;",
+        "\\\\", "\\|",
     };
     TRANSFORMS.put(TEXT_TO_DOM, text_to_dom);
@@ -130 +132 @@
     // Transform plain html text into greenstone encoding
     String[] text_to_greenstone = {
-        "\\\\", "\\\\\\\\",
+        "\\\\", "\\|",
         "\\[", "&#091;",
         "\\]", "&#093;",
@@ -192 +194 @@
     static final private char UPPER_U_CHAR = 'U';
     static final private char SEMICOLON_CHAR = ';';
- 
+
     static public String transformUnicode(String raw) {
     StringBuffer processed = new StringBuffer();

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

@@ -32 +32 @@
 import org.greenstone.gatherer.msm.ElementWrapper;
 import org.greenstone.gatherer.msm.MetadataSetManager;
+import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
 import org.greenstone.gatherer.valuetree.GValueModel;
@@ -55 +56 @@
         GValueNode node = (GValueNode)all_values.get(i);
         TreePath path = new TreePath(node.getPath());
-        String value = node.getFullPath(false);
-        String index = model.getHIndex(value);
-        String alias = node.getAlias(index);
-        if(value.indexOf(GValueModel.PATH_SEP) != -1) {
-            value = value.substring(value.lastIndexOf(GValueModel.PATH_SEP) + GValueModel.PATH_SEP.length());
-        }
-        write(bw, "\"" + Utility.stripNL(value) + "\"\t" + index + "\t\"" + Utility.stripNL(value) + "\"");
+        String full_value = node.getFullPath(true);
+        String index = model.getHIndex(full_value);
+
+        write(bw, "\"" + Utility.stripNL(full_value) + "\"\t" + index + "\t\"" + Utility.stripNL(full_value) + "\"");
         }
-        // Very important we do this, or else buffer may not have 
+        // Very important we do this, or else buffer may not have
         // flushed.
         bw.flush();

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

@@ -128 +128 @@
     static final public String OPTIONS_ATTRIBUTE                          = "options";
     static final public String PERL_ARGUMENT                              = "-perl";
+    static final public String PIPE_STR                                   = "|";
     static final public String PLUGIN_ELEMENT                             = "Plugin";
     static final public String PLUGIN_STR                                 = "plugin";