Changeset 17616 for gli/trunk/src/org/greenstone/gatherer/cdm/CollectionConfiguration.java

Timestamp:

2008-10-28T16:41:47+13:00 (16 years ago)

Author:

mdewsnip

Message:

Fix to bug where some "subcollection" entries in the collect.cfg file are mangled if they have empty bits. Many thanks to Jeffrey Ke from DL Consulting Ltd.

File:

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

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

@@ -1428 +1428 @@
                     command_element.setAttribute (StaticStrings.TYPE_ATTRIBUTE, StaticStrings.INCLUDE_STR);
                 }
-                StringTokenizer pattern_tokenizer = new StringTokenizer (full_pattern_str, StaticStrings.SEPARATOR_CHARACTER);
-                if(pattern_tokenizer.countTokens () >= 2) {
-                    String content_str = pattern_tokenizer.nextToken ();
+
+                // Let's make sure it is a valid Greenstone configuration line
+                String[] results = full_pattern_str.split("\\" + StaticStrings.SEPARATOR_CHARACTER, 3);
+
+                if (results.length >= 2) {
+                    String content_str = results[0];
                     // Since the contents of indexes have to be certain keywords, or metadata elements, if the content isn't a keyword and doesn't yet have a namespace, append the extracted metadata namespace.
-                    if(!content_str.equals (StaticStrings.FILENAME_STR) && content_str.indexOf (StaticStrings.NS_SEP) == -1) {
+                    if (!content_str.equals (StaticStrings.FILENAME_STR) && content_str.indexOf (StaticStrings.NS_SEP) == -1) {
                         content_str = StaticStrings.EXTRACTED_NAMESPACE + content_str;
                     }
                     command_element.setAttribute (StaticStrings.CONTENT_ATTRIBUTE, content_str);
-                    XMLTools.setValue (command_element, pattern_tokenizer.nextToken ());
-                    if(pattern_tokenizer.hasMoreTokens ()) {
-                        command_element.setAttribute (StaticStrings.OPTIONS_ATTRIBUTE, pattern_tokenizer.nextToken ());
-                    }
-                }
-                pattern_tokenizer = null;
+                    XMLTools.setValue (command_element, results[1]);
+                    if (results.length >= 3) {
+                        command_element.setAttribute (StaticStrings.OPTIONS_ATTRIBUTE, results[2]);
+                    }
+                }
             }
         }