-> Fix for modality bug

Author: s-paquette

google_helpers/bigquery/bq_support.py

@@ -587,6 +587,7 @@ def insert_job_batch_and_get_results(cls, query_set):
     # Support for specifying a set of continuous numeric attributes to be presumed for BETWEEN clauses
     #
     # TODO: add support for DATETIME eg 6/10/2010
+    @staticmethod
     def build_bq_filter_and_params(filters, comb_with='AND', param_suffix=None, with_count_toggle=False,
                                    field_prefix=None, type_schema=None, case_insens=True, continuous_numerics=None):
         if field_prefix and field_prefix[-1] != ".":
@@ -675,8 +676,13 @@ def build_bq_filter_and_params(filters, comb_with='AND', param_suffix=None, with
             is_btw = re.search('_e?btwe?', attr.lower()) is not None
             attr_name = attr[:attr.rfind('_')] if re.search('_[gl]te?|_e?btwe?|_eq', attr) else attr
             if attr_name not in attr_filters:
+                operator = 'OR'
+                if 'values' in values:
+                    # This is a fully qualified attribute which needs to have its definition broken out
+                    operator = values['op']
+                    values = values['values']
                 attr_filters[attr_name] = {
-                    'OP': 'OR',
+                    'OP': operator,
                     'filters': []
                 }
             attr_filter_set = attr_filters[attr_name]['filters']
@@ -820,6 +826,11 @@ def build_bq_filter_and_params(filters, comb_with='AND', param_suffix=None, with
                     filter_string += " OR ".join(btw_filter_strings)
                     query_param = query_params
                 else:
+                    if operator == 'AND' and len(values) > 1:
+                        # If an operator is to be AND'd with more than one value we must make an intersection statement on the higher-level entity
+                        # (i.e. select for studies which have series containing both values)
+                        # That cannot be performed here
+                        logger.warning("[WARNING] Multiple-value AND clauses require an intersection statement!")
                     # Simple array param
                     query_param['parameterType']['type'] = "ARRAY"
                     query_param['parameterType']['arrayType'] = {

idc_collections/collex_metadata_utils.py

@@ -2818,13 +2818,11 @@ def get_bq_metadata(filters, fields, data_version, sources_and_attrs=None, group
         tables_in_query = []
         joins = []
         query_filters = []
-        non_related_filters = {}
         fields = [field_clauses[image_table]] if image_table in field_clauses else []
         if search_child_records_by:
             child_record_search_field = search_child_records_by
         if image_table in filter_attr_by_bq['sources']:
             filter_set = {x: filters[x] for x in filters if x in filter_attr_by_bq['sources'][image_table]['list']}
-            non_related_filters = filter_set
             if len(filter_set):
                 if may_need_intersect and len(filter_set.keys()) > 1:
                     for filter in filter_set: