Changeset 5835 for trunk/gli

Timestamp:

2003-11-13T14:21:34+13:00 (21 years ago)

Author:

kjdon

Message:

changed a few of the Codec transforms, to do with allowing new lines in config files, and not putting | instead of \ in config files. hope it hasn't stuffed anything else up....

File:

• trunk/gli/src/org/greenstone/gatherer/util/Codec.java (modified) (6 diffs)

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

@@ -64 +64 @@
         "&lt;", "<",
         "&quot;", "\\\\\"",
-        "\n", "\\\\n",
-        "&amp;", "&"
-    };
+        "&amp;", "&",
+        "\\|", "\\\\"
+    };
+    //  removed "\n", "\\\\n", - config files are allowed new lines
+    // added "\\|", "\\\\"
+
     TRANSFORMS.put(DOM_TO_GREENSTONE, dom_to_greenstone);
     dom_to_greenstone = null;
@@ -91 +94 @@
         "\\\\\"", "&quot;",
         "\\\\\'", "&apos;",
-        "\\\\n", "\n"
-    };
+        "\\\\", "\\|"
+    };
+    // removed"\\\\n", "\n", added "\\\\", "\\|"
+
     TRANSFORMS.put(GREENSTONE_TO_DOM, greenstone_to_dom);
     greenstone_to_dom = null;
@@ -100 +105 @@
         "\\\\\"", "\"",
         "\\\\\'", "\'",
-        "\\\\n", "\n",
         "&quot;", "\"",
         "&apos;", "\'",
         "&#091;", "\\[",
-        "&#093;", "\\]",
-        "\\|", "\\\\"
-    };
+        "&#093;", "\\]"
+        
+    };
+    // removed    "\\\\n", "\n", "\\|", "\\\\"
+
     TRANSFORMS.put(GREENSTONE_TO_TEXT, greenstone_to_text);
     greenstone_to_text = null;
@@ -132 +138 @@
     // Transform plain html text into greenstone encoding
     String[] text_to_greenstone = {
-        "\\\\", "\\|",
+        
         "\\[", "&#091;",
         "\\]", "&#093;",
@@ -139 +145 @@
         "\n", "\\\\n"
     };
+    // removed "\\\\", "\\|",
     TRANSFORMS.put(TEXT_TO_GREENSTONE, text_to_greenstone);
     text_to_greenstone = null;
@@ -164 +171 @@
 
     static public String transform(String raw, String transform) {
+    ///ystem.err.println("transforming "+transform);
     String processed = (String) CACHE.get(transform, raw);
     if(processed == null) {