X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/08bd2b6b6557481ecbb64b2f07db0d3d9784d9bb..0bd2c341a8b55f817c2e193a6c4658d52ef95961:/apps/catalogue/views.py?ds=sidebyside diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py index fd66da9dd..65b9c6c51 100644 --- a/apps/catalogue/views.py +++ b/apps/catalogue/views.py @@ -239,50 +239,41 @@ def tagged_object_list(request, tags=''): 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,