Changeset 1044 for trunk

Timestamp:

Nov 1, 2010, 9:42:38 PM (12 years ago)

Author:

t.w.abma@…

Message:

• added record which contains failed columns, should be passed to an overview in step 2a

Location:

trunk/grails-app

Files:

• controllers/dbnp/importer/ImporterController.groovy (modified) (2 diffs)
• services/dbnp/importer/ImporterService.groovy (modified) (5 diffs)
• views/importer/step2a.gsp (added)
• views/importer/step2a_simple.gsp (added)

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

@@ -229 +229 @@
         render(view:"step2", model:[entities:selectedentities, header:session.importer_header, templates:templates])
     }
-
-    /**
-    * @param columnproperty array of columns containing index and property (represented as a String)
+    
+    /** 
+     * Method which stores the properties set per column and then imports the data.
+     *
+     * @param columnproperty array of columns containing index and property (represented as a String)
     *
     */
-    def saveProperties = {
+    def saveProperties = {        
 
         // Find actual Template object from the chosen template name
@@ -261 +263 @@
         }
 
-        //import workbook
-        session.importer_importeddata = ImporterService.importdata(session.importer_template_id, session.importer_workbook, session.importer_sheetindex, session.importer_datamatrix_start, session.importer_header)
+        //import workbook and store it in a session
+        session.importer_importeddata = ImporterService.importData(session.importer_template_id, session.importer_workbook, session.importer_sheetindex, session.importer_datamatrix_start, session.importer_header)
+
+        //
+        //render(view:"step2a_simple", model:[datamatrix:session.importer_importeddata])
 
         if (params.layout=="horizontal")

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

@@ -222 +222 @@
     * @see dbnp.importer.MappingColumn
     */
-    def importdata(template_id, HSSFWorkbook wb, int sheetindex, int rowindex, mcmap) {
+    def importData(template_id, HSSFWorkbook wb, int sheetindex, int rowindex, mcmap) {
         def sheet = wb.getSheetAt(sheetindex)
         def table = []
@@ -376 +376 @@
                 def template = Template.get(template_id)
                 def record = []
+                def failed = [:]
 
                 // Initialize all possible entities with the chosen template
@@ -388 +389 @@
                         // get the MappingColumn information of the current cell
                         def mc = mcmap[cell.getColumnIndex()]
-                        def value
+                        def value                        
 
                         // Check if column must be imported
@@ -402 +403 @@
                                 // which entity does the current cell (field) belong to?
                                     switch (mc.entity) {
-                                        case Study: (record.any {it.getClass() == mc.entity}) ? 0 : record.add(study)
+                                        case Study: // does the entity already exist in the record? If not make it so.
+                                                (record.any {it.getClass() == mc.entity}) ? 0 : record.add(study)
                                                 study.setFieldValue(mc.property, value)
                                                 break
@@ -422 +424 @@
                                 } catch (IllegalArgumentException iae) {
                                     // leave the field empty and let the user choose the ontology manually in a later step
-                                    
+                                    failed.put(mc, value)
                                 }
                         } // end
                 } // end for
 
-        return record
+        // add the failed columns to the record (might also be just an empty map if nothing failed)
+        // a failed column means that using the entity.setFieldValue() threw an exception
+        record.add(failed)
+        
+        return record
     }