Changeset 1122 for trunk/grails-app/services

Timestamp:

Nov 11, 2010, 2:53:12 PM (12 years ago)

Author:

t.w.abma@…

Message:

• preview fixed (sometimes didn't show all values read from Excel), now shows all data

File:

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

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

@@ -150 +150 @@
         def sheet = wb.getSheetAt(sheetindex)
         def rows  = []
-        def df = new DataFormatter()    
-
-        // walk through all rows
-        (count <= sheet.getLastRowNum()) ?
+        def df = new DataFormatter()
+
+        count = (count < sheet.getLastRowNum()) ? count : sheet.getLastRowNum()
+
+        // walk through all rows        
         ((datamatrix_start+sheet.getFirstRowNum())..count).each { rowindex ->
             def row = []
@@ -167 +168 @@
                 //row.add(df.formatCellValue(c))
                 row.add(c)
-                //if (c.getCellType() == c.CELL_TYPE_STRING) println "STR"+c.getStringCellValue()
-                //if (c.getCellType() == c.CELL_TYPE_NUMERIC) println "INT" +c.getNumericCellValue()
             }
-                //row.add(df.formatCellValue(c))
             rows.add(row)
-        } : 0
+        }
 
         return rows
@@ -232 +230 @@
             // the record hashcode is later on used to put the failed data back
             // in the data matrix            
-            if (failed.importcells.size()>0) failedcells.put(record.hashCode(), failed)
+            if (failed.importcells?.size()>0) failedcells.put(record.hashCode(), failed)
         }
 
@@ -442 +440 @@
                                 }
 
-
                                 //println "temateplfedielfdtype=" + mc.templatefieldtype
                                 // Are we trying to map an ontology term which is empty? Then it is a failed cell