Changeset 1603 for trunk/grails-app/services

Timestamp:

Mar 8, 2011, 5:10:09 PM (11 years ago)

Author:

work@…

Message:

• importer wizard for studies is instantiating a study from the hidden field (studies) and tried to save it at a later stage (in saveDataMatrix) when it shouldn't. Added a check to only save the study when importing other entities (subject, sample, etc) and not when importing studies.

File:

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

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

@@ -727 +727 @@
          * @param datamatrix two dimensional array containing entities with values read from Excel file
          */
-        static saveDatamatrix(Study study, datamatrix, authenticationService, log) {
+        static saveDatamatrix(Study study, importerEntityType, datamatrix, authenticationService, log) {
                 def validatedSuccesfully = 0
                 def entitystored = null
 
                 // Study passed? Sync data
-                if (study != null) study.refresh()
+                if (study != null && importerEntityType != 'Study') study.refresh()
 
                 // go through the data matrix, read every record and validate the entity and try to persist it
@@ -741 +741 @@
                                                 entity.owner = authenticationService.getLoggedInUser()
 
-                                                if (study.validate()) {
+                                                if (entity.validate()) {
                                                         if (!entity.save(flush:true)) {
                                                                 log.error ".importer wizard, study could not be saved: " + entity
@@ -747 +747 @@
                                                         }
                                                 } else {
-println "---"
-study.errors.getAllErrors().each {
-        println it.dump()
-}
-println "---//"
                                                         log.error ".importer wizard, study could not be validated: " + entity
                                                         throw new Exception('.importer wizard, study could not be validated: ' + entity)
@@ -787 +782 @@
 
                 // validate study
-                if (study.validate()) {
-                        if (!study.save(flush: true)) {
-                                //this.appendErrors(flow.study, flash.wizardErrors)
-                                throw new Exception('.importer wizard [saveDatamatrix] error while saving study')
+                if (importerEntityType != 'Study') {
+                        if (study.validate()) {
+                                if (!study.save(flush: true)) {
+                                        //this.appendErrors(flow.study, flash.wizardErrors)
+                                        throw new Exception('.importer wizard [saveDatamatrix] error while saving study')
+                                }
+                        } else {
+                                throw new Exception('.importer wizard [saveDatamatrix] study does not validate')
                         }
-                } else {
-                        throw new Exception('.importer wizard [saveDatamatrix] study does not validate')
                 }