Changeset 5986

Timestamp:

2003-11-25T16:15:26+13:00 (20 years ago)

Author:

jmt12

Message:

Arguments in the dictionary can now be annotated with more meaningful names by adding '-name' such as in {0-Collection name}

File:

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

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

@@ -289 +289 @@
         int opening = initial.indexOf('{');
         int closing = initial.indexOf('}');
+        int comment_mark = initial.indexOf('-', opening); // May not exist
+        if(comment_mark > closing) { // May also be detecting a later comment
+            comment_mark = -1;
+        }
         complete = complete + initial.substring(0, opening);
         // Parse arg_num
-        String arg_str = initial.substring(opening + 1, closing);
+        String arg_str = null;
+        if(comment_mark != -1) {
+            arg_str = initial.substring(opening + 1, comment_mark);
+        }
+        else {
+            arg_str = initial.substring(opening + 1, closing);
+        }
         int arg_num = Integer.parseInt(arg_str);
         if(closing + 1 < initial.length()) {
@@ -318 +328 @@
     catch (Exception e) {
         System.err.println("Missing value for key: " + key);
+        Gatherer.printStackTrace(e);
         return key;
     }