Changeset 534

Timestamp:

Jun 4, 2010, 4:00:31 PM (13 years ago)

Author:

tabma

Message:

• rewrote MappingColumn? (and underlying methods) to have a String property instead of TemplateField?
• improved Excel-column detection to importer service

Location:

trunk/grails-app

Files:

• controllers/dbnp/importer/ImporterController.groovy (modified) (3 diffs)
• domain/dbnp/importer/MappingColumn.groovy (modified) (2 diffs)
• services/dbnp/importer/ImporterService.groovy (modified) (4 diffs)
• taglib/dbnp/importer/ImporterTagLib.groovy (modified) (2 diffs)
• views/importer/index_simple.gsp (modified) (1 diff)

trunk/grails-app/controllers/dbnp/importer/ImporterController.groovy

@@ -60 +60 @@
         
         session.importer_header = ImporterService.getHeader(wb, 0)
+        session.importer_study = Study.get(params.study.id.toInteger())
         session.importer_template_id = params.template_id
-        session.importer_study = Study.get(params.study.id.toInteger())
         session.importer_workbook = wb
 
@@ -81 +81 @@
 
         session.importer_header = ImporterService.getHeader(wb, 0, entityClass)
+        session.importer_study = Study.get(params.study.id.toInteger())
         session.importer_template_id = params.template_id
         session.importer_workbook = wb
@@ -193 +194 @@
 
     /**
-    * @param columnproperty array of columns containing index and property_id
+    * @param columnproperty array of columns containing index and property (represented as a String)
     *
     */
     def saveproperties = {      
 
-        params.columnproperty.index.each { columnindex, property_id ->
-                session.importer_header[columnindex.toInteger()].property = TemplateField.get(property_id.toInteger())
+        params.columnproperty.index.each { columnindex, property ->
+                def template = Template.get(session.imported_template_id)
+
+                def entityClass = Class.forName(session.importer_header[columnindex.toInteger()].entity.getName(), true, this.getClass().getClassLoader())
+                def entityObj = entityClass.newInstance(template:template)              
+
+                
+                session.importer_header[columnindex.toInteger()].property = property
+                
+                //if it's an identifier set the mapping column true or false            
+                entityObj.giveFields().each {
+                    (it.preferredIdentifier && (it.name==property)) ? session.importer_header[columnindex.toInteger()].identifier = true : false
+                }
         }
 

trunk/grails-app/domain/dbnp/importer/MappingColumn.groovy

@@ -3 +3 @@
 
 /**
-* name: column name
-* type: GCSF field type
+* name: column name (in Excel)
+* templatefieldtype: GSCF field type
 * entity: GSCF entity class
 * property: GSCF template field
@@ -16 +16 @@
         dbnp.studycapturing.TemplateFieldType templatefieldtype
         Class entity
-        TemplateField property
+        String property
         Integer index
         String value

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

@@ -56 +56 @@
         def header = [:]
         def df = new DataFormatter()
-        def property = new dbnp.studycapturing.TemplateField()
+        def property = new String()
 
         for (HSSFCell c: sheet.getRow(datamatrix_start)) {
@@ -68 +68 @@
             switch (datamatrix_celltype) {
                     case HSSFCell.CELL_TYPE_STRING:
+                            //parse cell value as double
+                            def parsable = true
+                            def templatefieldtype = TemplateFieldType.STRING
+
+                            // is this string perhaps a double?
+                            try {
+                                formatValue(c.getStringCellValue(), TemplateFieldType.DOUBLE)
+                            } catch (NumberFormatException nfe) { parsable = false }
+                            finally {
+                                if (parsable) templatefieldtype = TemplateFieldType.DOUBLE
+                            }
+
                             header[index] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell),
-                                                                            templatefieldtype:TemplateFieldType.STRING,
+                                                                            templatefieldtype:templatefieldtype,
                                                                             index:index,
                                                                             entity:theEntity,
@@ -290 +302 @@
 
             switch(mc.entity) {
-                case Study      :   (record.any {it.getClass()==mc.entity}) ? 0 : record.add(study)
-                                    if (mc.identifier) { study.title = value; break }
-                                    study.setFieldValue(mc.property.name, value)
-                                    break
-                case Subject    :   (record.any {it.getClass()==mc.entity}) ? 0 : record.add(subject)
-                                    if (mc.identifier) { subject.name = value; break }
-                                    subject.setFieldValue(mc.property.name, value)                                  
-                                    break
-                case Event      :   (record.any {it.getClass()==mc.entity}) ? 0 : record.add(event)
-                                    if (mc.identifier) { event.eventdescription = value; break }
-                                    event.setFieldValue(mc.property.name, value)
-                                    break
-                case Sample     :   (record.any {it.getClass()==mc.entity}) ? 0 : record.add(sample)
-                                    if (mc.identifier) { sample.name = value; break }
-                                    sample.setFieldValue(mc.property.name, value)
+                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
@@ -319 +327 @@
     * @return object corresponding to the TemplateFieldType
     */
-    def formatValue(String value, TemplateFieldType type) {     
-        switch (type) {
-            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.trim()
-            case TemplateFieldType.ONTOLOGYTERM :   return value.trim()
-            case TemplateFieldType.DATE         :   return value
-            default                             :   return value
-        }
+    def formatValue(String value, TemplateFieldType type) throws NumberFormatException {
+            switch (type) {
+                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.trim()
+                case TemplateFieldType.ONTOLOGYTERM :   return value.trim()
+                case TemplateFieldType.DATE         :   return value
+                default                             :   return value
+            }
     }
 }

trunk/grails-app/taglib/dbnp/importer/ImporterTagLib.groovy

@@ -84 +84 @@
         def allfieldtypes = attrs['allfieldtypes']
 
-        def templatefields = (allfieldtypes=="true") ? t.fields : t.fields.findAll { it.type == mc.templatefieldtype }
+        //def templatefields = (allfieldtypes=="true") ? t.fields : t.fields.findAll { it.type == mc.templatefieldtype }
+        def templatefields = (allfieldtypes=="true") ? 
+            t.fields + mc.entity.giveDomainFields() :
+            t.fields.findAll { it.type == mc.templatefieldtype } + mc.entity.giveDomainFields()
 
         (mc.identifier) ? out << "<select style=\"font-size:10px\" name=\"\" disabled><option>Identifier</option></select>":
@@ -102 +105 @@
         def res = "<select style=\"font-size:10px\" name=\"${name}.index.${columnIndex}\">"
 
-        options.each { f ->         
-            res += "<option value=\"${f.id}\""
-            //res += (e.type.toInteger() == selected) ? " selected" : ""
-            res += ">${f}</option>"
+        options.each { f ->
+            res+= "<option value=\"${f.name}\">"
+            
+            res+= (f.preferredIdentifier) ? 
+                    "${f.name} (IDENTIFIER)</option>" :
+                    "${f.name}</option>"
         }
 

trunk/grails-app/views/importer/index_simple.gsp

@@ -72 +72 @@
             </td>
             <td>
-                <g:select name="study_id" from="${studies}" optionKey="id"/>
+                <g:select name="study.id" from="${studies}" optionKey="id"/>
             </td>
         </tr>