Changeset 684

Timestamp:

Jul 21, 2010, 2:47:31 PM (13 years ago)

Author:

tabma

Message:

• integer column is now correctly returned as an integer (formatValue-method), POI *always* returns a double if a column is numeric...

File:

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

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

@@ -172 +172 @@
             (0..header.size()-1).each { columnindex ->
                 def c = sheet.getRow(rowindex).getCell(columnindex, org.apache.poi.ss.usermodel.Row.CREATE_NULL_AS_BLANK)               
+                //row.add(df.formatCellValue(c))
                 row.add(c)
                 //if (c.getCellType() == c.CELL_TYPE_STRING) println "STR"+c.getStringCellValue()
@@ -210 +211 @@
 
     /**
-    * Method to read data from a workbook and to import data into the database
-    * by using mapping information
+    * Method to read data from a workbook and to import data into a two dimensional
+    * array
     *
     * @param template_id template identifier to use fields from
@@ -312 +313 @@
             def value
 
+            // Check if column must be imported
             if (!mc.dontimport) {
-                /*try {
-                 value = formatValue(df.formatCellValue(cell), mc.templatefieldtype)
+                try {
+                    value = formatValue(df.formatCellValue(cell), mc.templatefieldtype)
                 } catch (NumberFormatException nfe) {
                  value = ""
-                }*/
-            value = df.formatCellValue(cell)
+                }
 
             switch(mc.entity) {
@@ -351 +352 @@
                 case TemplateFieldType.STRING       :   return value.trim()
                 case TemplateFieldType.TEXT         :   return value.trim()
-                case TemplateFieldType.INTEGER      :   return Integer.valueOf(value)
+                case TemplateFieldType.INTEGER      :   return (int) Double.valueOf(value)
                 case TemplateFieldType.FLOAT        :   return Float.valueOf(value.replace(",","."));
                 case TemplateFieldType.DOUBLE       :   return Double.valueOf(value.replace(",","."));
@@ -360 +361 @@
             }
     }
+
 }