Changeset 8056

Timestamp:

2004-08-25T16:17:57+12:00 (20 years ago)

Author:

mdewsnip

Message:

Fixed a bug where the subcollection regular expression was parsed incorrectly and would slowly get eaten away... character by character...

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/CollectionConfiguration.java (modified) (1 diff)

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

@@ -1540 +1540 @@
         // Then finally the pattern used to build the subcollection partition
         String full_pattern_str = tokenizer.nextToken();
-        // To make life easier I'm going to parse this up now.
-        boolean exclusion = (full_pattern_str.substring(1, 2).equals(EXCLAMATION_CHARACTER));
-        // Set inclusion/exclusion flag, remove any exclaimation mark and the speech marks
-        if(exclusion) {
-            full_pattern_str = full_pattern_str.substring(2, full_pattern_str.length() - 1);
+        // Set inclusion/exclusion flag and remove any exclamation mark
+        boolean exclusion = full_pattern_str.startsWith(EXCLAMATION_CHARACTER);
+        if (exclusion) {
+            full_pattern_str = full_pattern_str.substring(1, full_pattern_str.length());
             command_element.setAttribute(TYPE_ATTRIBUTE, EXCLUDE_STR);
         }
         else {
-            full_pattern_str = full_pattern_str.substring(1, full_pattern_str.length() - 1);
             command_element.setAttribute(TYPE_ATTRIBUTE, INCLUDE_STR);
         }