Changeset 274

Timestamp:

Mar 17, 2010, 11:39:58 AM (14 years ago)

Author:

tabma

Message:

• Excel data file data is parsed completely and entities are instantiated with values read from the Excel data file

Location:

trunk/grails-app

Files:

• controllers/dbnp/importer/ImporterController.groovy (modified) (1 diff)
• services/dbnp/importer/ImporterService.groovy (modified) (3 diffs)

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

@@ -152 +152 @@
 
         //import workbook
-        ImporterService.importdata(session.importtemplate_id, session.workbook, 0, 0, session.header)
+        ImporterService.importdata(session.importtemplate_id, session.workbook, 0, 1, session.header)
         //println session.header.dump()
 

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

@@ -155 +155 @@
     */
     def importdata(template_id, HSSFWorkbook wb, int sheetindex, int rowindex, mcmap) {
-        def sheet = wb.getSheetAt(sheetindex)           
-
+        def sheet = wb.getSheetAt(sheetindex)
+        def table = []
+        
         // walk through all rows        
-        rowindex..sheet.getLastRowNum().each { i ->
-            def table = []
-
-            table.add(createRecord(template_id, sheet.getRow(i), mcmap))
-        }       
+        (rowindex..sheet.getLastRowNum()).each { i ->
+            table.add(createRecord(template_id, sheet.getRow(i), mcmap))            
+        }
+
+        table.each {
+            it.each { entity ->
+                entity.giveFields().each { field ->
+                    print field.name + ":" + entity.getFieldValue(field.name) + "/"
+                }
+                println
+            }
+        }
     }
     /**
@@ -178 +186 @@
         def sample = new Sample(title:"New sample", template:template)
 
-        record.add(study)
+        /*record.add(study)
         record.add(subject)
         record.add(event)
         record.add(protocol)
-        record.add(sample)
+        record.add(sample)*/
 
         for (HSSFCell cell: excelrow) {
-            def mc = mcmap[cell.getColumnIndex()]
+            def mc = mcmap[cell.getColumnIndex()]           
 
             switch(mc.entity) {
-                case Study      :   study.setFieldValue(mc.property.name, df.formatCellValue(cell))
-                                    break
-                case Subject    :   subject.setFieldValue(mc.property.name, df.formatCellValue(cell))
-                                    break
-                case Event      :   event.setFieldValue(mc.property.name, df.formatCellValue(cell))
-                                    break
-                case Protocol   :   protocol.setFieldValue(mc.property.name, df.formatCellValue(cell))
-                                    break
-                case Sample     :   sample.setFieldValue(mc.property.name, df.formatCellValue(cell))
+                case Study      :   (record.any {it.getClass()==mc.entity}) ? 0 : record.add(study)
+                                    study.setFieldValue(mc.property.name, df.formatCellValue(cell))
+                                    break
+                case Subject    :   (record.any {it.getClass()==mc.entity}) ? 0 : record.add(subject)
+                                    subject.setFieldValue(mc.property.name, df.formatCellValue(cell))
+                                    break
+                case Event      :   (record.any {it.getClass()==mc.entity}) ? 0 : record.add(event)
+                                    event.setFieldValue(mc.property.name, df.formatCellValue(cell))
+                                    break
+                case Protocol   :   (record.any {it.getClass()==mc.entity}) ? 0 : record.add(protocol)
+                                    protocol.setFieldValue(mc.property.name, df.formatCellValue(cell))
+                                    break
+                case Sample     :   (record.any {it.getClass()==mc.entity}) ? record.add(sample) : 0
+                                    sample.setFieldValue(mc.property.name, df.formatCellValue(cell))
                                     break
                 case Object     :   // don't import
@@ -202 +215 @@
             } // end switch
         } // end for
-        
+
         return record
     }
-
 }