Changeset 1902

Timestamp:

May 31, 2011, 10:09:18 AM (11 years ago)

Author:

robert@…

Message:

Resolving issues with searching (#446)

Location:

trunk/src/groovy/dbnp/query

Files:

• Criterion.groovy (modified) (1 diff)
• Search.groovy (modified) (1 diff)

trunk/src/groovy/dbnp/query/Criterion.groovy

@@ -313 +313 @@
                         if( 
                                 ( fieldName == "template" ) ||
-                                ( objectToSearchIn == "subject" && fieldName == "species" ) || 
-                                ( objectToSearchIn == "sample" && fieldName == "material" ) ||
-                                ( objectToSearchIn == "assay" && fieldName == "module" ) ||
-                                ( objectToSearchIn == "samplingEvent" && fieldName == "sampleTemplate" ) ) {
+                                ( objectToSearchIn.toLowerCase() == "subject" && fieldName.toLowerCase() == "species" ) || 
+                                ( objectToSearchIn.toLowerCase() == "sample" && fieldName.toLowerCase() == "material" ) ||
+                                ( objectToSearchIn.toLowerCase() == "assay" && fieldName.toLowerCase() == "module" ) ||
+                                ( objectToSearchIn.toLowerCase() == "samplingevent" && fieldName.toLowerCase() == "sampletemplate" ) ) {
                                 fieldName += ".name"
                         }

trunk/src/groovy/dbnp/query/Search.groovy

@@ -339 +339 @@
                         
                         // If there are entities matching these criteria, put a where clause in the full HQL query 
-                        if( entities ) {
+                        if( entities && entities.findAll { it } ) {
                                 // Find criteria that match one or more 'complex' fields
                                 // These criteria must be checked extra, since they are not correctly handled