Changeset 545 for trunk/grails-app/services/dbnp/importer/ImporterService.groovy

Timestamp:

Jun 9, 2010, 12:54:12 PM (11 years ago)

Author:

tabma

Message:

• fixed Advanced Import Wizard (preferredIdentifier issues)

File:

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

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

@@ -49 +49 @@
      * @return header representation as a MappingColumn hashmap
      */
-    def getHeader(HSSFWorkbook wb, int sheetindex, theEntity=0){
+    def getHeader(HSSFWorkbook wb, int sheetindex, theEntity=null){
 
         def sheet = wb.getSheetAt(sheetindex)
@@ -62 +62 @@
             def datamatrix_celltype = sheet.getRow(datamatrix_start).getCell(index).getCellType()
             def headercell = sheet.getRow(sheet.getFirstRowNum()).getCell(index)
-
+            def tft = TemplateFieldType.STRING //default templatefield type
+
+            
             // Check for every celltype, currently redundant code, but possibly this will be 
             // a piece of custom code for every cell type like specific formatting
@@ -70 +72 @@
                             //parse cell value as double
                             def parsable = true
-                            def templatefieldtype = TemplateFieldType.STRING
+                            def fieldtype = TemplateFieldType.STRING
 
                             // is this string perhaps a double?
@@ -77 +79 @@
                             } catch (NumberFormatException nfe) { parsable = false }
                             finally {
-                                if (parsable) templatefieldtype = TemplateFieldType.DOUBLE
+                                if (parsable) fieldtype = TemplateFieldType.DOUBLE
                             }
 
                             header[index] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell),
-                                                                            templatefieldtype:templatefieldtype,
+                                                                            templatefieldtype:fieldtype,
                                                                             index:index,
                                                                             entity:theEntity,
                                                                             property:property);
+
                             break
                     case HSSFCell.CELL_TYPE_NUMERIC:                    
@@ -115 +118 @@
                                                                             property:property);
                             break
-            }
-        }
+            } // end of switch
+        } // end of cell loop
         return header
     }
@@ -305 +308 @@
                                     study.setFieldValue(mc.property, value)
                                     break
-                case Subject    :   (record.any {it.getClass()==mc.entity}) ? 0 : record.add(subject)                               
+                case Subject    :   (record.any {it.getClass()==mc.entity}) ? 0 : record.add(subject)
+                                    println "TOT HIER" + mc.property + "/ " + value
                                     subject.setFieldValue(mc.property, value)                               
                                     break