Changeset 1376

Timestamp:

Jan 12, 2011, 3:59:03 PM (12 years ago)

Author:

t.w.abma@…

Message:

• casting errors are nog being ignored, but are at least logged, errors should go in a wizardError like popup

Location:

trunk/grails-app

Files:

• controllers/dbnp/importer/ImporterController.groovy (modified) (2 diffs)
• services/dbnp/importer/ImporterService.groovy (modified) (2 diffs)

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

@@ -455 +455 @@
 
         flow.importer_importeddata.each { table ->
-            log.error "table==" + table
-            table.each { entity ->
-                log.error "Entity==" + entity
+            table.each { entity ->                
                 def invalidontologies = 0
 
                 // Set the fields for this entity by retrieving values from the params
-                entity.giveFields().each { field ->
-                    log.error "entitygivefields" + field
+                entity.giveFields().each { field ->                    
                         // field of type ontology and value "#invalidterm"?
                         if (field.type == dbnp.studycapturing.TemplateFieldType.ONTOLOGYTERM &&
@@ -505 +502 @@
     /**
      * @param failedcell failed ontology cells
-     * @param entity entity
+     * @param entity entity to remove from the failedcells list
      */
     def removeFailedCell(failedcells, entity) {

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

@@ -440 +440 @@
                     switch (mc.entity) {
                         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)
+                        (record.any {it.getClass() == mc.entity}) ? 0 : record.add(study)                        
                                                 study.setFieldValue(mc.property, value)
                                                 break
@@ -458 +458 @@
                                                 break
                     } // end switch
-                } catch (IllegalArgumentException iae) {
+                } catch (Exception iae) {
+                    log.error ".import wizard error could not set property `" + mc.property + "` to value `" + value + "`"
                     // store the mapping column and value which failed
                     def identifier