diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-08-03 18:17:55 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-08-03 18:17:55 +0200 |
commit | 0ca22e0cbd7560684926dd7d67920216f02218e0 (patch) | |
tree | 7afc75915bdce2f5fcff40f89b1ec9eb8902e42e | |
parent | 1df2033c836d763e0ec85501e26ace2abbd05edf (diff) | |
download | Ishtar-0ca22e0cbd7560684926dd7d67920216f02218e0.tar.bz2 Ishtar-0ca22e0cbd7560684926dd7d67920216f02218e0.zip |
Simplify file lookup
-rw-r--r-- | archaeological_files/lookups.py | 19 |
1 files changed, 4 insertions, 15 deletions
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): |