Changeset 686

Timestamp:

Jul 21, 2010, 4:02:20 PM (13 years ago)

Author:

tabma

Message:

• improved validation in importerservice, now skips faulty entities (null) and final step now shows how many rows were succesfully saved

Location:

trunk/grails-app

Files:

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

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

@@ -246 +246 @@
 
     def savePostview = {
-        ImporterService.saveDatamatrix(session.importer_study, session.importer_importeddata)
-        render(view:"step4")
+        def validatedSuccesfully = ImporterService.saveDatamatrix(session.importer_study, session.importer_importeddata)
+        render(view:"step4", model:[validatedSuccesfully:validatedSuccesfully, totalrows:session.importer_importeddata.size])
     }
 

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

@@ -253 +253 @@
      */    
     def saveDatamatrix(Study study, datamatrix) {
+        def validatedSuccesfully = 0
         study.refresh()
         
         datamatrix.each { record ->
             record.each { entity ->
-                switch (entity.getClass()) {
-                    case Study   :  print "Persisting Study `" + entity.title + "`: "
-                                    persistEntity(entity)
-                                    break
-                    case Subject :  print "Persisting Subject `" + entity.name + "`: "
-                                    persistEntity(entity)
-                                    study.addToSubjects(entity)
-                                    break
-                    case Event   :  print "Persisting Event `" + entity.eventdescription + "`: "
-                                    persistEntity(entity)
-                                    break
-                    case Sample  :  print "Persisting Sample `" + entity.name +"`: "
-                                    persistEntity(entity)
-                                    break
-                    default      :  println "Skipping persisting of `" + entity.getclass() +"`"
-                                    break
-                }
-            }
-        }
+                if(entity.validate()) {
+                    switch (entity.getClass()) {
+                        case Study       :  print "Persisting Study `" + entity + "`: "
+                                            persistEntity(entity)
+                                            break
+                        case Subject     :  print "Persisting Subject `" + entity + "`: "
+                                            persistEntity(entity)
+                                            study.addToSubjects(entity)
+                                            break
+                        case Event       :  print "Persisting Event `" + entity + "`: "
+                                            persistEntity(entity)
+                                            break
+                        case Sample      :  print "Persisting Sample `" + entity +"`: "
+                                            persistEntity(entity)
+                                            break
+                        default          :  println "Skipping persisting of `" + entity.getclass() +"`"
+                                            break
+                    } // end switch
+                    validatedSuccesfully++
+                } // end if
+            } // end record
+        } // end datamatrix
+        return validatedSuccesfully
     }
 
@@ -286 +291 @@
      */
     def persistEntity(entity) { 
-        if (entity.save(flush:true)) {  //.merge?           
-        } else entity.errors.allErrors.each {
-                println it
-        }
+         if (!entity.save()) //.merge?
+            entity.errors.allErrors.each {
+            println it
+         }
     }