diff --git a/www/conservancy/apps/podcast/urls.py b/www/conservancy/apps/podcast/urls.py deleted file mode 100644 index 7694d9e5beff54052828b88e6d282bd85e548bdc..0000000000000000000000000000000000000000 --- a/www/conservancy/apps/podcast/urls.py +++ /dev/null @@ -1,61 +0,0 @@ -from django.conf.urls.defaults import * -from models import Podcast, PodcastTag # relative import -from conservancy.apps.staff.models import Person -from datetime import datetime - -extra_context = {} - -info_dict = { - 'queryset': Podcast.objects.all(), - 'date_field': 'pub_date', - 'extra_context': extra_context, -} - -urlpatterns = patterns('django.views.generic.date_based', - (r'^(?P\d{4})/(?P[a-z]{3})/(?P\w{1,2})/(?P[-\w]+)/$', 'object_detail', dict(info_dict, slug_field='slug')), - (r'^(?P\d{4})/(?P[a-z]{3})/(?P\w{1,2})/$', 'archive_day', info_dict), - (r'^(?P\d{4})/(?P[a-z]{3})/$', 'archive_month', info_dict), - (r'^(?P\d{4})/$', 'archive_year', dict(info_dict, - make_object_list=True)), -# FIXME HOW DO I MAKE THE SLUG WORK WITH NO DATES IN IT. -# (r'^(?P[-\w]+)/$', 'object_detail', dict(info_dict, slug_field='slug')), -) - -urlpatterns += patterns('conservancy.apps.podcast.views', - (r'^/?$', 'custom_index', dict(info_dict, paginate_by=20)), - (r'^query/$', 'query'), -) - -# Code to display authors and tags on each blog page - -def all_tags_by_use_amount(): - """Returns all tags with an added 'cnt' attribute (how many times used) - - Also sorts the tags so most-used tags appear first. - """ - - # tally use amount - retval = [] - current = None - for obj in PodcastTag.objects.filter(podcast__pub_date__lte=datetime.now(), - podcast__isnull=False).order_by('label'): - if current is not None and obj.id == current.id: - current.cnt += 1 - else: - if current is not None: - retval.append(current) - current = obj - current.cnt = 1 - if current is not None: - retval.append(current) - - # sort and return - retval.sort(key=lambda x: -x.cnt) - return retval - -# The functions are passed to the context uncalled so they will be -# called for each web request. If we want to only make these database -# queries a single time when a web server process begins, call both -# functions below (i.e. make both lines below end in '()') - -extra_context['all_tags'] = all_tags_by_use_amount