@@ -23,11 +23,8 @@ $PYTHONPATH python /path/to/repo/djangopeoplenet/manage.py runserver TODO cleanup imports -simplify QS reduce given QS.none 404s: je.gif aq.gif - -rewrite raw sql using aggregates, where possible. README @@ -26,27 +26,7 @@ RESERVED_USERNAMES = set(( class CountryManager(models.Manager): def top_countries(self): - # Returns populated countries in order of population - from django.db import connection - cursor = connection.cursor() - cursor.execute(""" - SELECT - djangopeople_country.id, count(*) AS peoplecount - FROM - djangopeople_djangoperson, djangopeople_country - WHERE - djangopeople_country.id = djangopeople_djangoperson.country_id - GROUP BY country_id - ORDER BY peoplecount DESC - """) - rows = cursor.fetchall() - found = self.in_bulk([r[0] for r in rows]) - countries = [] - for row in rows: - country = found[row[0]] - country.peoplecount = row[1] - countries.append(country) - return countries + return self.get_query_set().order_by('-num_people') class Country(models.Model): # Longest len('South Georgia and the South Sandwich Islands') = 44 @@ -78,28 +58,7 @@ class Country(models.Model): def top_regions(self): # Returns populated regions in order of population - from django.db import connection - cursor = connection.cursor() - cursor.execute(""" - SELECT - djangopeople_region.id, count(*) AS peoplecount - FROM - djangopeople_djangoperson, djangopeople_region - WHERE - djangopeople_region.id = djangopeople_djangoperson.region_id - AND - djangopeople_region.country_id = %d - GROUP BY djangopeople_djangoperson.region_id - ORDER BY peoplecount DESC - """ % self.id) - rows = cursor.fetchall() - found = Region.objects.in_bulk([r[0] for r in rows]) - regions = [] - for row in rows: - region = found[row[0]] - region.peoplecount = row[1] - regions.append(region) - return regions + return self.region_set.order_by('-num_people') class Meta: ordering = ('name',) djangopeople/models.py @@ -42,6 +42,8 @@ </div> <div class="header content"> {% block header %}<h1>Django People</h1>{% endblock %} + {% block tagline %}<h2 class="tagline">Discover users of the <a href="http://www.djangoproject.com/">Django Web framework</a> near you</h2>{% endblock %} + </div> {% block map %}{% endblock %} <div class="content"> djangopeople/templates/base.html @@ -91,7 +91,7 @@ window.onload = function() { <ul class="detailsList split"> {% for region in regions %} <li> - {% if region.flag %}<a href="/{{ country.iso_code|lower }}/{{ region.code|lower }}/" class="nobg"><img src="{% thumbnail region.flag 16x11 crop %}" alt="{{ region }}" title="{{ region }}"></a> {% endif %}<a href="/{{ country.iso_code|lower }}/{{ region.code|lower }}/"><strong>{{ region }}</strong></a> {{ region.peoplecount }} {% ifequal region.peoplecount 1 %}person{% else %}people{% endifequal %} + {% if region.flag %}<a href="/{{ country.iso_code|lower }}/{{ region.code|lower }}/" class="nobg"><img src="{% thumbnail region.flag 16x11 crop %}" alt="{{ region }}" title="{{ region }}"></a> {% endif %}<a href="/{{ country.iso_code|lower }}/{{ region.code|lower }}/"><strong>{{ region }}</strong></a> {{ region.num_people }} {% ifequal region.num_people 1 %}person{% else %}people{% endifequal %} </li> {% endfor %} </ul> djangopeople/templates/country.html @@ -89,9 +89,8 @@ var loading = false; {% endblock %} {% block content %} - <p class="mapnote">Showing {{ recent_people|length }} recent signups (out of {{ total_people }}){% if user.is_anonymous %} - if you're a Django developer, why not <a href="/signup/">add yourself</a> to the site?{% endif %}</p> - <h2 class="tagline">Discover users of the <a href="http://www.djangoproject.com/">Django Web framework</a> near you</h2> -  + </ul> <ul class="detailsList split"> {% for country in countries %} <li> - <a href="/{{ country.iso_code|lower }}/" class="nobg"><img src="/static/img/flags/{{ country.iso_code|lower }}.gif" alt="{{ country }}" title="{{ country }}"></a> <a href="/{{ country.iso_code|lower }}/"><strong>{{ country }}</strong></a> {{ country.peoplecount }} {% ifequal country.peoplecount 1 %}person{% else %}people{% endifequal %} + <a href="/{{ country.iso_code|lower }}/" class="nobg"><img src="/static/img/flags/{{ country.iso_code|lower }}.gif" alt="{{ country }}" title="{{ country }}"></a> <a href="/{{ country.iso_code|lower }}/"><strong>{{ country }}</strong></a> {{ country.num_people }} {% ifequal country.num_people 1 %}person{% else %}people{% endifequal %} </li> {% endfor %} </ul> djangopeople/templates/index.html @@ -36,10 +36,9 @@ def must_be_owner(view): return inner def index(request): - recent_people = list(DjangoPerson.objects.all().select_related().order_by('-id')[:100]) + recent_people_limited = DjangoPerson.objects.all().select_related().order_by('-id')[:4] return render(request, 'index.html', { - 'recent_people': recent_people, - 'recent_people_limited': recent_people[:4], + 'recent_people_limited': recent_people_limited, 'total_people': DjangoPerson.objects.count(), 'api_key': settings.GOOGLE_MAPS_API_KEY, 'countries': Country.objects.top_countries(), djangopeople/views.py 86b999e7bbd7228e6e4507b613a3e809ae2af4c0 Jeremy Dunck jdunck@gmail.com http://github.com/simonw/djangopeople.net/commit/50a37e274f6c0170a1dbe5cabaaf2f6fc6359fc6 50a37e274f6c0170a1dbe5cabaaf2f6fc6359fc6

2009-09-12T14:22:34-07:00

2009-09-12T03:58:43-07:00

Removed spurious cursor.executes, since num_peopel is denormalized. Signed-off-by: Simon Willison <simon@simonwillison.net> 2c8d3e872d7b42880b70e0ecd0c6f48e332d9798 Simon Willison simon@simonwillison.net