mirror of
https://github.com/TandoorRecipes/recipes.git
synced 2026-01-07 07:08:03 -05:00
WIP
This commit is contained in:
@@ -87,8 +87,7 @@ def search_recipes(request, queryset, params):
|
|||||||
)
|
)
|
||||||
queryset = (
|
queryset = (
|
||||||
queryset.annotate(
|
queryset.annotate(
|
||||||
vector=search_vectors,
|
vector=search_vectors
|
||||||
rank=search_rank
|
|
||||||
)
|
)
|
||||||
.filter(
|
.filter(
|
||||||
# vector=search_query
|
# vector=search_query
|
||||||
@@ -96,10 +95,8 @@ def search_recipes(request, queryset, params):
|
|||||||
| Q(desc_search_vector=search_query)
|
| Q(desc_search_vector=search_query)
|
||||||
| Q(steps__search_vector=search_query)
|
| Q(steps__search_vector=search_query)
|
||||||
| Q(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)
|
| Q(name__istartswith=search_string)
|
||||||
)
|
).annotate(rank=search_rank)
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
queryset = queryset.filter(name__icontains=search_string)
|
queryset = queryset.filter(name__icontains=search_string)
|
||||||
|
|||||||
Reference in New Issue
Block a user