Changeset 1458 for trunk/grails-app/controllers/dbnp/query/AdvancedQueryController.groovy

Timestamp:

Jan 31, 2011, 8:16:03 PM (12 years ago)

Author:

robert@…

Message:

• Implemented a cache for module rest calls, to increase performance (see moduleCommunicationService)
• Implemented searching in module data.

File:

• trunk/grails-app/controllers/dbnp/query/AdvancedQueryController.groovy (modified) (4 diffs)

trunk/grails-app/controllers/dbnp/query/AdvancedQueryController.groovy

@@ -1 +1 @@
 package dbnp.query
+import dbnp.modules.*
+import org.dbnp.gdt.*
 
 // TODO: Make use of the searchable-plugin possibilities instead of querying the database directly
@@ -9 +11 @@
  */
 class AdvancedQueryController {
+        def moduleCommunicationService;
+        
         def entitiesToSearchFor = [ 'Study': 'Studies', 'Sample': 'Samples']
     def index = {
@@ -56 +60 @@
                 def fields = [:];
                 
+                // Retrieve all local search fields
                 getEntities().each {
                         def entity = getEntity( 'dbnp.studycapturing.' + it );
@@ -66 +71 @@
                                 
                                 fields[ it ] = fieldNames.sort { a, b -> a[0].toUpperCase() + a[1..-1] <=> b[0].toUpperCase() + b[1..-1] };
+                        }
+                }
+                
+                // Loop through all modules and check which fields are searchable
+                // Right now, we just combine the results for different entities
+                AssayModule.list().each { module ->
+                        def callUrl = module.url + '/rest/getQueryableFields'
+                        try {
+                                def json = moduleCommunicationService.callModuleRestMethodJSON( module.url, callUrl );
+                                def moduleFields = [];
+                                entitiesToSearchFor.each { entity ->                                    
+                                        if( json[ entity.key ] ) {
+                                                json[ entity.key ].each { field ->
+                                                        moduleFields << field.toString();
+                                                }
+                                        }
+                                }
+                                
+                                // Remove 'module' from module name
+                                def moduleName = module.name.replace( 'module', '' ).trim()
+                                
+                                fields[ moduleName ] = moduleFields.unique();
+                        } catch( Exception e ) {
+                                log.error( "Error while retrieving queryable fields from " + module.name + ": " + e.getMessage() )
                         }
                 }