Changeset 644 for trunk/src/groovy

Timestamp:

Jul 9, 2010, 11:34:14 AM (13 years ago)

Author:

jahn

Message:

Added enhanced REST wrapper method for querying SAM.

File:

• trunk/src/groovy/dbnp/rest/common/CommunicationManager.groovy (modified) (6 diffs)

trunk/src/groovy/dbnp/rest/common/CommunicationManager.groovy

@@ -26 +26 @@
 class CommunicationManager {
 
-    def static Encoding     = "UTF-8" 
-    def public static SAMServerURL = "localhost:8182/sam"
-    def public static GSCFServerURL = "localhost:8080/gscf"
+    def        static Encoding      = "UTF-8" 
+    def public static SAMServerURL  = "http://localhost:8182/sam"
+    def public static GSCFServerURL = "http://localhost:8080/gscf"
 
      
@@ -57 +57 @@
         def url = RestServerURL + '/' + resource
                 def first = true
+                println "url: " + url
                 params.each { name, value ->
                         if(first) {
@@ -105 +106 @@
      */
 
-    public static addRestWrapper( serverURL, restName, params = [] ) {
+    public static addRestWrapper( serverURL, restName, params = [], closure = { return it } ) {
                 CommunicationManager.metaClass.registerStaticMethod( restName ) { Object [] strangeGroovyArgs ->
                         def map = [:]
@@ -113 +114 @@
                             map[param] = args[i]
                         }
-                        return getRestResource( serverURL, restName, map )
-                }
-    }
+                        return closure( getRestResource( serverURL, restName, map ) )
+                }
+        println "registered + ${restName}"
+        }
+
+
 
 
@@ -163 +167 @@
      */ 
     public static registerRestWrapperMethodsSAMtoGSCF() {
-                def url = SAMServerURL 
+                def url = SAMServerURL
 
                 // register method that links to the SAM view for importing a SimpleAssay. 
@@ -180 +184 @@
         // parameters: externalAssayID
                 addViewWrapper( 'getMeasurementTypesURL', url, 'simpleAssayMeasurementType/list', ['externalStudyID'] )
+
+                // register rest resource that returns the results of a full text query on SAM 
+        // parameters:   query. A string for fulltext search on SAM
+        // return value: results map. It contains two keys 'studyIds', and 'assays'. 'studyIds' 
+                //               key maps to a list of Study domain objects of GSCF. 'assays' map to a
+                //               list of pairs. Each pair consists of an Assay domain object of GSCF and
+                //               additional assay information from SAM provided as a map.
+                // Example of a returned map: 
+                //               [studyIds:[PPSH], 
+                //                               assays:[[isIntake:false, isDrug:false, correctionMethod:test Correction Method 1, 
+                //                               detectableLimit:1, isNew:false, class:data.SimpleAssay, externalAssayID:1, id:1, 
+                //                               measurements:null, unit:Insulin, inSerum:false, name:test Simple Assay 1, 
+                //                               referenceValues:test Reference Values 1]]]
+                def closure = { map -> 
+                    def studies = []    
+                    def assays  = []    
+                        map['studyIds'].each { studies.add( dbnp.studycapturing.Study.find("from dbnp.studycapturing.Study as s where s.code=?",[it]) ) }
+                        map['assays'].each { samAssay ->
+                                def assayID = samAssay['externalAssayID']
+                                def assay = dbnp.studycapturing.Assay.find("from dbnp.studycapturing.Assay as a where a.externalAssayID='${assayID}'")
+                                assays.add( [samAssay,assay] )
+                        } 
+                        return [studies:studies, assays:assays] 
+                }
+
+                addRestWrapper( url+'/rest', 'getQueryResult',  ['query'], closure )
+                
     }