Changeset 725

Timestamp:

27-07-10 12:07:32 (4 years ago)

Author:

keesvb

Message:

enabled boolean field recognition of 'x', added SamplingEvent? field addition to ImporterService?

Location:

trunk/grails-app

Files:

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

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

@@ -420 +420 @@
                 // Convenience setter for boolean fields
                 if( field.type == TemplateFieldType.BOOLEAN && value && value.class == String ) {
-                        if (value.equals("true") || value.equals("on")) {
+                        def lower = value.toLowerCase()
+                        if (lower.equals("true") || lower.equals("on") || lower.equals("x")) {
                                 value = true
                         }
-                        else if (value.equals("false") || value.equals("off")) {
+                        else if (lower.equals("false") || lower.equals("off") || lower.equals("")) {
                                 value = false
                         }

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

@@ -29 +29 @@
 
 import dbnp.data.Term
+import dbnp.studycapturing.SamplingEvent
 
 class ImporterService {
@@ -303 +304 @@
     }
 
-    /**
-     * This method creates a record (array) containing entities with values
-     *
-     * @param template_id template identifier
-     * @param excelrow POI based Excel row containing the cells
-     * @param mcmap map containing MappingColumn objects
-     */
-    def createRecord(template_id, HSSFRow excelrow, mcmap) {
-        def df = new DataFormatter()
-        def template = Template.get(template_id)
-        def record = [] 
-        
-        def study = new Study(template:template)
-        def subject = new Subject(template:template)
-        def event = new Event(template:template)
-        def sample = new Sample(template:template)
-
-        for (HSSFCell cell: excelrow) {     
-            def mc = mcmap[cell.getColumnIndex()]
-            def value
-
-            // Check if column must be imported
-            if (!mc.dontimport) {
-                try {
-                    value = formatValue(df.formatCellValue(cell), mc.templatefieldtype)
-                } catch (NumberFormatException nfe) {
-                 value = ""
-                }
-
-            switch(mc.entity) {
-                case Study      :   (record.any {it.getClass()==mc.entity}) ? 0 : record.add(study)                                 
-                                    study.setFieldValue(mc.property, value)
-                                    break
-                case Subject    :   (record.any {it.getClass()==mc.entity}) ? 0 : record.add(subject)
-                                    subject.setFieldValue(mc.property, value)                               
-                                    break
-                case Event      :   (record.any {it.getClass()==mc.entity}) ? 0 : record.add(event)                                 
-                                    event.setFieldValue(mc.property, value)
-                                    break
-                case Sample     :   (record.any {it.getClass()==mc.entity}) ? 0 : record.add(sample)                                
-                                    sample.setFieldValue(mc.property, value)
-                                    break
-                case Object     :   // don't import
-                                    break
-            } // end switch
-        } // end 
-    } // end for
+        /**
+         * This method creates a record (array) containing entities with values
+         *
+         * @param template_id template identifier
+         * @param excelrow POI based Excel row containing the cells
+         * @param mcmap map containing MappingColumn objects
+         */
+        def createRecord(template_id, HSSFRow excelrow, mcmap) {
+                def df = new DataFormatter()
+                def template = Template.get(template_id)
+                def record = []
+
+                def study = new Study(template: template)
+                def subject = new Subject(template: template)
+                def samplingEvent = new SamplingEvent(template: template)
+                def event = new Event(template: template)
+                def sample = new Sample(template: template)
+
+                for (HSSFCell cell: excelrow) {
+                        def mc = mcmap[cell.getColumnIndex()]
+                        def value
+
+                        // Check if column must be imported
+                        if (!mc.dontimport) {
+                                try {
+                                        value = formatValue(df.formatCellValue(cell), mc.templatefieldtype)
+                                } catch (NumberFormatException nfe) {
+                                        value = ""
+                                }
+
+                                switch (mc.entity) {
+                                        case Study: (record.any {it.getClass() == mc.entity}) ? 0 : record.add(study)
+                                                study.setFieldValue(mc.property, value)
+                                                break
+                                        case Subject: (record.any {it.getClass() == mc.entity}) ? 0 : record.add(subject)
+                                                subject.setFieldValue(mc.property, value)
+                                                break
+                                        case SamplingEvent: (record.any {it.getClass() == mc.entity}) ? 0 : record.add(samplingEvent)
+                                                samplingEvent.setFieldValue(mc.property, value)
+                                                break
+                                        case Event: (record.any {it.getClass() == mc.entity}) ? 0 : record.add(event)
+                                                event.setFieldValue(mc.property, value)
+                                                break
+                                        case Sample: (record.any {it.getClass() == mc.entity}) ? 0 : record.add(sample)
+                                                sample.setFieldValue(mc.property, value)
+                                                break
+                                        case Object:   // don't import
+                                                break
+                                } // end switch
+                        } // end
+                } // end for
 
         return record