Changeset 255

Timestamp:

Mar 10, 2010, 7:27:57 PM (9 years ago)

Author:

tabma

Message:

• rewrite of celltype detection

Location:

trunk/grails-app

Files:

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

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

@@ -91 +91 @@
                 case 3 : templatefieldtype = TemplateFieldType.STRING
                          break
+                case 4 : templatefieldtype = TemplateFieldType.STRING
+                         break
                 default: break
             }

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

@@ -25 +25 @@
 
     String toString() {
-        return "Name:" + name + "/Type:" + templatefieldtype + "/Entity:" + entity + "/Property:" + property + "/Celltype:" + celltype + "/Index:" + index + "/Value:" + value
+        return "Name:" + name + "/TemplateFieldType:" + templatefieldtype + "/Entity:" + entity + "/Property:" + property + "/Celltype:" + celltype + "/Index:" + index + "/Value:" + value
     }
 }

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

@@ -19 +19 @@
 import org.apache.poi.poifs.filesystem.POIFSFileSystem
 import org.apache.poi.ss.usermodel.DataFormatter
+import org.apache.poi.hssf.usermodel.HSSFDateUtil
 import dbnp.importer.Column
+import dbnp.studycapturing.TemplateFieldType
 
 class ImporterService {
@@ -48 +50 @@
 
 
-        for (HSSFCell c: sheet.getRow(sheet.getFirstRowNum())) {
+        for (HSSFCell c: sheet.getRow(datamatrix_start)) {
             def datamatrix_celltype = sheet.getRow(datamatrix_start).getCell(c.getColumnIndex()).getCellType()
+            def headercell = sheet.getRow(sheet.getFirstRowNum()).getCell(c.getColumnIndex())
 
             // Check for every celltype, currently redundant code, but possibly this will be 
             // a piece of custom code for every cell type like specific formatting
-            
-            switch (c.getCellType()) {
-                    case HSSFCell.CELL_TYPE_STRING:                     
-                        header[c.getColumnIndex()] = new dbnp.importer.MappingColumn(name:df.formatCellValue(c), celltype:datamatrix_celltype);
-                        break
-                    case HSSFCell.CELL_TYPE_NUMERIC:
-                        header[c.getColumnIndex()] = new dbnp.importer.MappingColumn(name:df.formatCellValue(c), celltype:datamatrix_celltype);
-                        break
+                
+            switch (datamatrix_celltype) {
+                    case HSSFCell.CELL_TYPE_STRING:
+                            header[c.getColumnIndex()] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell), templatefieldtype:TemplateFieldType.STRING);
+                            break
+                    case HSSFCell.CELL_TYPE_NUMERIC:                    
+                            if (HSSFDateUtil.isCellDateFormatted(c)) {
+                                println("DATE")
+                                header[c.getColumnIndex()] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell), templatefieldtype:TemplateFieldType.DATE)
+                            }
+                            else
+                                header[c.getColumnIndex()] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell), templatefieldtype:TemplateFieldType.INTEGER);
+                            break
                     case HSSFCell.CELL_TYPE_BLANK:
-                        header[c.getColumnIndex()] = new dbnp.importer.MappingColumn(name:df.formatCellValue(c), celltype:datamatrix_celltype);
-                        break
+                            header[c.getColumnIndex()] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell), templatefieldtype:TemplateFieldType.STRING);
+                            break
                     default:
-                        header[c.getColumnIndex()] = new dbnp.importer.MappingColumn(name:df.formatCellValue(c), celltype:datamatrix_celltype);
-                        break
+                            header[c.getColumnIndex()] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell), templatefieldtype:TemplateFieldType.STRING);
+                            break
             }
         }
@@ -126 +134 @@
         }
 
-    def importdata = {
-        
+    /**
+    * Method to read data from a workbook and to import data into the database
+    * by using mapping information
+    *
+    *
+    * @param wb POI horrible spreadsheet formatted workbook object
+    * @param mc array of MappingColumns
+    * @param sheetindex sheet to use when using multiple sheets
+    * @param rowindex first row to start with reading the actual data (NOT the header)
+    * 
+    * @see dbnp.importer.MappingColumn
+    */
+    def importdata(HSSFWorkbook wb, int sheetindex, int rowindex, MappingColumn[] mc) {
+        def sheet = wb.getSheetAt(sheetindex)
+        def rows  = []
+
+        (count <= sheet.getLastRowNum()) ?
+        (rowindex..count).each { i ->
+
+            def row = []
+            for (HSSFCell c: sheet.getRow(i))
+                //row.add(c)
+                //row.add(df.formatCellValue(c))
+                switch(mc[c.getColumnIndex()].celltype) {
+                    case 0  : break
+                    default : break
+                }
+
+                rows.add(row)
+        } : 0
     }
 }

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

@@ -16 +16 @@
 package dbnp.importer
 import dbnp.studycapturing.Template
+import dbnp.studycapturing.TemplateFieldType
 
 class ImporterTagLib {
@@ -22 +23 @@
                         [type:3, name:"Protocol"], [type:4, name:"Sample"]]
 
-    def standardcelltypes = [
+    /*def standardcelltypes = [
                          [type:0, name:"Numeric"], [type:1, name:"String"], [type:2, name:"Formula"],
                          [type:3, name:"Blank"], [type:4, name:"Boolean"], [type:5, name:"Error"], [type:6, name:"Date"],
                          [type:7, name:"Float"], [type:8, name:"Double"], [type:9, name:"List of items"], [type:10, name:"Ontologyterm"]
-                     ]
+                     ]*/
 
     /**
@@ -61 +62 @@
     }
 
-    def createSelect(int selected, String name, ArrayList options, String customvalue) {
+    def createSelect(int selected, String name, options, String customvalue) {
         def res = "<select style=\"font-size:10px\" name=\"${name}\">"
 
@@ -136 +137 @@
         def selected = (attrs['selected']==null) ? -1 : attrs['selected']
         def customvalue = (attrs['customvalue']==null) ? "" : attrs['customvalue']
-        out << createSelect(selected, attrs['name'], standardcelltypes, customvalue)
+        //out << createSelect(selected, attrs['name'], standardcelltypes, customvalue)
+        out << createSelect(selected, attrs['name'], TemplateFieldType.list(), customvalue)
     }
 }

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

@@ -28 +28 @@
             <g:each var="column" in="${header}">
                 <td class="header">
-                    <importer:celltypeSelect selected="${column.value.celltype.toInteger()}" name="celltype" customvalue="${column.key.toString()}"/>
+                    <importer:celltypeSelect selected="${column.value.templatefieldtype}" name="celltype" customvalue="${column.key.toString()}"/>
                 </td>
             </g:each>