Changeset c1a2c1c for telemeta/web/base.py

Timestamp:

02/10/10 19:25:21 (3 years ago)

Author:

olivier <>

Branches:

master, crem, crem2, dev, dev2, diadems, forma, generic, instru_search, lam, nlivemulti, production, release/1.4.4, security, social, storage, test, video

Children:

12d665f

Parents:

622588f

git-author:

olivier <> (02/10/10 19:25:21)

git-committer:

olivier <> (02/10/10 19:25:21)

Message:

add autocompleted location input field to advanced search

File:

• telemeta/web/base.py (modified) (3 diffs)

telemeta/web/base.py

@@ -162 +162 @@
 
     def edit_search(self, request):
-        continents = MediaCollection.objects.list_continents()
-        countries = MediaCollection.objects.list_countries()
-        ethnic_groups = MediaItem.objects.list_ethnic_groups()
+        ethnic_groups = MediaItem.objects.all().ethnic_groups()
         return render_to_response('telemeta/search_criteria.html', 
-            {'continents': continents, 'countries': countries, 
-            'ethnic_groups': ethnic_groups})
+            {'ethnic_groups': ethnic_groups})
+
+    def complete_location(self, request, with_items=True):
+        input = request.REQUEST
+       
+        token = input['q']
+        limit = int(input['limit'])
+        if with_items:
+            locations = MediaItem.objects.all().locations()
+        else:
+            locations = Location.objects.all()
+
+        locations = locations.filter(name__istartswith=token).order_by('name')[:limit]
+        data = [unicode(l) + " (%d items)" % l.items().count() for l in locations]
+
+        return HttpResponse("\n".join(data))
 
     def search(self, request, type = None):
         """Perform a search through collections and items metadata"""
-        collections = MediaCollection.objects.all()
-        items = MediaItem.objects.all()
+        collections = MediaCollection.objects.enriched()
+        items = MediaItem.objects.enriched()
         input = request.REQUEST
         criteria = {}
@@ -183 +195 @@
                 collections.word_search('title', value), 
                 items.by_title(value)),
-            'country': lambda value: (
-                collections.by_country(value), 
-                items.filter(etat = value)),
+            'location': lambda value: (
+                collections.by_location(Location.objects.get(name=value)), 
+                items.by_location(Location.objects.get(name=value))),
             'continent': lambda value: (
                 collections.by_continent(value), 
@@ -347 +359 @@
             'country': country, 'continent': country.continents()[0]})
 
-    def get_continents_js(self, request):
-        countries = MediaCollection.objects.list_countries()
-        return render_to_response('telemeta/geo_continents.js', 
-                    {'countries': countries})
-
     def list_countries(self, request, continent):                    
         continent = Location.objects.by_flatname(continent)[0]