Changeset 333

Timestamp:

Apr 9, 2010, 11:02:10 AM (14 years ago)

Author:

tabma

Message:

• changed search for Stringlist items to case-insensitive (reading lowercase 'male' from Excel failed to match 'Male' in the Gender Stringlist)
• added trimming to the valueformatter in the importer service

Location:

trunk/grails-app

Files:

• domain/dbnp/studycapturing/TemplateEntity.groovy (modified) (2 diffs)
• services/dbnp/importer/ImporterService.groovy (modified) (2 diffs)

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

@@ -263 +263 @@
                 else {
                         // Find the target template field, if not found, throw an error
-                        TemplateField field = this.template.fields.find { it.name == fieldName}
+                        TemplateField field = this.template.fields.find { it.name == fieldName }
                         if (field == null) {
                                 throw new NoSuchFieldException("Field ${fieldName} not found in class properties or template fields")
@@ -271 +271 @@
                                 // Convenience setter for template string list fields: find TemplateFieldListItem by name
                                 if (field.type == TemplateFieldType.STRINGLIST && value.class == String) {
-                                        value = field.listEntries.find { it.name == value }
+                                        value = field.listEntries.find { it.name ==~ /(?i)($value)/ }
                                 }
 

trunk/grails-app/services/dbnp/importer/ImporterService.groovy

@@ -217 +217 @@
                                     break
                     case Subject :  print "Persisting Subject `" + entity.name + "`: "
+                                    println entity.dump()
                                     persistEntity(entity)                                   
                                     study.addToSubjects(entity)
@@ -305 +306 @@
     * @return object corresponding to the TemplateFieldType
     */
-    def formatValue(String value, TemplateFieldType type) {
+    def formatValue(String value, TemplateFieldType type) {     
         switch (type) {
-            case TemplateFieldType.STRING       :   return value
-            case TemplateFieldType.TEXT         :   return value
+            case TemplateFieldType.STRING       :   return value.trim()
+            case TemplateFieldType.TEXT         :   return value.trim()
             case TemplateFieldType.INTEGER      :   return Integer.valueOf(value.replaceAll("[^0-9]",""))
             case TemplateFieldType.FLOAT        :   return Float.valueOf(value.replace(",","."));
             case TemplateFieldType.DOUBLE       :   return Double.valueOf(value.replace(",","."));
-            case TemplateFieldType.STRINGLIST   :   return value
-            case TemplateFieldType.ONTOLOGYTERM :   return value
+            case TemplateFieldType.STRINGLIST   :   return value.trim()
+            case TemplateFieldType.ONTOLOGYTERM :   return value.trim()
             case TemplateFieldType.DATE         :   return value
             default                             :   return value