Changeset 1830 for trunk/grails-app/services

Timestamp:

May 10, 2011, 3:44:15 PM (11 years ago)

Author:

s.h.sikkema@…

Message:

Clarified error messages related to unreachable module; added functionality to export numbers using comma as decimal separator and made this the default for european csv style export

File:

• trunk/grails-app/services/dbnp/studycapturing/AssayService.groovy (modified) (5 diffs)

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

@@ -18 +18 @@
 import org.codehaus.groovy.grails.web.json.JSONObject
 import org.dbnp.gdt.RelTime
-import org.dbnp.gdt.TemplateFieldType;
+import org.dbnp.gdt.TemplateFieldType
+import java.text.DecimalFormat
+import java.text.NumberFormat
 
 class AssayService {
@@ -244 +246 @@
                 def moduleUrl = assay.module.url
 
-                def path = moduleUrl + "/rest/getMeasurements/query?assayToken=$assay.assayUUID"
-
-                def jsonArray = moduleCommunicationService.callModuleRestMethodJSON(moduleUrl, path)
+                def path = moduleUrl + "/rest/getMeasurements/query"
+        def query = "assayToken=$assay.assayUUID"
+        def jsonArray
+
+        try {
+            jsonArray = moduleCommunicationService.callModuleMethod(moduleUrl, path, query)
+        } catch (e) {
+            throw new Exception("An error occured while trying to get the measurement tokens from the $assay.module.name. \
+             This means the module containing the measurement data is not available right now. Please try again \
+             later or notify the system administrator if the problem persists. URL: $path?$query.")
+        }
 
                 jsonArray.collect {
@@ -275 +285 @@
                 }
 
-                def path = moduleUrl + "/rest/getMeasurementData/query?assayToken=$assay.assayUUID" + tokenString
-
-                def (sampleTokens, measurementTokens, moduleData) = moduleCommunicationService.callModuleRestMethodJSON(moduleUrl, path)
+                def path = moduleUrl + "/rest/getMeasurementData/query"
+
+        def query = "assayToken=$assay.assayUUID$tokenString"
+
+                def sampleTokens = [], measurementTokens = [], moduleData = []
+
+        try {
+            (sampleTokens, measurementTokens, moduleData) = moduleCommunicationService.callModuleMethod(moduleUrl, path, query)
+        } catch (e) {
+            throw new Exception("An error occured while trying to get the measurement data from the $assay.module.name. \
+             This means the module containing the measurement data is not available right now. Please try again \
+             later or notify the system administrator if the problem persists. URL: $path?$query.")
+        }
 
                 if (!sampleTokens?.size()) return []
@@ -307 +327 @@
                                                 measurements << null
                                         }  else {
-                                                measurements << ( moduleData[ valueIndex ] == JSONObject.NULL ? "" : moduleData[ valueIndex ].toString() );
+                                                measurements << ( moduleData[ valueIndex ] == JSONObject.NULL ? "" : moduleData[ valueIndex ].toDouble() );
                                         }
                                 } else {
@@ -520 +540 @@
          * @return
          */
-        def exportRowWiseDataToCSVFile(rowData, outputStream, outputDelimiter = '\t') {
+        def exportRowWiseDataToCSVFile(rowData, outputStream, outputDelimiter = '\t', locale = java.util.Locale.US) {
+
+        def formatter = NumberFormat.getNumberInstance(locale)
+        formatter.setGroupingUsed false // we don't want grouping (thousands) separators
 
         outputStream << rowData.collect { row ->
           row.collect{
 
-              // omit quotes in case of numeric values
-              if (it instanceof Number) return it
+              // omit quotes in case of numeric values and format using chosen locale
+              if (it instanceof Number) return formatter.format(it)
 
               def s = it?.toString() ?: ''