Changeset 1436 for trunk/src/groovy/dbnp

Timestamp:

Jan 24, 2011, 3:48:46 PM (10 years ago)

Author:

robert@…

Message:

Improved querying, fixed some tests and added imports of the GDT plugin

Location:

trunk/src/groovy/dbnp/query

Files:

• Criterion.groovy (modified) (2 diffs)
• SampleSearch.groovy (modified) (4 diffs)

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

@@ -93 +93 @@
                 def classname = fieldValue.class.getName();
                 classname = classname[classname.lastIndexOf( '.' ) + 1..-1].toLowerCase();
-
+                
+                println "Match " + fieldValue + " of class " + classname + " with " + this
+                
                 try {
                         switch( classname ) {
@@ -238 +240 @@
                                 rt = new RelTime( value.toString() );
                         }
-
+                        
                         return compareValues( fieldValue, this.operator, rt );
                 } catch( Exception e ) {

trunk/src/groovy/dbnp/query/SampleSearch.groovy

@@ -73 +73 @@
                 if( getEntityCriteria( 'Study' ).size() > 0 ) {
                         def studies = Study.findAll();
+                        
+                        studies = filterOnStudyCriteria( studies );
+                        
                         if( studies.size() == 0 ) {
                                 results = [];
                                 return;
                         }
-                        studies = filterOnStudyCriteria( studies );
                         
                         def c = Sample.createCriteria()
@@ -92 +94 @@
                 samples = filterOnSamplingEventCriteria( samples );
                 samples = filterOnAssayCriteria( samples );
-
+                
                 // Save matches
                 results = samples;
@@ -142 +144 @@
          */
         protected List filterOnEventCriteria( List samples ) {
+                println "Event criteria: " + getEntityCriteria( 'Event' )
                 return filterEntityList( samples, getEntityCriteria( 'Event' ), { sample, criterion ->
-                        if( !sample || !sample.parentEventGroup || !sample.parentEventGroup.events?.size() )
-                                return false
-
-                        return criterion.matchAny( sample.parentEventGroup.events );
+                        if( !sample || !sample.parentEventGroup || !sample.parentEventGroup.events || sample.parentEventGroup.events.size() == 0 )
+                                return false
+                
+                        return criterion.matchAny( sample.parentEventGroup.events.toList() );
                 });
         }
@@ -174 +177 @@
                         return [];
 
+                if( getEntityCriteria( 'Assay' ).size() == 0 )
+                        return samples
+                        
                 // There is no sample.assays property, so we have to look for assays another way: just find
                 // all assays that match the criteria