X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/0afa8ce8f8858c875404136d81dfb1645aeac19f..3cfabcc9207625d205bacdb169a0661d9579e849:/apps/catalogue/views.py?ds=sidebyside diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py index 6b60dc0fd..7bb82fd4a 100644 --- a/apps/catalogue/views.py +++ b/apps/catalogue/views.py @@ -378,11 +378,21 @@ def find_best_matches(query, user=None): raise ValueError("query must have at least two characters") result = tuple(_tags_starting_with(query, user)) + # remove pdcounter stuff + book_titles = set(match.pretty_title().lower() for match in result + if isinstance(match, models.Book)) + authors = set(match.name.lower() for match in result + if isinstance(match, models.Tag) and match.category=='author') + result = (res for res in result if not ( + (isinstance(res, pdcounter_models.BookStub) and res.pretty_title().lower() in book_titles) + or (isinstance(res, pdcounter_models.Author) and res.name.lower() in authors) + )) + exact_matches = tuple(res for res in result if res.name.lower() == query) if exact_matches: return exact_matches else: - return result[:1] + return tuple(result)[:1] def search(request):