Merge branch 'idc-test' of https://github.com/ImagingDataCommons/IDC-Common into idc-prod-sp

Author: s-paquette

idc_collections/collex_metadata_utils.py

@@ -779,7 +779,7 @@ def get_collex_metadata(filters, fields, record_limit=3000, offset=0, counts_onl
                         collapse_on='PatientID', order_docs=None, sources=None, versions=None, with_derived=True,
                         facets=None, records_only=False, sort=None, uniques=None, record_source=None, totals=None,
                         search_child_records_by=None, filtered_needed=True, custom_facets=None, raw_format=False,
-                        default_facets=True):
+                        default_facets=True, aux_sources=None):
 
     try:
         source_type = sources.first().source_type if sources else DataSource.SOLR
@@ -817,7 +817,7 @@ def get_collex_metadata(filters, fields, record_limit=3000, offset=0, counts_onl
                 filters, fields, sources, counts_only, collapse_on, record_limit, offset, facets, records_only, sort,
                 uniques, record_source, totals, search_child_records_by=search_child_records_by,
                 filtered_needed=filtered_needed, custom_facets=custom_facets, raw_format=raw_format,
-                default_facets=default_facets
+                default_facets=default_facets,aux_sources=aux_sources
             )
         stop = time.time()
         logger.debug("Metadata received: {}".format(stop-start))
@@ -934,7 +934,7 @@ def create_query_set(solr_query, sources, source, all_ui_attrs, image_source, Da
 def get_metadata_solr(filters, fields, sources, counts_only, collapse_on, record_limit, offset=0, attr_facets=None,
                       records_only=False, sort=None, uniques=None, record_source=None, totals=None, cursor=None,
                       search_child_records_by=None, filtered_needed=True, custom_facets=None, sort_field=None,
-                      raw_format=False, default_facets=True):
+                      raw_format=False, default_facets=True, aux_sources=None):
 
     filters = filters or {}
     results = {'docs': None, 'facets': {}}
@@ -951,9 +951,15 @@ def get_metadata_solr(filters, fields, sources, counts_only, collapse_on, record
             cache_as="ui_facet_set" if not sources.contains_inactive_versions() and not attr_facets else None
         )
 
-    all_ui_attrs = fetch_data_source_attr(
-        sources, {'for_ui': True, 'for_faceting': False, 'active_only': True},
-        cache_as="all_ui_attr" if not sources.contains_inactive_versions() else None)
+    all_ui_attrs =[]
+    if aux_sources is None:
+      all_ui_attrs = fetch_data_source_attr(
+          sources, {'for_ui': True, 'for_faceting': False, 'active_only': True},
+          cache_as="all_ui_attr" if not sources.contains_inactive_versions() else None)
+    else:
+        all_ui_attrs = fetch_data_source_attr(
+            aux_sources, {'for_ui': True, 'for_faceting': False, 'active_only': True},
+            cache_as="all_ui_attr" if not sources.contains_inactive_versions() else None)
 
     source_data_types = fetch_data_source_types(sources)
 
@@ -1011,7 +1017,10 @@ def get_metadata_solr(filters, fields, sources, counts_only, collapse_on, record
                         solr_facets_filtered = {}
                     solr_facets_filtered.update(custom_facets)
 
-        query_set = create_query_set(solr_query, sources, source, all_ui_attrs, image_source, DataSetType)
+        if aux_sources is None:
+            query_set = create_query_set(solr_query, sources, source, all_ui_attrs, image_source, DataSetType)
+        else:
+            query_set = create_query_set(solr_query, aux_sources, source, all_ui_attrs, image_source, DataSetType)
 
         stop = time.time()
         logger.debug("[STATUS] Time to build Solr submission: {}s".format(str(stop-start)))