Changeset 10668

Timestamp:

2005-09-30T10:52:55+12:00 (19 years ago)

Author:

mdewsnip

Message:

Added code to remove comments from the text strings -- this is needed when the GTI is used, as it adds "# Updated XX-XX-XXXX" to the end of strings to keep track of when they were last updated.

File:

• trunk/gli/src/org/greenstone/gatherer/Dictionary.java (modified) (3 diffs)

trunk/gli/src/org/greenstone/gatherer/Dictionary.java

@@ -132 +132 @@
         initial = new String(initial_raw.getBytes("ISO-8859-1"), "UTF-8");
         }
-        catch (Exception ex) {
-        System.err.println("Exception: " + ex);
-        ex.printStackTrace();
+        catch (Exception exception) {
+        DebugStream.printStackTrace(exception);
         return initial_raw;
+        }
+
+        // Remove any comments from the string
+        if (initial.indexOf("#") != -1) {
+        initial = initial.substring(0, initial.indexOf("#"));
         }
 
@@ -142 +146 @@
 
         // While we still have initial string left.
-        while(initial.length() > 0 && initial.indexOf('{') != -1 && initial.indexOf('}') != -1) {
+        while (initial.length() > 0 && initial.indexOf('{') != -1 && initial.indexOf('}') != -1) {
         // Remove preamble
         int opening = initial.indexOf('{');
@@ -183 +187 @@
         return complete;
     }
-    catch (Exception e) {
+    catch (Exception exception) {
         System.err.println("Missing value for key: " + key);
         // DebugStream.printStackTrace(e);