From a99b08c076575e352fd35a9af0864370486901f1 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 3 Aug 2017 18:17:55 +0200 Subject: Simplify file lookup --- archaeological_files/lookups.py | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'archaeological_files/lookups.py') diff --git a/archaeological_files/lookups.py b/archaeological_files/lookups.py index 4de713419..90b904945 100644 --- a/archaeological_files/lookups.py +++ b/archaeological_files/lookups.py @@ -11,21 +11,10 @@ class FileLookup(LookupChannel): def get_query(self, q, request): query = Q() for term in q.strip().split(' '): - subquery = ( - Q(towns__name__icontains=term) | - Q(towns__numero_insee__icontains=term) | - Q(main_town__name__icontains=term) | - Q(main_town__numero_insee__icontains=term) | - Q(name__icontains=term) | - Q(internal_reference__icontains=term) | - Q(permit_reference__icontains=term) - ) - try: - num = int(term) - subquery |= Q(year=num) | Q(numeric_reference=num) - except ValueError: - pass - query &= subquery + subquery = ( + Q(cached_label__icontains=term) + ) + query &= subquery return self.model.objects.filter(query).order_by('cached_label')[:20] def format_item_display(self, item): -- cgit v1.2.3