From 0b51a4f8946178daf469bec4cbedbc02a23cf814 Mon Sep 17 00:00:00 2001 From: Hannes Ljungberg Date: Fri, 20 Mar 2020 22:01:26 +0100 Subject: Fixed #28194 -- Added support for normalization and cover density to SearchRank. --- django/contrib/postgres/search.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'django/contrib/postgres') diff --git a/django/contrib/postgres/search.py b/django/contrib/postgres/search.py index 2b2ae0c321..f1640d85ba 100644 --- a/django/contrib/postgres/search.py +++ b/django/contrib/postgres/search.py @@ -208,7 +208,10 @@ class SearchRank(Func): function = 'ts_rank' output_field = FloatField() - def __init__(self, vector, query, weights=None): + def __init__( + self, vector, query, weights=None, normalization=None, + cover_density=False, + ): if not hasattr(vector, 'resolve_expression'): vector = SearchVector(vector) if not hasattr(query, 'resolve_expression'): @@ -218,6 +221,12 @@ class SearchRank(Func): if not hasattr(weights, 'resolve_expression'): weights = Value(weights) expressions = (weights,) + expressions + if normalization is not None: + if not hasattr(normalization, 'resolve_expression'): + normalization = Value(normalization) + expressions += (normalization,) + if cover_density: + self.function = 'ts_rank_cd' super().__init__(*expressions) -- cgit v1.2.1