Changeset 5153 for trunk/gli/src/org/greenstone/gatherer/util/Utility.java

Timestamp:

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

Author:

jmt12

Message:

Fix 203B143

File:

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

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

@@ -53 +53 @@
  */
 public class Utility {
+    static final public Dimension BUTTON_SIZE = new Dimension(160, 35);
+    static final public Dimension LABEL_SIZE = new Dimension(125, 35);
     /** The default size of a gatherer progress bar, in either the download view or the build view. */
     static final public Dimension PROGRESS_BAR_SIZE = new Dimension(580,65);
@@ -102 +104 @@
     static final public String GREENSTONEDIRECTORYMETADATA_TEMPLATE = "xml/metadata.xml";
     /** Definition of an important directory name, in this case the private web cache directory for the collection. */
-    static final public String GCACHE_DIR = "gcache" + File.separator;
+    static final public String GCACHE_DIR = "cache" + File.separator;
     static final public String GLI_ARCHIVE = "GLI.jar";
     /** Definition of an important directory name, in this case the location of help documentation. */
     static final public String HELP_DIR = BASE_DIR + "help" + File.separator;
     /** Definition of an important directory name, in this case the import directory for the collection. */
-    static final public String IMPORT_DIR = "gimport" + File.separator;
+    static final public String IMPORT_DIR = "import" + File.separator;
     /** Definition of an important directory name, in this case the index directory for the collection. */
     static final public String INDEX_DIR = "index" + File.separator;
@@ -117 +119 @@
     /** Definition of an important directory name, in this case the location of the default metadata sets. */
     static final public String METADATA_DIR = BASE_DIR + "metadata" + File.separator;
-    static final public String METADATA_EXTRACTED = "extracted.mds";
     /** The location the gatherer expects to find metadata set information. */
     static final public String METADATA_SET_TEMPLATE = "xml/template.mds";
@@ -123 +124 @@
     static final public String METADATA_XML = "metadata.xml";
     static final public String NAME_ELEMENT = "Name";
-    /** Definition of an important directory name, in this case the import directory for the collection. */
-    static final public String OLD_IMPORT_DIR = "import" + File.separator;
     /** The default name of the perl executable under unix. */
     static final public String PERL_EXECUTABLE_UNIX = "perl";
@@ -196 +195 @@
     return new TreePath(temp);
     }
-    /** Decodes a string of text so its safe to use in a Greenstone configuration file. Esentially replaces "\n" with a newline.
-     * @param raw The <strong>String</strong> before decoding, read from the configuration file..
-     * @return A <strong>String</strong> ready to be placed in a component.
-     */
-    static public String decodeGreenstone(String raw) {
-    raw = raw.replaceAll("&apos;", "\'");
-    raw = raw.replaceAll("&gt;", ">");
-    raw = raw.replaceAll("&lt;", "<");
-    raw = raw.replaceAll("&quot;", "\"");
-    raw = raw.replaceAll("&#39;", "\'");
-    raw = raw.replaceAll("\\\\n", "\n");
-    return raw;
-    }
     /** Takes a rfc2616 'safe' String and translates it back into its 'unsafe' form. Basically the native c wget decode_string() function, but without pointer stuff. If searches through the String looking for the pattern %xy where x and y are hexidecimal digits and where xy maps to a character.<BR> If x or y are not hexidecimal or % is followed by a \0 then the pattern is left as is.
      * @param encoded The url-safe <strong>String</strong> to be decoded.
@@ -263 +249 @@
      * @return A <strong>String</strong> which is safe to write to the configuration file.
      */
+    static final private char AMPERSTAMP_CHAR = '&';
+    static final private char ESCAPE_CHAR = '\\';
+    static final private char GREATER_THAN_CHAR = '>';
+    static final private char LESS_THAN_CHAR = '<';
+    static final private char NEWLINE_CHAR = '\n';
+    static final private char QUOTE_CHAR = '\'';
+    static final private char SPEECH_CHAR = '\"';
+    static final private String ENCODED_AMPERSTAMP_STR = "&amp;";
+    static final private String ENCODED_GREATER_THAN_STR = "&gt;";
+    static final private String ENCODED_LESS_THAN_STR = "&lt;";
+    static final private String ENCODED_SPEECH_STR = "&quot;";
+    static final private String ESCAPED_NEWLINE_STR = "\\n";
+
+    /** Decodes a string of text so its safe to use in a Greenstone configuration file. Esentially replaces "\n" with a newline.
+     * @param raw The <strong>String</strong> before decoding, read from the configuration file..
+     * @return A <strong>String</strong> ready to be placed in a component.
+     */
+    static public String decodeGreenstone(String raw) {
+    raw = raw.replaceAll("&apos;", "\'");
+    raw = raw.replaceAll("&gt;", ">");
+    raw = raw.replaceAll("&lt;", "<");
+    raw = raw.replaceAll("&quot;", "\"");
+    raw = raw.replaceAll("&#39;", "\'");
+    raw = raw.replaceAll("\\\\n", "\n");
+    return raw;
+    }
+
     static public String encodeGreenstone(String raw) {
-    raw = raw.replaceAll("<", "&lt;");
-    raw = raw.replaceAll(">", "&gt;");
-    return raw.replaceAll("\n", "\\\\n");
+    // Once again regex fails to provide the power necessary for me to change strings. What I need to do is replace "<" and ">" with "&lt;" and "&gt;", and replace "\<" and "\>" with "<" and ">".
+    StringBuffer processed = new StringBuffer();
+    int index = 0;
+    while(index < raw.length()) {
+        char c = raw.charAt(index);
+        switch(c) {
+        // Replace a normal new line character with "\n"
+            case NEWLINE_CHAR:
+            processed.append(ESCAPED_NEWLINE_STR);
+            break;
+        // Replace "\<" with "<", or with "\&lt;" if this is for XML. Similar requirements for "\>".
+            case ESCAPE_CHAR:
+            if(index + 1 < raw.length()) {
+            char d = raw.charAt(index + 1);
+            if(d == LESS_THAN_CHAR) {
+                processed.append(LESS_THAN_CHAR);
+                index++;
+                break;
+            }
+            else if(d == GREATER_THAN_CHAR) {
+                processed.append(GREATER_THAN_CHAR);
+                index++;
+                break;
+            }
+            }
+            // I have no idea how this would happen, but I better watch for it anyway
+            processed.append(c);
+            break;
+        // Replace "<" with "&lt;"
+            case LESS_THAN_CHAR:
+            processed.append(ENCODED_LESS_THAN_STR);
+            break;
+        // Replace ">" with "&gt;"
+            case GREATER_THAN_CHAR:
+            processed.append(ENCODED_GREATER_THAN_STR);
+            break;
+            default:
+            processed.append(c);
+        }
+        index++;
+    }
+    return processed.toString();
+    }
+    /** When retrieve text for, or from the collect.cfg file it may contain characters that can't go into a DOM such as "<" and ">". We also might already have encoded versions "&lt;" and "&gt;". Thus we must encode the former, and double encode the latter. */
+    static public String encodeXML(String raw) {
+    StringBuffer processed = new StringBuffer();
+    int index = 0;
+    while(index < raw.length()) {
+        char c = raw.charAt(index);
+        switch(c) {
+        case GREATER_THAN_CHAR:
+        processed.append(ENCODED_GREATER_THAN_STR);
+        break;
+        case LESS_THAN_CHAR:
+        processed.append(ENCODED_LESS_THAN_STR);
+        break;
+        case AMPERSTAMP_CHAR:
+        processed.append(ENCODED_AMPERSTAMP_STR);
+        break;
+        default:
+        processed.append(c);
+        }
+        index++;
+    }
+    return processed.toString();
     }