Changeset 834

Timestamp:

Aug 23, 2010, 10:10:16 PM (12 years ago)

Author:

keesvb

Message:

changed externalAssayId to string

Location:

trunk/grails-app

Files:

• conf/BootStrapStudies.groovy (modified) (4 diffs)
• controllers/RestController.groovy (modified) (1 diff)
• domain/dbnp/studycapturing/Assay.groovy (modified) (1 diff)

trunk/grails-app/conf/BootStrapStudies.groovy

@@ -456 +456 @@
                         name: 'Lipid profiling',
                         module: clinicalModule,
-                        externalAssayID: 1
+                        externalAssayID: 'PPS3_SAM'
                 )
 
@@ -473 +473 @@
                         name: 'Glucose assay 2',
                         module: clinicalModule,
-                        externalAssayID: 2
+                        externalAssayID: 'PPSH-2'
                 )
 
@@ -479 +479 @@
                         name: 'Glucose assay 3',
                         module: clinicalModule,
-                        externalAssayID: 3
+                        externalAssayID: 'PPSH-3'
                 )
 
@@ -491 +491 @@
                 humanStudy.addToAssays(glucoseAssay3Ref)
                 humanStudy.save()
-                println "Saving"
+                
                 //glucoseAssay2Ref.with { if (!validate()) { errors.each { println it} } else save()}
                 //glucoseAssay3Ref.with { if (!validate()) { errors.each { println it} } else save()}

trunk/grails-app/controllers/RestController.groovy

@@ -125 +125 @@
                 def items = []
                 if( params.externalAssayID ) {
-                        def id = Long.parseLong(params.externalAssayID)
-                        def assay = Assay.find( "from Assay as a where externalAssayID=?",[id])
+                        def assay = Assay.find( "from Assay as a where externalAssayID=?",[params.externalAssayID])
                         assay.getSamples().each { sample ->
                                 def item = [ 

trunk/grails-app/domain/dbnp/studycapturing/Assay.groovy

@@ -15 +15 @@
         // The assay ID which is used in the dbNP submodule which contains the actual omics data of this assay.
         // This ID is generated in GSCF, but is used in the submodules to refer to this particular Assay.
-        long externalAssayID
+        String externalAssayID
 
         /**