Skip to content

Commit

Permalink
take into account that params are lists
Browse files Browse the repository at this point in the history
  • Loading branch information
David Cramer authored and David Cramer committed Dec 28, 2009
1 parent cb2f946 commit c019a35
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions djangosphinx/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -405,17 +405,17 @@ def _get_sphinx_results(self):
params = []

if self._sort:
params.append('sort=%s' % self._sort)
params.append('sort=%s' % (self._sort,))
client.SetSortMode(*self._sort)

if isinstance(self._weights, dict):
client.SetFieldWeights(self._weights)
else:
# assume its a list
client.SetWeights(map(int, self._weights))
params.append('weights=%s' % self._weights)
params.append('weights=%s' % (self._weights,))

params.append('matchmode=%s' % self._mode)
params.append('matchmode=%s' % (self._mode,))
client.SetMatchMode(self._mode)

def _handle_filters(filter_list, exclude=False):
Expand Down Expand Up @@ -468,24 +468,24 @@ def _handle_filters(filter_list, exclude=False):

# Include filters
if self._filters:
params.append('filters=%s' % self._filters)
params.append('filters=%s' % (self._filters,))
_handle_filters(self._filters)

# Exclude filters
if self._excludes:
params.append('excludes=%s' % self._excludes)
params.append('excludes=%s' % (self._excludes,))
_handle_filters(self._excludes, True)

if self._groupby:
params.append('groupby=%s' % self._groupby)
params.append('groupby=%s' % (self._groupby,))
client.SetGroupBy(self._groupby, self._groupfunc, self._groupsort)

if self._anchor:
params.append('geoanchor=%s' % self._anchor)
params.append('geoanchor=%s' % (self._anchor,))
client.SetGeoAnchor(*self._anchor)

if self._rankmode:
params.append('rankmode=%s' % self._rankmode)
params.append('rankmode=%s' % (self._rankmode,))
client.SetRankingMode(self._rankmode)

if not self._limit > 0:
Expand Down

0 comments on commit c019a35

Please sign in to comment.