Changeset 1416

Timestamp:

Jan 19, 2011, 4:01:08 PM (12 years ago)

Author:

t.w.abma@…

Message:

• again fixed the importer, persisting seemed to work fine, but Hibernate session was out of sync

Location:

trunk/grails-app

Files:

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

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

@@ -14 +14 @@
 
 import grails.plugins.springsecurity.Secured
+
+import org.hibernate.SessionFactory
 
 /**
@@ -242 +244 @@
                 // instances you have created in the
                 // ajax flow.
-                try {
                     // Grom a development message
                     if (pluginManager.getGrailsPlugin('grom')) ".persisting instances to the database...".grom()                    
 
                     if (saveEntities(flow, params)) {
+                        log.error ".import wizard succesfully persisted all entities"                        
+                        def session = sessionFactory.getCurrentSession()
+                        session.clear()                        
                         success()
                     } else {                        
-                        log.error ".import wizard imported error, something went wrong showing the imported entities"                        
-                        //throw Exception
-                    }                    
-                } catch (Exception e) {
-                    // put your error handling logic in
-                    // here
-                    log.error ".import wizard, could not save entities:\n" + e.dump()
-                    flow.page = 4
-                    error()
-                }
+                        log.error ".import wizard, could not save entities:\n" + e.dump()
+                        flow.page = 4
+                        error()
+                    }
             }
             on("error").to "error"
@@ -266 +264 @@
 
         // render errors
-        error {                        
+        error {
             render(view: "_error")
             onRender {
@@ -282 +280 @@
 
         // last wizard page
-        finalPage {
+        finalPage {            
             render(view: "_final_page")
             onRender {
+                println "EEN"
                 // Grom a development message
                 if (pluginManager.getGrailsPlugin('grom')) ".rendering the partial pages/_final_page.gsp".grom()
+                println "TWEE"
                                 
                 success()
-            }
+                println "DRIE"
+            }
+            onEnd {
+                                // clean flow scope
+                                flow.clear()
+                        }
         }
     }
@@ -514 +519 @@
     boolean saveEntities(flow, params) {            
             //def (validatedSuccesfully, updatedEntities, failedToPersist) =
-            try {
+            //try {
                 ImporterService.saveDatamatrix(flow.importer_study, flow.importer_importeddata)
                 
-            }
-            catch (Exception e) {                
-                log.error ".import wizard saveEntities error\n" + e.dump()
-            }
+            //}
+            //catch (Exception e) {
+//                log.error ".import wizard saveEntities error\n" + e.dump()
+//            }
             
             //flow.importer_validatedsuccesfully = validatedSuccesfully

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

@@ -307 +307 @@
                                         break
                         case Event       :  log.info "Persisting Event `" + entity + "`: "                                      
-                                        study.addToEvents(entity)
-                                        persistEntity(entity)
+                                        study.addToEvents(entity)                                      
                                         break
                         case Sample      :  log.info "Persisting Sample `" + entity +"`: "                                      
                                                 
                                         // is this sample validatable (sample name unique for example?)                                        
-                                        study.addToSamples(entity)
-                                        persistEntity(study)
+                                        study.addToSamples(entity)                                        
                                         
                                         break
                     case SamplingEvent: log.info "Persisting SamplingEvent `" + entity + "`: "                                    
-                                        study.addToSamplingEvents(entity)
-                                        persistEntity(entity)
+                                        study.addToSamplingEvents(entity)                                       
                                         break
                         default          :  log.info "Skipping persisting of `" + entity.getclass() +"`"                                        
@@ -328 +325 @@
 
 
-    if (study!=null) persistEntity(study)
+    if (study!=null) study.save(failOnError:true)
+        //persistEntity(study)
     
         //return [validatedSuccesfully, updatedentities, failedtopersist]