X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/08bd2b6b6557481ecbb64b2f07db0d3d9784d9bb..a6145bb10676f304d4a3de6789c383f1f9326055:/apps/catalogue/views.py diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py index fd66da9dd..92469d775 100644 --- a/apps/catalogue/views.py +++ b/apps/catalogue/views.py @@ -9,7 +9,7 @@ from django.conf import settings from django.core.cache import get_cache from django.template import RequestContext from django.template.loader import render_to_string -from django.shortcuts import render_to_response, get_object_or_404, redirect +from django.shortcuts import render_to_response, get_object_or_404 from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpResponsePermanentRedirect from django.core.urlresolvers import reverse from django.db.models import Q @@ -30,14 +30,14 @@ from pdcounter import views as pdcounter_views from suggest.forms import PublishingSuggestForm from picture.models import Picture, PictureArea from picture.views import picture_list_thumb -import logging + staff_required = user_passes_test(lambda user: user.is_staff) permanent_cache = get_cache('permanent') @vary_on_headers('X-Requested-With') def catalogue(request): - cache_key='catalogue.catalogue/' + get_language() + cache_key = 'catalogue.catalogue/' + get_language() output = permanent_cache.get(cache_key) if output is None: @@ -52,8 +52,8 @@ def catalogue(request): render_tag_list = lambda x: render_to_string( 'catalogue/tag_list.html', tag_list(x)) - has_pictures = lambda x: filter(lambda y: y.picture_count>0, x) - has_books = lambda x: filter(lambda y: y.book_count>0, x) + has_pictures = lambda x: filter(lambda y: y.picture_count > 0, x) + has_books = lambda x: filter(lambda y: y.book_count > 0, x) def render_split(tags): with_books = has_books(tags) with_pictures = has_pictures(tags) @@ -71,8 +71,7 @@ def catalogue(request): output[category] = render_tag_list(tags) else: output[category] = render_split(tags) - - + output['collections'] = render_to_string( 'catalogue/collection_list.html', collection_list(collections)) permanent_cache.set(cache_key, output) @@ -224,8 +223,8 @@ def tagged_object_list(request, tags=''): if area_keys: related_tags = PictureArea.tags.usage(counts=True, filters={'pk__in': area_keys}) - related_tags = (tag for tag in related_tags if tag not in fragment_tags) - + related_tags = (tag for tag in related_tags if tag not in fragment_tags) + categories = split_tags(related_tags, categories) # we want the Pictures to go first @@ -238,51 +237,42 @@ def tagged_object_list(request, tags=''): books = models.Book.tagged_top_level(tags).order_by('sort_key_author') pictures = Picture.tagged.with_all(tags).order_by('sort_key_author') - + + related_counts = {} if books.count() > 0: # get related tags from `tag_counter` and `theme_counter` - related_counts = {} tags_pks = [tag.pk for tag in tags] for book in books: for tag_pk, value in itertools.chain(book.tag_counter.iteritems(), book.theme_counter.iteritems()): if tag_pk in tags_pks: continue related_counts[tag_pk] = related_counts.get(tag_pk, 0) + value - related_tags = models.Tag.objects.filter(pk__in=related_counts.keys()) - related_tags = [tag for tag in related_tags if tag not in tags] - for tag in related_tags: - tag.count = related_counts[tag.pk] - - categories = split_tags(related_tags) - del related_tags if pictures.count() > 0: - related_counts = {} tags_pks = [tag.pk for tag in tags] for picture in pictures: for tag_pk, value in itertools.chain(picture.tag_counter.iteritems(), picture.theme_counter.iteritems()): if tag_pk in tags_pks: continue - logging.info("counting tag not in tags_pks: %d", tag_pk) related_counts[tag_pk] = related_counts.get(tag_pk, 0) + value - related_tags = models.Tag.objects.filter(pk__in=related_counts.keys()) - related_tags = [tag for tag in related_tags if tag not in tags] - for tag in related_tags: - tag.count = related_counts[tag.pk] - categories = split_tags(related_tags) - del related_tags + related_tags = models.Tag.objects.filter(pk__in=related_counts.keys()) + related_tags = [tag for tag in related_tags if tag not in tags] + + for tag in related_tags: + tag.count = related_counts[tag.pk] - logging.info("Returning %d picutres and %d books" % (pictures.count(), books.count())) - objects = SortedMultiQuerySet(pictures, books, order_by='sort_key_author') + categories = split_tags(related_tags) + del related_tags + objects = SortedMultiQuerySet(pictures, books, order_by='sort_key_author') + if not objects: only_author = len(tags) == 1 and tags[0].category == 'author' objects = models.Book.objects.none() - return render_to_response('catalogue/tagged_object_list.html', { 'object_list': objects, @@ -505,7 +495,7 @@ def find_best_matches(query, user=None): book_titles = set(match.pretty_title().lower() for match in result if isinstance(match, models.Book)) authors = set(match.name.lower() for match in result - if isinstance(match, models.Tag) and match.category=='author') + if isinstance(match, models.Tag) and match.category == 'author') result = tuple(res for res in result if not ( (isinstance(res, pdcounter_models.BookStub) and res.pretty_title().lower() in book_titles) or (isinstance(res, pdcounter_models.Author) and res.name.lower() in authors)