Changeset 1828

Timestamp:

May 10, 2011, 11:36:53 AM (12 years ago)

Author:

s.h.sikkema@…

Message:

Fixed only being able to export to tab delimited; fixed 'null' values in export; fixed extra period between filename and extension

Location:

trunk

Files:

• grails-app/controllers/dbnp/studycapturing/AssayController.groovy (modified) (1 diff)
• grails-app/services/dbnp/studycapturing/AssayService.groovy (modified) (1 diff)
• test/unit/dbnp/studycapturing/AssayServiceTests.groovy (modified) (1 diff)

trunk/grails-app/controllers/dbnp/studycapturing/AssayController.groovy

@@ -220 +220 @@
 
         switch(session.exportFileType) {
-            case 2: // Comma delimited csv
+            case '2': // Comma delimited csv
                 outputDelimiter = ','
-                outputFileExtension = '.csv'
+                outputFileExtension = 'csv'
                 break
-            case 3: // Semicolon delimited csv
+            case '3': // Semicolon delimited csv
                 outputDelimiter = ';'
-                outputFileExtension = '.csv'
+                outputFileExtension = 'csv'
                 break
             default: // Tab delimited with .txt extension
                 outputDelimiter = '\t'
-                outputFileExtension = '.txt'
+                outputFileExtension = 'txt'
         }
 

trunk/grails-app/services/dbnp/studycapturing/AssayService.groovy

@@ -528 +528 @@
               if (it instanceof Number) return it
 
-              def s = it.toString()
+              def s = it?.toString() ?: ''
 
               def addQuotes = false

trunk/test/unit/dbnp/studycapturing/AssayServiceTests.groovy

@@ -270 +270 @@
         // - other strings and numbers should remain 'quoteless'
         // - is the custom delimiter (e.g. tab, comma, semicolon) correctly handled
+        // - null values are exported as empty strings
 
         def rowData = [["""a
-b""","a,b","a\"b", "abc"],[1,2.0,"3,1"]]
+b""","a,b","a\"b", "abc"],[1,2.0,"3,1"],[null,2]]
 
         def baos = new ByteArrayOutputStream()
 
         service.exportRowWiseDataToCSVFile rowData, baos, '\t'
-        assertEquals 'CSV Output', '"a\nb"\t"a,b"\t"a""b"\tabc\n1\t2.0\t"3,1"', baos.toString()
+        assertEquals 'CSV Output', '"a\nb"\t"a,b"\t"a""b"\tabc\n1\t2.0\t"3,1"\n\t2', baos.toString()
 
         baos.reset()
 
         service.exportRowWiseDataToCSVFile rowData, baos, ','
-        assertEquals 'CSV Output', '"a\nb","a,b","a""b",abc\n1,2.0,"3,1"', baos.toString()
+        assertEquals 'CSV Output', '"a\nb","a,b","a""b",abc\n1,2.0,"3,1"\n,2', baos.toString()
 
         baos.reset()
 
         service.exportRowWiseDataToCSVFile rowData, baos, ';'
-        assertEquals 'CSV Output', '"a\nb";"a,b";"a""b";abc\n1;2.0;"3,1"', baos.toString()
+        assertEquals 'CSV Output', '"a\nb";"a,b";"a""b";abc\n1;2.0;"3,1"\n;2', baos.toString()