Changeset 5230

Timestamp:

2003-08-21T11:03:59+12:00 (21 years ago)

Author:

jmt12

Message:

Changed QUOTE_CHARACTER to SPEECH_CHARACTER

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/Argument.java (modified) (1 diff)
• cdm/CollectionConfiguration.java (modified) (11 diffs)
• util/AppendLineOnlyFileDocument.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/cdm/Argument.java

@@ -408 +408 @@
         // If the value contains a space, add speech marks
         if(value.indexOf(StaticStrings.SPACE_CHARACTER) != -1) {
-            value = StaticStrings.QUOTE_CHARACTER + value + StaticStrings.QUOTE_CHARACTER;
+            value = StaticStrings.SPEECH_CHARACTER + value + StaticStrings.SPEECH_CHARACTER;
         }
         // Tokenize the string

trunk/gli/src/org/greenstone/gatherer/cdm/CollectionConfiguration.java

@@ -522 +522 @@
             }
             else {
-            text.append(QUOTE_CHARACTER);
+            text.append(SPEECH_CHARACTER);
             text.append(value_str);
-            text.append(QUOTE_CHARACTER);
+            text.append(SPEECH_CHARACTER);
             }
         }
@@ -553 +553 @@
         value_str.replaceAll(EXTRACTED_PREFIX, "");
         }
-        text.append(QUOTE_CHARACTER);
+        text.append(SPEECH_CHARACTER);
         text.append(value_str);
-        text.append(QUOTE_CHARACTER);
+        text.append(SPEECH_CHARACTER);
     }
     value_str = null;
@@ -771 +771 @@
         }
         else {
-        text.append(QUOTE_CHARACTER);
+        text.append(SPEECH_CHARACTER);
         text.append(value_str);
-        text.append(QUOTE_CHARACTER);
+        text.append(SPEECH_CHARACTER);
         }
         value_str = null;
@@ -911 +911 @@
             if(value != null) {
             // Remove any speech marks appended in strings containing whitespace
-            if(value.startsWith(QUOTE_CHARACTER) && value.endsWith(QUOTE_CHARACTER)) {
+            if(value.startsWith(SPEECH_CHARACTER) && value.endsWith(SPEECH_CHARACTER)) {
                 value = value.substring(1, value.length() - 1);
             }
@@ -958 +958 @@
         else {
             // Strip any speech marks
-            if(format_value.startsWith(QUOTE_CHARACTER) && format_value.endsWith(QUOTE_CHARACTER)) {
+            if(format_value.startsWith(SPEECH_CHARACTER) && format_value.endsWith(SPEECH_CHARACTER)) {
             format_value = format_value.substring(1, format_value.length() - 1);
             }
@@ -1135 +1135 @@
         }
         // Remove any speech marks from value
-        if(value_str.startsWith(QUOTE_CHARACTER) && value_str.endsWith(QUOTE_CHARACTER)) {
+        if(value_str.startsWith(SPEECH_CHARACTER) && value_str.endsWith(SPEECH_CHARACTER)) {
             value_str = value_str.substring(1, value_str.length() - 1);
         }
@@ -1180 +1180 @@
             command_element.setAttribute(LANGUAGE_ATTRIBUTE, ENGLISH_LANGUAGE_STR);
             command_element.setAttribute(SPECIAL_ATTRIBUTE, TRUE_STR);
-            if(value_str.startsWith(QUOTE_CHARACTER) && value_str.endsWith(QUOTE_CHARACTER)) {
+            if(value_str.startsWith(SPEECH_CHARACTER) && value_str.endsWith(SPEECH_CHARACTER)) {
             value_str = value_str.substring(1, value_str.length() - 1);
             }
@@ -1224 +1224 @@
             if(value != null) {
             // Remove any speech marks appended in strings containing whitespace
-            if(value.startsWith(QUOTE_CHARACTER) && value.endsWith(QUOTE_CHARACTER)) {
+            if(value.startsWith(SPEECH_CHARACTER) && value.endsWith(SPEECH_CHARACTER)) {
                 value = value.substring(1, value.length() - 1);
             }
@@ -1432 +1432 @@
                 }
                 else {
-                text.append(QUOTE_CHARACTER);
+                text.append(SPEECH_CHARACTER);
                 text.append(value_str);
-                text.append(QUOTE_CHARACTER);
+                text.append(SPEECH_CHARACTER);
                 }
             }
@@ -1474 +1474 @@
     text.append(SPACE_CHARACTER);
     text.append(TAB_CHARACTER);
-    text.append(QUOTE_CHARACTER);
+    text.append(SPEECH_CHARACTER);
     if(command_element.getAttribute(TYPE_ATTRIBUTE).equals(EXCLUDE_STR)) {
         text.append(EXCLAIMATION_CHARACTER);
@@ -1492 +1492 @@
     }
     options_str = null;
-    text.append(QUOTE_CHARACTER);
+    text.append(SPEECH_CHARACTER);
     return text.toString();
     }

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

@@ -47 +47 @@
         int character = -1;
         while((character = file.read()) != -1) {
-        if(character == StaticStrings.NEW_LINE_CHARACTER) {
+        if(character == StaticStrings.NEW_LINE_CHAR) {
             long end_offset = file.getFilePointer();
             Element child_element = new AppendLineOnlyFileDocumentElement(start_offset, end_offset);