Uses simple dictionary as backup for english dictionary

Creates search vectors with stop words if the english version is empty,
and uses a SearchQuery OR with simple and english on the view side.
This commit is contained in:
Mouse Reeve
2021-06-24 10:56:27 -07:00
parent 04c51a6598
commit deb1b9943a
2 changed files with 10 additions and 6 deletions

View File

@ -2,7 +2,7 @@
from functools import reduce
import operator
from django.contrib.postgres.search import SearchRank
from django.contrib.postgres.search import SearchRank, SearchQuery
from django.db.models import OuterRef, Subquery, F, Q
from bookwyrm import models
@ -141,6 +141,7 @@ def search_identifiers(query, *filters):
def search_title_author(query, min_confidence, *filters):
"""searches for title and author"""
query = SearchQuery(query, config="simple") | SearchQuery(query, config="english")
results = (
models.Edition.objects.annotate(rank=SearchRank("search_vector", query))
.filter(*filters, search_vector=query, rank__gt=min_confidence)