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
from ajaxable.utils import JSONResponse, AjaxableFormView
from catalogue import models
from catalogue import forms
-from catalogue.utils import split_tags, MultiQuerySet
+from catalogue.utils import split_tags, MultiQuerySet, SortedMultiQuerySet
from catalogue.templatetags.catalogue_tags import tag_list, collection_list
from pdcounter import models as pdcounter_models
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:
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)
return render_to_string('catalogue/tag_list_split.html', ctx)
output = {'theme': {}}
- output['theme'] = render_split(fragment_tags)
+ output['theme'] = render_tag_list(fragment_tags)
for category, tags in categories.items():
- output[category] = render_split(tags)
-
+ if category in ('author', 'theme'):
+ 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)
# TODO: Rewrite this hellish piece of code which tries to do everything
-def tagged_object_list(request, tags='', gallery=True, literature=True):
+def tagged_object_list(request, tags=''):
# preliminary tests and conditions
try:
tags = models.Tag.get_tag_list(tags)
raise Http404
# beginning of digestion
-
theme_is_set = [tag for tag in tags if tag.category == 'theme']
shelf_is_set = [tag for tag in tags if tag.category == 'set']
only_shelf = shelf_is_set and len(tags) == 1
if theme_is_set:
shelf_tags = [tag for tag in tags if tag.category == 'set']
fragment_tags = [tag for tag in tags if tag.category != 'set']
- if literature:
- fragments = models.Fragment.tagged.with_all(fragment_tags)
- else:
- fragments = models.Fragment.objects.none()
- if gallery:
- areas = PictureArea.tagged.with_all(fragment_tags)
- else:
- areas = PictureArea.objects.none()
+ fragments = models.Fragment.tagged.with_all(fragment_tags)
+ areas = PictureArea.tagged.with_all(fragment_tags)
- if shelf_tags and literature:
+ if shelf_tags:
books = models.Book.tagged.with_all(shelf_tags).order_by()
l_tags = models.Tag.objects.filter(category='book',
slug__in=[book.book_tag_slug() for book in books.iterator()])
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)
- object_queries.append(areas)
+
+ # we want the Pictures to go first
+ object_queries.insert(0, areas)
objects = MultiQuerySet(*object_queries)
else:
- if literature:
- if shelf_is_set:
- books = models.Book.tagged.with_all(tags)
- else:
- books = models.Book.tagged_top_level(tags)
+ if shelf_is_set:
+ books = models.Book.tagged.with_all(tags).order_by('sort_key_author')
else:
- books = models.Book.objects.none()
+ books = models.Book.tagged_top_level(tags).order_by('sort_key_author')
- if gallery:
- pictures = Picture.tagged.with_all(tags)
- else:
- pictures = Picture.objects.none()
-
- if literature and books.count() > 0:
+ 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:
+ 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
+ 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
+
+
+ objects = SortedMultiQuerySet(pictures, books, order_by='sort_key_author')
- objects = MultiQuerySet(pictures, books)
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,
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)
fnp / wolnelektury.git / blobdiff