Changeset 1803

Timestamp:

May 4, 2011, 9:53:40 AM (12 years ago)

Author:

s.h.sikkema@…

Message:

Improved CSV export

Location:

trunk

Files:

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

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

@@ -523 +523 @@
 
         outputStream << rowData.collect { row ->
-          row.collect{ it ? "\"$it\"" : '""' }.join(',')
+          row.collect{
+
+              // omit quotes in case of numeric values
+              if (it instanceof Number) return it
+
+              def s = it.toString()
+
+              def addQuotes = false
+
+              // escape double quotes with double quotes if they exist and
+              // enable surround with quotes
+              if (s.contains('"')) {
+                  addQuotes = true
+                  s = s.replaceAll('"','""')
+              } else {
+                  // enable surround with quotes in case of comma's
+                  if (s.contains(',') || s.contains('\n')) addQuotes = true
+              }
+
+              addQuotes ? "\"$s\"" : s
+
+          }.join(',')
         }.join('\n')
 

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

@@ -262 +262 @@
 //    }
 
-
+    void testCSVOutput() {
+
+        // We're testing:
+        // - strings containing any newlines, comma's, or double quotes should
+        //   be surrounded with double quotes
+        // - double quotes should be escaped by double quotes ( " -> "" )
+        // - other strings and numbers should remain 'quoteless'
+
+        def rowData = [["""a
+b""","a,b","a\"b", "abc"],[1,2.0,"3,1"]]
+
+        def baos = new ByteArrayOutputStream()
+
+        service.exportRowWiseDataToCSVFile rowData, baos
+
+        assertEquals 'CSV Output', '"a\nb","a,b","a""b",abc\n1,2.0,"3,1"', baos.toString()
+
+    }
 }