Changeset 1803 for trunk/grails-app/services/dbnp/studycapturing/AssayService.groovy

Timestamp:

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

Author:

s.h.sikkema@…

Message:

Improved CSV export

File:

• trunk/grails-app/services/dbnp/studycapturing/AssayService.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')