From 9b17cfb0130f8b8726acf90b79cfa9bbb6961cb2 Mon Sep 17 00:00:00 2001 From: smilerz Date: Fri, 28 May 2021 11:37:16 -0500 Subject: [PATCH] WIP --- cookbook/helper/recipe_search.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/cookbook/helper/recipe_search.py b/cookbook/helper/recipe_search.py index 7938d3f1d..80553121f 100644 --- a/cookbook/helper/recipe_search.py +++ b/cookbook/helper/recipe_search.py @@ -87,8 +87,7 @@ def search_recipes(request, queryset, params): ) queryset = ( queryset.annotate( - vector=search_vectors, - rank=search_rank + vector=search_vectors ) .filter( # vector=search_query @@ -96,10 +95,8 @@ def search_recipes(request, queryset, params): | Q(desc_search_vector=search_query) | Q(steps__search_vector=search_query) | Q(vector=search_query) - # adding trigrams to ingredients causes duplicate results that can't be made unique - # | Q(trigram__gt=0.2) | Q(name__istartswith=search_string) - ) + ).annotate(rank=search_rank) ) else: queryset = queryset.filter(name__icontains=search_string)