Changeset 297 for trunk

Timestamp:

Mar 22, 2010, 2:18:30 PM (13 years ago)

Author:

tabma

Message:

• imported data is now being saved in the database (be sure that you choose the correct fieldtypes anywhere/anytime when testing with the Study Excel file)

Location:

trunk/grails-app

Files:

• services/dbnp/importer/ImporterService.groovy (modified) (3 diffs)
• taglib/dbnp/importer/ImporterTagLib.groovy (modified) (2 diffs)
• views/importer/common/_preview.gsp (modified) (1 diff)

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

@@ -179 +179 @@
     }
     
+     /**
+                     // start transaction
+                        def transaction = sessionFactory.getCurrentSession().beginTransaction()
+                              // persist data to the database
+                                try {
+                                   // commit transaction
+                                        println "commit"
+                                        transaction.commit()
+                                        success()
+                                } catch (Exception e) {
+                                        // rollback
+                                        // stacktrace in flash scope
+                                        flash.debug = e.getStackTrace()
+
+                                        println "rollback"
+                                        transaction.rollback()
+                                        error()
+                                }
+      */
+
     /**
      * @param datamatrix two dimensional array containing entities with values read from Excel file
@@ -242 +262 @@
 
         for (HSSFCell cell: excelrow) {
-            def mc = mcmap[cell.getColumnIndex()]           
+            def mc = mcmap[cell.getColumnIndex()]
+            def value = formatValue(df.formatCellValue(cell), mc.templatefieldtype)
 
             switch(mc.entity) {
                 case Study      :   (record.any {it.getClass()==mc.entity}) ? 0 : record.add(study)
-                                    study.setFieldValue(mc.property.name, df.formatCellValue(cell))
+                                    study.setFieldValue(mc.property.name, value)
                                     break
                 case Subject    :   (record.any {it.getClass()==mc.entity}) ? 0 : record.add(subject)
-                                    subject.setFieldValue(mc.property.name, df.formatCellValue(cell))
+                                    subject.setFieldValue(mc.property.name, value)
                                     break
                 case Event      :   (record.any {it.getClass()==mc.entity}) ? 0 : record.add(event)
-                                    event.setFieldValue(mc.property.name, df.formatCellValue(cell))
+                                    event.setFieldValue(mc.property.name, value)
                                     break
                 case Protocol   :   (record.any {it.getClass()==mc.entity}) ? 0 : record.add(protocol)
-                                    protocol.setFieldValue(mc.property.name, df.formatCellValue(cell))
+                                    protocol.setFieldValue(mc.property.name, value)
                                     break
                 case Sample     :   (record.any {it.getClass()==mc.entity}) ? record.add(sample) : 0
-                                    sample.setFieldValue(mc.property.name, df.formatCellValue(cell))
+                                    sample.setFieldValue(mc.property.name, value)
                                     break
                 case Object     :   // don't import
@@ -267 +288 @@
         return record
     }
+
+    /**
+    * Method to parse a value conform a specific type
+    * @param value string containing the value
+    * @return object corresponding to the TemplateFieldType
+    */
+    def formatValue(String value, TemplateFieldType type) {
+        switch (type) {
+            case TemplateFieldType.STRING       :   return value
+            case TemplateFieldType.TEXT         :   return value
+            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.DATE         :   return value
+            default                             :   return value
+        }
+    }
 }

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

@@ -17 +17 @@
 import dbnp.studycapturing.Template
 import dbnp.studycapturing.TemplateFieldType
+import org.apache.poi.hssf.usermodel.HSSFCell
+import org.apache.poi.ss.usermodel.DataFormatter
 
 class ImporterTagLib {
@@ -160 +162 @@
         out << res
     }
+
+    /**
+    * @param cell HSSFCell variable
+    * @return good representation of variable (instead of toString())
+    */
+    def displayCell = { attrs ->        
+        def cell = attrs['cell']
+        def df = new DataFormatter()
+
+        switch (cell.getCellType()) {
+            case HSSFCell.CELL_TYPE_STRING      :   out << cell.getStringCellValue()
+                                                    break
+            case HSSFCell.CELL_TYPE_NUMERIC     :   out << df.formatCellValue(cell)
+                                                    break
+        }
+    }
 }

trunk/grails-app/views/importer/common/_preview.gsp

@@ -45 +45 @@
             <tr>
                 <td>Value</td>
-                <g:each var="column" in="${row}">
+                <g:each var="cell" in="${row}">
                     <td class="datamatrix">
-                        <g:if test="${column.toString()==''}">.</g:if>
-                        <g:else>${column.toString()}</g:else>
+                        <g:if test="${cell.toString()==''}">.</g:if>
+                        <g:else><importer:displayCell cell="${cell}"/></g:else>
                     </td>
                 </g:each>