Skip to content

Commit

Permalink
Use fq_list passthrough for legacy solr compatiblity with multiple ex…
Browse files Browse the repository at this point in the history
…clusion tags.
  • Loading branch information
TkTech committed Sep 21, 2016
1 parent 19f688e commit 09522cf
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion ckan/controllers/package.py
Expand Up @@ -206,6 +206,7 @@ def pager_url(q=None, page=None):
c.fields_grouped = {}
search_extras = {}
fq = []
fq_list = []
# FIXME: This seems moderately insane - it treats *every* argument
# to the URL as a fq filter. We should have more knowledge of what
# we expect to see passed in, no need to guess.
Expand Down Expand Up @@ -239,7 +240,7 @@ def pager_url(q=None, page=None):
)

# Tag each value with a domain so we can act on it later.
fq.append('{{!tag={p}}}{p}:{v}'.format(
fq_list.append('{{!tag={p}}}{p}:{v}'.format(
p=param,
v=filter_value
))
Expand Down Expand Up @@ -292,6 +293,7 @@ def pager_url(q=None, page=None):
data_dict = {
'q': q,
'fq': ' '.join(fq),
'fq_list': fq_list,
'facet.field': [
# When faceting, exclude the facet group from the facet
# counts. This lets us always get a count back, rather than
Expand Down

0 comments on commit 09522cf

Please sign in to comment.