Changeset 284

Timestamp:

Mar 18, 2010, 3:58:06 PM (13 years ago)

Author:

tabma

Message:

• entities functionally persisted (TODO: conversion of String to Float for fields, breaks currently)

Location:

trunk/grails-app

Files:

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

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

@@ -154 +154 @@
 
     def savepostview = {
-        ImporterService.savedata(session.importeddata)
+        ImporterService.savedata(session.importeddata)  
         render(view:"step4")
     }

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

@@ -28 +28 @@
 import dbnp.studycapturing.Sample
 
+import dbnp.data.Ontology
+import dbnp.data.Term
+
 
 class ImporterService {
@@ -184 +187 @@
                 switch (entity.getClass()) {
                     case Study   :  print "Persisting Study `" + entity.title + "`: "
-                                    entity.save()
-                                    println "OK"
+                                    persistEntity(entity)
                                     break
                     case Subject :  print "Persisting Subject `" + entity.name + "`: "
-                                    entity.save()
-                                    println "OK"
+                                    persistEntity(entity)
                                     break
                     case Event   :  print "Persisting Event `" + entity.eventdescription + "`: "
-                                    entity.save()
-                                    println "OK"
+                                    persistEntity(entity)
                                     break
                     case Protocol:  print "Persisting Protocol `" + entity.name + "`: "
-                                    entity.save()
-                                    println "OK"
+                                    persistEntity(entity)
                                     break
                     case Sample  :  print "Persisting Sample `" + entity.name +"`: "
-                                    entity.save()
-                                    println "OK"
-                                    break
-                    default      :  println "Skipping persistance of `" + entity.getclass() +"`"
+                                    persistEntity(entity)
+                                    break
+                    default      :  println "Skipping persisting of `" + entity.getclass() +"`"
                                     break
                 }
             }
-        }
-    }
-
-    /**
-     * This method created a record (array) containing entities with values
+        }       
+    }
+
+    /**
+     * Method to persist entities into the database
+     * 
+     * @param entity entity object like Study, Subject, Protocol et cetera
+     * 
+     */
+    def persistEntity(entity) {
+        println entity.dump()
+        if (entity.save(flush:true)) {  //.merge?
+            println "OK"
+        } else entity.errors.allErrors.each {
+                println it
+        }
+    }
+
+    /**
+     * This method creates a record (array) containing entities with values
      *
      * @param template_id template identifier
@@ -220 +233 @@
         def df = new DataFormatter()
         def template = Template.get(template_id)
-        def record = []
-
+        def record = [] 
+        
         def study = new Study(title:"New study", template:template)
-        def subject = new Subject(name:"New subject", template:template)
+        def subject = new Subject(name:"New subject", species:Term.getTerm("Homo sapiens"), template:template)
         def event = new Event(eventdescription:"New event", template:template)
         def protocol = new Protocol(name:"New protocol", template:template)