Changeset 18 for trunk/grails-app/controllers

Timestamp:

Mar 8, 2011, 11:59:30 AM (11 years ago)

Author:

robert@…

Message:

Fixed issue #11: export of excel sample data is now column wise

Location:

trunk/grails-app/controllers/nl/tno/metagenomics

Files:

• RunController.groovy (modified) (1 diff)
• integration/RestController.groovy (modified) (6 diffs)
• integration/SynchronizeController.groovy (modified) (1 diff)

trunk/grails-app/controllers/nl/tno/metagenomics/RunController.groovy

@@ -554 +554 @@
                 } catch( Exception e ) {
                         log.error( "Exception occurred during export of sequences. Probably the user has cancelled the download." );
+                        throw e
                 }
         }

trunk/grails-app/controllers/nl/tno/metagenomics/integration/RestController.groovy

@@ -2 +2 @@
 
 import grails.converters.*
-import nl.tno.metagenomics.Study
-import nl.tno.metagenomics.Sample
-import nl.tno.metagenomics.Assay
+import nl.tno.metagenomics.*
 
 import org.apache.catalina.connector.Response;
@@ -185 +183 @@
          */
         def getQueryableFieldData = {
+                println "Get queryable Field data: " + params
+                
                 def entity = params.entity;
                 def tokens = params.tokens ?: []
@@ -450 +450 @@
          *   {"name":"average quality", "unit":"Phred"} ]
          */
-        def getMeasurementMetadata = {
+        def getMeasurementMetaData = {
                 def assayToken = params.assayToken
                 def measurementTokens = params.measurementToken
@@ -461 +461 @@
                 // For now, we don't have any metadata about the measurements
                 def measurements = getMeasurementTypes();
-                def measurementMetadata = []
+                def measurementMetadata = [ ]
 
                 measurementTokens.each { token ->
@@ -602 +602 @@
                 }
 
-                def data = SampleAssay.findAllByAssay( assay );
+                def data = AssaySample.findAllByAssay( assay );
                 def measurements = getMeasurementTypes()
 
                 def results = []
-                data.each { sampleAssay ->
+                data.each { assaySample ->
                         measurements.each { type ->
-                                def sample = sampleAssay.sample.sampleToken
+                                def sample = assaySample.sample.sampleToken
                                 def isMatch = false
 
@@ -614 +614 @@
                                 if( ( measurementTokens.isEmpty() || measurementTokens.contains( type ) ) &&
                                 ( sampleTokens.isEmpty()      || sampleTokens.contains( sample ) ) ) {
-                                        results.push( [ 'sampleToken': sample, 'measurementToken': type, 'value': sampleAssay[ type ] ] )
+                                        results.push( [ 'sampleToken': sample, 'measurementToken': type, 'value': assaySample[ type ] ] )
                                 }
                         }

trunk/grails-app/controllers/nl/tno/metagenomics/integration/SynchronizeController.groovy

@@ -23 +23 @@
         def perform = {
                 try {
+                        if( !session.user ) {
+                                throw new Exception( "No user is logged in" );
+                        }
+                        
                         synchronizationService.sessionToken = session.sessionToken
                         synchronizationService.user = session.user