@@ -1110,7 +1110,7 @@ def parse_partition_string(partition):
11101110 return part_str
11111111
11121112
1113- def parse_partition_att_strings (query_sets , partition , join ):
1113+ def parse_partition_att_strings (query_sets , partition , join_with_child ):
11141114 attStrA = []
11151115 filt2D = partition ['filt' ]
11161116 for i in range (0 , len (filt2D )):
@@ -1133,19 +1133,19 @@ def parse_partition_att_strings(query_sets, partition, join):
11331133 else :
11341134 tmpA .append ('NOT (' + filtStr + ')' )
11351135 attStr = ' AND ' .join (tmpA )
1136- if join :
1136+ if join_with_child :
11371137 attStr = attStr .replace ('"' ,'\\ "' )
11381138 attStr = '_query_:"{!join to=StudyInstanceUID from=StudyInstanceUID}' + attStr + '"'
11391139
11401140 attStrA .append (attStr )
11411141 return attStrA
11421142
11431143
1144- def create_cart_query_string (query_list , partitions , join ):
1144+ def create_cart_query_string (query_list , partitions , join_with_child ):
11451145 solrA = []
11461146 for i in range (len (partitions )):
11471147 cur_part = partitions [i ]
1148- cur_part_attr_strA = parse_partition_att_strings (query_list , cur_part , join )
1148+ cur_part_attr_strA = parse_partition_att_strings (query_list , cur_part , join_with_child )
11491149 cur_part_str = parse_partition_string (cur_part )
11501150 for j in range (len (cur_part_attr_strA )):
11511151 if (len (cur_part_attr_strA [j ])> 0 ):
@@ -2024,6 +2024,7 @@ def get_cart_data_serieslvl(filtergrp_list, partitions, field_list, limit, offse
20242024 }
20252025
20262026 query_list = []
2027+
20272028 for filtergrp in filtergrp_list :
20282029 query_set_for_filt = []
20292030 if (len (filtergrp )> 0 ):
@@ -2037,7 +2038,7 @@ def get_cart_data_serieslvl(filtergrp_list, partitions, field_list, limit, offse
20372038
20382039 query_list .append (query_string_for_filt )
20392040
2040- query_str = create_cart_query_string (query_list , partitions , False )
2041+ query_str = create_cart_query_string (query_list , partitions , True )
20412042
20422043 solr_result = query_solr (collection = image_source .name , fields = field_list , query_string = None , fqs = [query_str ],
20432044 facets = custom_facets ,sort = None , counts_only = False ,collapse_on = 'SeriesInstanceUID' , offset = offset , limit = limit , uniques = None ,
0 commit comments