Changeset 485 for trunk/grails-app/services

Timestamp:

May 27, 2010, 1:13:50 PM (14 years ago)

Author:

tabma

Message:

• refactored (now using configuration file where entities to be used are configured)

File:

• trunk/grails-app/services/dbnp/importer/ImporterService.groovy (modified) (5 diffs)

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

@@ -46 +46 @@
     /**
      * @param wb high level representation of the workbook
+     * @param sheetindex sheet to use within the workbook
      * @return header representation as a MappingColumn hashmap
      */
-    def getHeader(HSSFWorkbook wb, int sheetindex){
+    def getHeader(HSSFWorkbook wb, int sheetindex, theEntity=0){
 
         def sheet = wb.getSheetAt(sheetindex)
@@ -55 +56 @@
         def header = [:]
         def df = new DataFormatter()
-
+        def property = new dbnp.studycapturing.TemplateField()
 
         for (HSSFCell c: sheet.getRow(datamatrix_start)) {
@@ -67 +68 @@
             switch (datamatrix_celltype) {
                     case HSSFCell.CELL_TYPE_STRING:
-                            header[index] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell), templatefieldtype:TemplateFieldType.STRING, index:index);
+                            header[index] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell), templatefieldtype:TemplateFieldType.STRING, index:index, entity:theEntity, property:property);
                             break
                     case HSSFCell.CELL_TYPE_NUMERIC:                    
                             if (HSSFDateUtil.isCellDateFormatted(c)) {
-                                header[index] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell), templatefieldtype:TemplateFieldType.DATE, index:index)
+                                header[index] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell), templatefieldtype:TemplateFieldType.DATE, index:index, entity:theEntity, property:property)
                             }
                             else
-                                header[index] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell), templatefieldtype:TemplateFieldType.INTEGER,index:index);
+                                header[index] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell), templatefieldtype:TemplateFieldType.INTEGER,index:index, entity:theEntity, property:property);
                             break
                     case HSSFCell.CELL_TYPE_BLANK:
-                            header[index] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell), templatefieldtype:TemplateFieldType.STRING, index:index);
+                            header[index] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell), templatefieldtype:TemplateFieldType.STRING, index:index, entity:theEntity, property:property);
                             break
                     default:
-                            header[index] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell), templatefieldtype:TemplateFieldType.STRING,index:index);
+                            header[index] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell), templatefieldtype:TemplateFieldType.STRING,index:index, entity:theEntity, property:property);
                             break
             }
@@ -160 +161 @@
         def sheet = wb.getSheetAt(sheetindex)
         def table = []
+
         
         // walk through all rows        
         (rowindex..sheet.getLastRowNum()).each { i ->
-            table.add(createRecord(template_id, sheet.getRow(i), mcmap))            
+            table.add(createRecord(template_id, sheet.getRow(i), mcmap))
         }
 
@@ -263 +265 @@
         def sample = new Sample(name:"New sample", template:template)
 
-        for (HSSFCell cell: excelrow) {
+        for (HSSFCell cell: excelrow) {     
             def mc = mcmap[cell.getColumnIndex()]
-            def value = formatValue(df.formatCellValue(cell), mc.templatefieldtype)         
+            def value = formatValue(df.formatCellValue(cell), mc.templatefieldtype)
 
             switch(mc.entity) {