Changeset 582 for trunk/telemeta/models/query.py

Timestamp:

02/17/10 16:20:36 (7 months ago)

Author:

olivier

Message:

searching by a location now takes into account location historicity ; do not list historical countries in the geo navigator anymore ; improve geocoder, geocoding only current locations (not historical) and searchin by location alias as a fallback

Files:

• trunk/telemeta/models/query.py (modified) (5 diffs)

trunk/telemeta/models/query.py

@@ -84 +84 @@
     def by_location(self, location):
         "Find items by location"
-        return self.filter(Q(location=location) | Q(location__in=location.descendants()))
+        return self.filter(location__in=location.apparented())
            
     @staticmethod
@@ -93 +93 @@
         from telemeta.models import Location, LocationRelation
         l = self.values('location')
+        c = self.values('location__current_location')
         r = LocationRelation.objects.filter(location__in=l).values('ancestor_location')
-        return Location.objects.filter(Q(pk__in=l) | Q(pk__in=r))
+        return Location.objects.filter(Q(pk__in=l) | Q(pk__in=r) | Q(pk__in=c))
 
     def countries(self, group_by_continent=False):
@@ -102 +103 @@
             location = Location.objects.get(pk=id)
             for l in location.countries():
-                if not l in countries:
-                    countries.append(l)
+                c = l.current_location
+                if not c in countries:
+                    countries.append(c)
 
         if group_by_continent:
@@ -226 +228 @@
     def by_location(self, location):
         "Find collections by location"
-        return self.filter(Q(items__location=location) | Q(items__location__in=location.descendants())).distinct()
+        return self.filter(items__location__in=location.apparented()).distinct()
     
     def by_recording_year(self, from_year, to_year=None):
@@ -352 +354 @@
         return map
 
-    def current(self, is_current=True):
-        if is_current:
-            where = ["locations.id = locations.current_location_id"]
-        else:
-            where = ["locations.id <> locations.current_location_id"]
-
-        return self.extra(where = where);
+    def current(self):
+        return self.filter(id__in=self.values_list('current_location_id', flat=True)).distinct()
 
 class LocationManager(CoreManager):