Changeset 2059 for trunk

Timestamp:

Oct 13, 2011, 5:11:02 PM (11 years ago)

Author:

taco@…

Message:

visualization/VisualizeController.groovy, 'getData' function. If the user is requesting data that concerns only subjects, then make sure those subjects appear only once

File:

• trunk/grails-app/controllers/dbnp/visualization/VisualizeController.groovy (modified) (2 diffs)

trunk/grails-app/controllers/dbnp/visualization/VisualizeController.groovy

@@ -320 +320 @@
                 def samples = study.samples
 
+        // If the user is requesting data that concerns only subjects, then make sure those subjects appear only once
+        if(parseFieldId( inputData.columnIds[ 0 ] ).type=='subjects' && parseFieldId( inputData.rowIds[ 0 ] ).type=='subjects'){
+            samples.unique { it.parentSubject }
+        }
+        
                 // Retrieve the data for both axes for all samples
                 // TODO: handle the case of multiple fields on an axis
@@ -343 +348 @@
             returnData = formatData( inputData.visualizationType, groupedData, fields, groupAxisType, valueAxisType ); // Don't indicate axis ordering, standard <"x", "y"> will be used
         }
+
+        // Make sure no changes are written to the database
+        study.discard()
+        samples*.discard()
+        
         return sendResults(returnData)
         }