Changeset 18405 for greenstone3

Timestamp:

2009-01-19T15:15:38+13:00 (15 years ago)

Author:

kjdon

Message:

modifications to make this in line with gs2 version. Allows comments in arg indicators in dictionary text (eg {0-collection name}). The - needs to come immediately after the number

File:

• greenstone3/trunk/src/java/org/greenstone/gsdl3/util/Dictionary.java (modified) (3 diffs)

greenstone3/trunk/src/java/org/greenstone/gsdl3/util/Dictionary.java

@@ -118 +118 @@
         // convert to unicode, copied from gatherer dictionary
         String initial = new String(initial_raw.getBytes("ISO-8859-1"), "UTF-8");
+
+        // Remove any comments from the string
+        if (initial.indexOf("#") != -1) {
+        initial = initial.substring(0, initial.indexOf("#"));
+        }
         // If the string contains arguments we have to insert them.
-        String complete = "";
+        StringBuffer complete = new StringBuffer();
         // While we still have initial string left.
         while(initial.length() > 0 && initial.indexOf('{') != -1 && initial.indexOf('}') != -1) {
@@ -125 +130 @@
         int opening = initial.indexOf('{');
         int closing = initial.indexOf('}');
-        complete = complete + initial.substring(0, opening);
+        int comment_mark = initial.indexOf('-', opening); // May not exist
+        if (comment_mark > closing) { // May also be detecting a later comment
+            comment_mark = -1;
+        }
+        complete.append(initial.substring(0, opening));
+        
         // Parse arg_num
-        String arg_str = initial.substring(opening + 1, closing);
-        int arg_num = Integer.parseInt(arg_str);
+        String arg_str = null;
+        if (comment_mark != -1) {
+          arg_str = initial.substring(opening + 1, comment_mark);
+        } else {
+          arg_str = initial.substring(opening + 1, closing);
+        }
         if(closing + 1 < initial.length()) {
             initial = initial.substring(closing + 1);
@@ -135 +149 @@
             initial = "";
         }
+        int arg_num = Integer.parseInt(arg_str);
         // Insert argument
         if(args != null && 0 <= arg_num && arg_num < args.length) {
-            complete = complete + args[arg_num];
+          complete.append(args[arg_num]);
         }
         }
-        return complete + initial;
+        complete.append(initial);
+        return complete.toString();
     }
     catch (Exception e) {