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

Timestamp:

Feb 16, 2011, 11:12:14 AM (12 years ago)

Author:

robert@…

Message:

Added assay search and improved query form

File:

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

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

@@ -15 +15 @@
         def authenticationService
 
-        def entitiesToSearchFor = [ 'Study': 'Studies', 'Sample': 'Samples']
+        def entitiesToSearchFor = [ 'Study': 'Studies', 'Sample': 'Samples', 'Assay': 'Assays']
 
         /**
@@ -198 +198 @@
 
                 if( queryIds.size() == 0 ) {
-                        flash.error = "Incorrect search ID given to show"
-                        redirect( action: "index" );
+                        flash.error = "Incorrect search ID given to search in"
+                        redirect( action: "list" );
                         return
                 }
@@ -287 +287 @@
                         case "Study":   return "studyresults";  break;
                         case "Sample":  return "sampleresults"; break;
+                        case "Assay":   return "assayresults";  break;
                         default:                return "results"; break;
                 }
@@ -298 +299 @@
                         case "Study":   return new StudySearch();
                         case "Sample":  return new SampleSearch();
-
+                        case "Assay":   return new AssaySearch();
+                        
                         // This exception will only be thrown if the entitiesToSearchFor contains more entities than
                         // mentioned in this switch structure.
@@ -375 +377 @@
                 // Loop through all keys of c and remove the non-numeric ones
                 for( c in formCriteria ) {
-                        if( c.key ==~ /[0-9]+/ ) {
+                        if( c.key ==~ /[0-9]+/ && c.value.entityfield ) {
                                 def formCriterion = c.value;
 
@@ -478 +480 @@
 
                 // First check whether a search with the same criteria is already present
-                def previousSearch = retrieveSearchByCriteria( s.getCriteria(), s.searchMode );
+                def previousSearch = retrieveSearch( s );
 
                 def id
@@ -496 +498 @@
         /**
          * Retrieves a search from session with the same criteria as given
-         * @param criteria      List of criteria to search for
+         * @param s                     Search that is used as an example to search for
          * @return                      Search that has this criteria, or null if no such search is found.
          */
-        protected Search retrieveSearchByCriteria( List criteria, SearchMode searchMode = SearchMode.and ) {
+        protected Search retrieveSearch( Search s ) {
                 if( !session.queries )
                         return null
 
-                if( !criteria )
-                        return null
-
                 for( query in session.queries ) {
-                        def key = query.key;
                         def value = query.value;
 
-                        if( value.searchMode == searchMode && value.criteria && value.criteria.containsAll( criteria ) && criteria.containsAll( value.criteria ) ) {
-                                return value;
-                        }
+                        if( s.equals( value ) )
+                                return value
                 }