Changeset 1202 for trunk/grails-app/services

Timestamp:

Nov 25, 2010, 3:51:14 PM (12 years ago)

Author:

t.w.abma@…

Message:

• removed extra step and implemented a failed cells check in step 3 (missing mappings) which shows the failed ontologies in the table editor (might have to tune appearance)

File:

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

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

@@ -217 +217 @@
         def sheet = wb.getSheetAt(sheetindex)
         def table = []
-        def failedcells = [:] // map [recordhash, importrecord] values
+        def failedcells = [] // list of records
         
         // walk through all rows and fill the table with records
@@ -227 +227 @@
             table.add(record)
 
-            // If failed cells have been found, add them to the failed cells map
-            // 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 cells have been found, add them to the failed cells list            
+            if (failed?.importcells?.size()>0) failedcells.add(failed)
         }
 
@@ -423 +421 @@
                 def tft = TemplateFieldType
                 def record = [] // list of entities and the read values
-                def failed = new ImportRecord() // list of failed cells with the value which couldn't be mapped into the entity
+                def failed = new ImportRecord() // map with entity identifier and failed mappingcolumn
 
                 // Initialize all possible entities with the chosen template
@@ -446 +444 @@
                                 }
 
-                                //println "temateplfedielfdtype=" + mc.templatefieldtype
-                                // Are we trying to map an ontology term which is empty? Then it is a failed cell
-                                /*if (value=="") {
-                                    println "empty term"
-                                    def temp = new MappingColumn()
-                                    //temp.properties = mc.properties
-                                    temp.value = "undefined"
-                                    failed.add(temp)
-                                }*/                                
-                              
-
                                 try {
                                 // which entity does the current cell (field) belong to?
@@ -481 +468 @@
                                 } catch (IllegalArgumentException iae) {
                                     // store the mapping column and value which failed
+                                    def identifier
+
+                                    switch (mc.entity) {
+                                        case Study:  identifier = study.getIdentifier()
+                                                break
+                                        case Subject: identifier = subject.getIdentifier()
+                                                break
+                                        case SamplingEvent: identifier = samplingEvent.getIdentifier()
+                                                break
+                                        case Event: identifier = event.getIdentifier()                                          
+                                                break
+                                        case Sample: identifier = sample.getIdentifier()
+                                                break
+                                        case Object:   // don't import
+                                                break
+                                    }
+                                    
                                     def mcInstance = new MappingColumn()
                                     mcInstance.properties = mc.properties
-                                    failed.addToImportcells(
-                                        new ImportCell(mappingcolumn:mcInstance,
-                                            value:value)
-                                        )
+                                    failed.addToImportcells(new ImportCell(mappingcolumn:mcInstance, value:value, entityidentifier:identifier))
                                 }
                         } // end
                 } // end for
         // a failed column means that using the entity.setFieldValue() threw an exception        
-        return [record, failed]        
+        return [record, failed]
     }