Changeset 409 for trunk/grails-app

Timestamp:

May 11, 2010, 4:47:22 PM (12 years ago)

Author:

keesvb

Message:

OK, that refactoring was too enthusiastic, switching back getField() to pure TemplateField? collections fixes the strange TemplateFieldListItem?.id bugs

File:

• trunk/grails-app/domain/dbnp/studycapturing/TemplateEntity.groovy (modified) (3 diffs)

trunk/grails-app/domain/dbnp/studycapturing/TemplateEntity.groovy

@@ -258 +258 @@
          * @throws NoSuchFieldException If the field is not found or the field type is not supported
          */
-        private static def getField(Collection fieldsCollection, String fieldName) {
+        private static TemplateField getField(List<TemplateField> fieldsCollection, String fieldName) {
                 // escape the fieldName for easy matching
                 // (such escaped names are commonly used
@@ -265 +265 @@
 
                 // Find the target template field, if not found, throw an error
-                def field = fieldsCollection.find { it.name.toLowerCase().replaceAll("([^a-z0-9])", "_") == escapedLowerCaseFieldName }
+                TemplateField field = fieldsCollection.find { it.name.toLowerCase().replaceAll("([^a-z0-9])", "_") == escapedLowerCaseFieldName }
 
                 if (field) {
@@ -325 +325 @@
                 // Convenience setter for template string list fields: find TemplateFieldListItem by name
                 if (field.type == TemplateFieldType.STRINGLIST && value && value.class == String) {
-                        value = getField(field.listEntries,value).name
-                        println value
+                        // Kees insensitive pattern matching ;)
+                        def escapedLowerCaseValue = value.toLowerCase().replaceAll("([^a-z0-9])", "_")
+                        value = field.listEntries.find {
+                                it.name.toLowerCase().replaceAll("([^a-z0-9])", "_") == escapedLowerCaseValue
+                        }
                 }