Changeset 1502

Timestamp:

Feb 7, 2011, 4:32:07 PM (13 years ago)

Author:

t.w.abma@…

Message:

• uploaded file in import wizard now checked for being an Excel (formatted) file, other file (formats) will display a popup with an error message

File:

• trunk/grails-app/controllers/dbnp/importer/ImporterController.groovy (modified) (5 diffs)

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

@@ -111 +111 @@
 
             on("refresh") {
-                flash.importer_params = params                
+                flash.importer_params = params            
                                 success()
                         }.to "pageOne"
@@ -117 +117 @@
                         on("next") {
                                 flash.wizardErrors = [:]
+                //flash.importer_params = params
 
                                 // Study selected?
@@ -123 +124 @@
                                 // Trying to import data into an existing study?
                                 if (flow.importer_study)
-                                        if (flow.importer_study.canWrite(authenticationService.getLoggedInUser())) {
-                                                if (fileImportPage(flow, params)) {
-                                                        success()
-                                                } else {
-                                                        log.error ".importer wizard not all fields are filled in"
-                                                        this.appendErrorMap(['error': "Not all fields are filled in, please fill in or select all fields"], flash.wizardErrors)
-                                                        error()
-                                                }
-                                        } else {
+                                        if (flow.importer_study.canWrite(authenticationService.getLoggedInUser())) 
+                                                fileImportPage(flow, flash, params) ? success() : error()                                       
+                                        else {
                                                 log.error ".importer wizard wrong permissions"
                                                 this.appendErrorMap(['error': "You don't have the right permissions"], flash.wizardErrors)
-
                                                 error()
                                         }
                                 else {
-                                        if (fileImportPage(flow, params)) {
-                                                success()
-                                        } else {
-                                                log.error ".importer wizard not all fields are filled in"
-                                                this.appendErrorMap(['error': "Not all fields are filled in, please fill in or select all fields"], flash.wizardErrors)
-                                                error()
-                                        }
+                                        fileImportPage(flow, flash, params) ? success() : error()
                                 }
 
@@ -299 +287 @@
          * @returns boolean true if correctly validated, otherwise false
          */
-        boolean fileImportPage(flow, params) {
+        boolean fileImportPage(flow, flash, params) {
                 def importedfile = fileService.get(params['importfile'])
                 //fileService.delete(YourFile)
 
-                if (params.entity && params.template_id && importedfile.exists()) {
-                        // create a workbook instance of the file
-                        session.importer_workbook = ImporterService.getWorkbook(new FileInputStream(importedfile))
+        if (importedfile.exists()) {
+            try {
+                session.importer_workbook = ImporterService.getWorkbook(new FileInputStream(importedfile))
+            } catch (Exception e) {
+                log.error ".importer wizard could not load file: " + e
+                this.appendErrorMap(['error': "Wrong file (format), the importer requires an Excel file as input"], flash.wizardErrors)
+                return false
+            }
+        }
+
+                if (params.entity && params.template_id) {            
+                        
+            try {
+                session.importer_workbook = ImporterService.getWorkbook(new FileInputStream(importedfile))
+            } catch (Exception e) {
+                log.error ".importer wizard could not load file: " + e
+                this.appendErrorMap(['error': "Excel file required as input"], flash.wizardErrors)
+                return false
+            }
 
                         def selectedentities = []
@@ -345 +349 @@
                         return true
                 }
+
+        log.error ".importer wizard not all fields are filled in"
+        this.appendErrorMap(['error': "Not all fields are filled in, please fill in or select all fields"], flash.wizardErrors)
+        return false
         }