mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2025-12-24 02:39:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

updated comments, removed direct trigram search

Browse Source
This commit is contained in:
smilerz
2021-04-26 08:35:55 -05:00
parent 2eeb642c34
commit d4b958f821
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cookbook/helper/recipe_search.py
View File

@@ -49,15 +49,19 @@ def search_recipes(queryset, params):
search_type="websearch",
config=language,
)
# TODO make icontains a configurable option - it could eventually have performance impacts
# TODO create user options to add/remove query elements from search so that they can fine tune their own experience
# trigrams, icontains, unaccent and startswith all impact results and performance significantly
search_vectors = (
SearchVector('search_vector')
# searching instruction is extremely slow
# TODO add search vector field, GIN index and save signal to update the vector on step save
# + SearchVector('steps__instruction', weight='D', config=language)
+ SearchVector(StringAgg('steps__ingredients__food__name__unaccent', delimiter=' '), weight='B', config=language)
+ SearchVector(StringAgg('keywords__name__unaccent', delimiter=' '), weight='B', config=language))
trigram = (
TrigramSimilarity('name__unaccent', search_string)
+ TrigramSimilarity('description__unaccent', search_string)
# adding trigrams to ingredients causes duplicate results that can't be made unique
# adding trigrams to ingredients and keywords causes duplicate results that can't be made unique
# + TrigramSimilarity('steps__ingredients__food__name__unaccent', search_string)
# + TrigramSimilarity('keywords__name__unaccent', search_string)
)
@@ -69,19 +73,15 @@ def search_recipes(queryset, params):
trigram=trigram
)
.filter(
# vector=search_query
Q(vector=search_query)
| Q(trigram__gt=0.2)
# adding trigrams to ingredients causes duplicate results that can't be made unique
# | Q(trigram__gt=0.2)
| Q(name__istartswith=search_string)
)
.order_by('-rank'))
else:
queryset = queryset.filter(name__icontains=search_string)
if len(search_keywords) > 0:
if search_keywords_or == 'true':
queryset = queryset.filter(keywords__id__in=search_keywords)
else:
for k in search_keywords:
queryset = queryset.filter(keywords__id=k)
for k in search_keywords:
queryset = queryset.filter(keywords__id=k)
if len(search_foods) > 0:
if search_foods_or == 'true':