Changeset 5670 for trunk

Timestamp:

2003-10-17T04:47:32+13:00 (21 years ago)

Author:

jmt12

Message:

Added a new transform to replace square brackets with the appropriate Unicode

File:

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

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

@@ -38 +38 @@
 public class Codec {
     
-    static final public String DOM_TO_GREENSTONE = "DOM_TO_GREENSTONE";
-    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";
+   static final public String DOM_TO_GREENSTONE = "DOM_TO_GREENSTONE";
+   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 REMOVE_SQUARE_BRACKET = "REMOVE_SQUARE_BRACKET";
+   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";
 
     static final private int MAX_CACHE_SIZE = 100;
@@ -71 +72 @@
     // Transform DOM encoded text into plain text
     String[] dom_to_text = {
-        "'", "\'",
-        ">", ">",
-        "&lt;", "<",
-        "&quot;", "\"",
-        "&amp;", "&"
+       "&amp;#091;", "\\[",
+       "&amp;#093;", "\\]",
+       "&apos;", "\'",
+       "&gt;", ">",
+       "&lt;", "<",
+       "&quot;", "\"",
+       "&amp;", "&"
     };
     TRANSFORMS.put(DOM_TO_TEXT, dom_to_text);
@@ -99 +102 @@
         "&quot;", "\"",
         "&apos;", "\'",
-        "\\\\\\[", "\\[",
-        "\\\\\\]", "\\]",
+        "&#091;", "\\[",
+        "&#093;", "\\]",
         "\\\\\\\\", "\\\\"
     };
@@ -106 +109 @@
     greenstone_to_text = null;
 
+    // Transform text into text, but without [ and ]
+    String[] remove_square_bracket = {
+        "\\[", "&amp;#091;",
+        "\\]", "&amp;#093;"
+    };
+    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 = {
@@ -120 +131 @@
     String[] text_to_greenstone = {
         "\\\\", "\\\\\\\\",
-        "\\[", "\\\\[",
-        "\\]", "\\\\]",
+        "\\[", "&#091;",
+        "\\]", "&#093;",
         "\"", "&quot;",
         "\'", "&apos;",
@@ -162 +173 @@
         }
         }
-        //Gatherer.println("*** Transform: " + transform + " ***");
-        //Gatherer.println("*** Raw      : '" + raw + "'");
-        //Gatherer.println("*** Processed: '" + processed + "'");
+        Gatherer.println("*** Transform: " + transform + " ***");
+        Gatherer.println("*** Raw      : '" + raw + "'");
+        Gatherer.println("*** Processed: '" + processed + "'");
         // If cache is at maximum size, empty it and start again
         if(CACHE.size() == MAX_CACHE_SIZE) {
@@ -235 +246 @@
         index++;
     }
-    
     return processed.toString();
     }