Changeset 1727

Timestamp:

07-04-11 15:57:59 (3 years ago)

Author:

robert@…

Message:

Adjusted assayservice to make exporting assays work with the sequencing module

Files:

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

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

@@ -227 +227 @@
         def lastDataIndex   = moduleData.size() - 1
         def stepSize        = sampleTokens.size() + 1
-
-        // Transpose the data to order it by measurement (compound) so it can be
-        // written as 1 column
-        int i = 0
-        measurementTokens.inject([:]) { map, token ->
-
-            map + [(token): moduleData[(i++..lastDataIndex).step(stepSize)]]
-
-        }
-
+                
+                // Convert the three different maps into a map like: 
+                //
+                // [ "measurement 1": [ value1, value2, value3 ],
+                //   "measurement 2": [ value4, value5, value6 ]
+                //
+                def map = [:]
+                def numSamples = sampleTokens.size();
+                def idx = 0;
+                
+                // Loop through all measurementtokens, and get the right slice from the measurement list
+                measurementTokens.each { measurementToken ->
+                        def startIndex = idx++ * numSamples;
+                        def stopIndex = startIndex + numSamples - 1;
+                        map[ measurementToken.toString() ] = moduleData[ startIndex..stopIndex ].collect { it.toString() }
+                }
+
+                return map;
     }