Changeset 1422

Timestamp:

Jan 20, 2011, 6:32:41 PM (12 years ago)

Author:

work@…

Message:

• fixed importer issue with the authentication service not being available in static scope
• log was also not available in static scope
• changed logging from println to log.info

Location:

trunk/grails-app

Files:

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

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

@@ -249 +249 @@
                                 if (saveEntities(flow, params)) {
                                         //if (ImporterService.saveDatamatrix(flow.importer_study, flow.importer_importeddata)) {
-                                        log.error ".import wizard succesfully persisted all entities"
+                                        //log.error ".import wizard succesfully persisted all entities"
                                         //def session = sessionFactory.getCurrentSession()
                                         //session.clear()
@@ -521 +521 @@
                 //def (validatedSuccesfully, updatedEntities, failedToPersist) =
                 //try {
-                ImporterService.saveDatamatrix(flow.importer_study, flow.importer_importeddata, authenticationService)
+                ImporterService.saveDatamatrix(flow.importer_study, flow.importer_importeddata, authenticationService, log)
 
                 //}

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

@@ -257 +257 @@
                                                         // Update the entity field
                                                         entity.setFieldValue(cell.mappingcolumn.property, correctedvalue)
-                                                        //println "Adjusted " + cell.mappingcolumn.property + " to " + correctedvalue
+                                                        //log.info "Adjusted " + cell.mappingcolumn.property + " to " + correctedvalue
                                                 }
                                                 catch (Exception e) {
-                                                        //println "Could not map corrected ontology: " + cell.mappingcolumn.property + " to " + correctedvalue
+                                                        //log.info "Could not map corrected ontology: " + cell.mappingcolumn.property + " to " + correctedvalue
                                                 }
                                         }
@@ -276 +276 @@
          * @param datamatrix two dimensional array containing entities with values read from Excel file
          */
-        static saveDatamatrix(Study study, datamatrix, authenticationService) {
+        static saveDatamatrix(Study study, datamatrix, authenticationService, log) {
                 def validatedSuccesfully = 0
                 def entitystored = null
@@ -287 +287 @@
                         record.each { entity ->
                                 switch (entity.getClass()) {
-                                        case Study: println "Persisting Study `" + entity + "`: "
+                                        case Study: log.info "Persisting Study `" + entity + "`: "
                                                 entity.owner = authenticationService.getLoggedInUser()
                                                 persistEntity(entity)
                                                 break
-                                        case Subject: println "Persisting Subject `" + entity + "`: "
+                                        case Subject: log.info "Persisting Subject `" + entity + "`: "
 
                                                 // is the current entity not already in the database?
@@ -302 +302 @@
 
                                                 break
-                                        case Event: println "Persisting Event `" + entity + "`: "
+                                        case Event: log.info "Persisting Event `" + entity + "`: "
                                                 study.addToEvents(entity)
                                                 break
-                                        case Sample: println "Persisting Sample `" + entity + "`: "
+                                        case Sample: log.info "Persisting Sample `" + entity + "`: "
 
                                                 // is this sample validatable (sample name unique for example?)
@@ -311 +311 @@
 
                                                 break
-                                        case SamplingEvent: println "Persisting SamplingEvent `" + entity + "`: "
+                                        case SamplingEvent: log.info "Persisting SamplingEvent `" + entity + "`: "
                                                 study.addToSamplingEvents(entity)
                                                 break
-                                        default: println "Skipping persisting of `" + entity.getclass() + "`"
+                                        default: log.info "Skipping persisting of `" + entity.getclass() + "`"
                                                 break
                                 } // end switch
@@ -391 +391 @@
          */
         boolean persistEntity(entity) {
-                println ".import wizard persisting ${entity}"
+                log.info ".import wizard persisting ${entity}"
 
                 try {