Changeset 1469 for trunk/grails-app/services/dbnp/importer/ImporterService.groovy

Timestamp:

Feb 1, 2011, 5:33:41 PM (9 years ago)

Author:

t.w.abma@…

Message:

• importer doesn't crash on empty (null) rows in an Excel sheet anymore
• template editor can be opened and the selected form fields will be remembered after a refresh
• fixed Template lookup

File:

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

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

@@ -151 +151 @@
 
                         (0..header.size() - 1).each { columnindex ->
-                                def c = sheet.getRow(rowindex).getCell(columnindex, Row.CREATE_NULL_AS_BLANK)
-                                row.add(c)
+                if (sheet.getRow(rowindex))
+                    row.add( sheet.getRow(rowindex).getCell(columnindex, Row.CREATE_NULL_AS_BLANK) )
                         }
 
@@ -277 +277 @@
                         record.each { entity ->
                                 switch (entity.getClass()) {
-                                        case Study: log.info "Persisting Study `" + entity + "`: "
+                                        case Study: log.info ".importer wizard, persisting Study `" + entity + "`: "
                                                 entity.owner = authenticationService.getLoggedInUser()
-                                                persistEntity(entity)
-                                                break
-                                        case Subject: log.info "Persisting Subject `" + entity + "`: "
+                        
+                        if (study.validate()) {
+                            if (!entity.save(flush:true)) {
+                                log.error ".importer wizard, study could not be saved: " + entity
+                                throw new Exception('.importer wizard, study could not be saved: ' + entity)
+                            }
+                        } else {
+                            log.error ".importer wizard, study could not be validated: " + entity
+                            throw new Exception('.importer wizard, study could not be validated: ' + entity)
+                        }
+
+                        break
+                                        case Subject: log.info ".importer wizard, persisting Subject `" + entity + "`: "
 
                                                 // is the current entity not already in the database?
@@ -292 +302 @@
 
                                                 break
-                                        case Event: log.info "Persisting Event `" + entity + "`: "
+                                        case Event: log.info ".importer wizard, persisting Event `" + entity + "`: "
                                                 study.addToEvents(entity)
                                                 break
-                                        case Sample: log.info "Persisting Sample `" + entity + "`: "
+                                        case Sample: log.info ".importer wizard, persisting Sample `" + entity + "`: "
 
                                                 // is this sample validatable (sample name unique for example?)
@@ -301 +311 @@
 
                                                 break
-                                        case SamplingEvent: log.info "Persisting SamplingEvent `" + entity + "`: "
+                                        case SamplingEvent: log.info ".importer wizard, persisting SamplingEvent `" + entity + "`: "
                                                 study.addToSamplingEvents(entity)
                                                 break
-                                        default: log.info "Skipping persisting of `" + entity.getclass() + "`"
+                                        default: log.info ".importer wizard, skipping persisting of `" + entity.getclass() + "`"
                                                 break
                                 } // end switch
@@ -381 +391 @@
          */
         boolean persistEntity(entity) {
-                log.info ".import wizard persisting ${entity}"
-
-                try {
+                /*log.info ".import wizard persisting ${entity}"
+
+                try {            
                         entity.save(flush: true)
                         return true
@@ -393 +403 @@
                 }
 
-                return true
+                return true*/
+        //println "persistEntity"
         }