Changeset 1207 for trunk/grails-app/services/dbnp

Timestamp:

Nov 26, 2010, 1:02:51 PM (12 years ago)

Author:

t.w.abma@…

Message:

• added an initial simple overview in last step of import wizard showing entities which failed to be persisted

File:

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

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

@@ -281 +281 @@
     def saveDatamatrix(Study study, datamatrix) {
         def validatedSuccesfully = 0
-        def entitystored = null        
-        study.refresh()        
-        
+        def entitystored = null
+        def failedtopersist = []
+        def updatedentities = []
+        study.refresh()
+        
         // go through the data matrix, read every record and validate the entity and try to persist it
         datamatrix.each { record ->
@@ -290 +292 @@
                         case Study       :  print "Persisting Study `" + entity + "`: "
                                                 entity.owner = AuthenticationService.getLoggedInUser()
-                                                if (persistEntity(entity)) validatedSuccesfully++
+                                                if (persistEntity(entity)) validatedSuccesfully++;
+                                                    else failedtopersist.add(entity)
                                                 break
                         case Subject     :  print "Persisting Subject `" + entity + "`: "
@@ -300 +303 @@
                                                 // this entity is new, so add it to the study
                                                 if (entitystored==null) study.addToSubjects(entity)
-                                                else // existing entity, so update it
+                                                else { // existing entity, so update it
                                                     updateEntity(entitystored, entity)
-
-                                                if (persistEntity(study)) validatedSuccesfully++
+                                                    updatedentities.add(entity)
+                                                }
+
+                                                if (persistEntity(study)) validatedSuccesfully++;
+                                                    else failedtopersist.add(entity)
                                                 break
                         case Event       :  print "Persisting Event `" + entity + "`: "
                                                 entity.parent = study
                                                 study.addToEvents(entity)
-                                                if (persistEntity(entity)) validatedSuccesfully++
+                                                if (persistEntity(entity)) validatedSuccesfully++;
+                                                    else failedtopersist.add(entity)
                                                 break
                         case Sample      :  print "Persisting Sample `" + entity +"`: "                                                
@@ -316 +323 @@
                                                 if (entity.validate()) {
                                                     study.addToSamples(entity)
-                                                    if (persistEntity(study)) validatedSuccesfully++
-                                                }
+                                                    if (persistEntity(study)) validatedSuccesfully++;                                                       
+                                                } else failedtopersist.add(entity)
                                                 
                                                 break
@@ -323 +330 @@
                                                 entity.parent = study
                                                 study.addToSamplingEvents(entity)
-                                                if (persistEntity(entity)) validatedSuccesfully++
+                                                if (persistEntity(entity)) validatedSuccesfully++;
+                                                    else failedtopersist.add(entity)
                                                 break
                         default          :  println "Skipping persisting of `" + entity.getclass() +"`"
+                                                failedtopersist.add(entity)
                                                 break
                         } // end switch
             } // end record
         } // end datamatrix
-        return validatedSuccesfully
+        return [validatedSuccesfully, updatedentities, failedtopersist]
     }