From a2107b9610acf3643ad17eba523ccba6ceedecd0 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Wed, 2 Jun 2010 09:55:42 +0200 Subject: [PATCH] Workaround for tagged_object_list. Reverted newtagging to its original state, Workaround in tagged_object_list, by using keys and not creating complex querysets that newtagging can't handle, fixed displaying short_html. --- apps/catalogue/models.py | 4 ++-- apps/catalogue/views.py | 44 +++++++++++++++++++++++++-------------- apps/newtagging/models.py | 17 +++++++-------- 3 files changed, 37 insertions(+), 28 deletions(-) diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py index 2097e175f..e85462e7f 100644 --- a/apps/catalogue/models.py +++ b/apps/catalogue/models.py @@ -134,7 +134,7 @@ class Book(models.Model): key = '_short_html_%s' % get_language() short_html = getattr(self, key) - if len(short_html): + if short_html and len(short_html): return mark_safe(short_html) else: tags = self.tags.filter(~Q(category__in=('set', 'theme', 'book'))) @@ -345,7 +345,7 @@ class Fragment(models.Model): def short_html(self): key = '_short_html_%s' % get_language() short_html = getattr(self, key) - if len(short_html): + if short_html and len(short_html): return mark_safe(short_html) else: book_authors = [mark_safe(u'%s' % (tag.get_absolute_url(), tag.name)) diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py index aaf57fc47..7f37ccbc2 100644 --- a/apps/catalogue/views.py +++ b/apps/catalogue/views.py @@ -100,27 +100,39 @@ def tagged_object_list(request, tags=''): l_tags = [models.Tag.objects.get(slug = 'l-' + book.slug) for book in books] fragments = models.Fragment.tagged.with_any(l_tags, fragments) - related_tags = models.Tag.objects.usage_for_queryset(fragments, counts=True, - extra={'where': ["catalogue_tag.category != 'book'"]}) - related_tags = (tag for tag in related_tags if tag not in fragment_tags) - categories = split_tags(related_tags) + # newtagging goes crazy if we just try: + #related_tags = models.Tag.objects.usage_for_queryset(fragments, counts=True, + # extra={'where': ["catalogue_tag.category != 'book'"]}) + fragment_keys = [fragment.pk for fragment in fragments] + if fragment_keys: + related_tags = models.Fragment.tags.usage(counts = True, + filters = {'pk__in': fragment_keys}, + extra={'where': ["catalogue_tag.category != 'book'"]}) + related_tags = (tag for tag in related_tags if tag not in fragment_tags) + categories = split_tags(related_tags) - objects = fragments + objects = fragments else: books = models.Book.tagged.with_all(tags).order_by() l_tags = [models.Tag.objects.get(slug = 'l-' + book.slug) for book in books] book_keys = [book.pk for book in books] - related_tags = models.Tag.objects.usage_for_queryset(books, counts=True, - extra={'where': ["catalogue_tag.category NOT IN ('set', 'book', 'theme')"]}) - related_tags = (tag for tag in related_tags if tag not in tags) - categories = split_tags(related_tags) - - fragments = models.Fragment.tagged.with_any(l_tags) - categories['theme'] = models.Tag.objects.usage_for_queryset(fragments, counts=True, - extra={'where': ["catalogue_tag.category = 'theme'"]}) - - books = books.exclude(parent__in = book_keys) - objects = books + # newtagging goes crazy if we just try: + #related_tags = models.Tag.objects.usage_for_queryset(books, counts=True, + # extra={'where': ["catalogue_tag.category NOT IN ('set', 'book', 'theme')"]}) + if book_keys: + related_tags = models.Book.tags.usage(counts=True, + filters={'pk__in': book_keys}, + extra={'where': ["catalogue_tag.category NOT IN ('set', 'book', 'theme')"]}) + categories = split_tags(related_tags) + + fragment_keys = [fragment.pk for fragment in models.Fragment.tagged.with_any(l_tags)] + if fragment_keys: + categories['theme'] = models.Fragment.tags.usage(counts=True, + filters={'pk__in': fragment_keys}, + extra={'where': ["catalogue_tag.category = 'theme'"]}) + + books = books.exclude(parent__in = book_keys) + objects = books if not objects: only_author = len(tags) == 1 and tags[0].category == 'author' diff --git a/apps/newtagging/models.py b/apps/newtagging/models.py index b70ab9a09..2055ec318 100644 --- a/apps/newtagging/models.py +++ b/apps/newtagging/models.py @@ -84,7 +84,7 @@ class TagManager(models.Manager): return self.filter(items__content_type__pk=ctype.pk, items__object_id=obj.pk) - def _get_usage(self, model, counts=False, min_count=None, extra_joins=None, extra_criteria=None, params=None, extra=None, extra_tables=None): + def _get_usage(self, model, counts=False, min_count=None, extra_joins=None, extra_criteria=None, params=None, extra=None): """ Perform the custom SQL query for ``usage_for_model`` and ``usage_for_queryset``. @@ -104,15 +104,15 @@ class TagManager(models.Manager): SELECT DISTINCT %(tag_columns)s%(count_sql)s FROM %(tag)s - INNER JOIN %(tagged_item)s AS %(tagged_item_alias)s - ON %(tag)s.id = %(tagged_item_alias)s.tag_id + INNER JOIN %(tagged_item)s + ON %(tag)s.id = %(tagged_item)s.tag_id INNER JOIN %(model)s - ON %(tagged_item_alias)s.object_id = %(model_pk)s + ON %(tagged_item)s.object_id = %(model_pk)s %%s - WHERE %(tagged_item_alias)s.content_type_id = %(content_type_id)s + WHERE %(tagged_item)s.content_type_id = %(content_type_id)s %%s %(extra_where)s - GROUP BY %(tag_columns)s, %(tag)s.id, %(tag)s.name%(extra_tables)s + GROUP BY %(tag_columns)s, %(tag)s.id, %(tag)s.name %%s ORDER BY %(tag)s.%(ordering)s ASC""" % { 'tag': qn(self.model._meta.db_table), @@ -120,11 +120,9 @@ class TagManager(models.Manager): 'tag_columns': tag_columns, 'count_sql': counts and (', COUNT(%s)' % model_pk) or '', 'tagged_item': qn(self.intermediary_table_model._meta.db_table), - 'tagged_item_alias': qn('_newtagging_' + self.intermediary_table_model._meta.db_table), 'model': model_table, 'model_pk': model_pk, 'extra_where': extra_where, - 'extra_tables': ''.join((', %s.id' % qn(table)) for table in extra_tables), 'content_type_id': ContentType.objects.get_for_model(model).pk, } @@ -202,12 +200,11 @@ class TagManager(models.Manager): extra_joins = ' '.join(queryset.query.get_from_clause()[0][1:]) where, params = queryset.query.where.as_sql() - extra_tables = queryset.query.extra_tables if where: extra_criteria = 'AND %s' % where else: extra_criteria = '' - return self._get_usage(queryset.model, counts, min_count, extra_joins, extra_criteria, params, extra, extra_tables=extra_tables) + return self._get_usage(queryset.model, counts, min_count, extra_joins, extra_criteria, params, extra) def related_for_model(self, tags, model, counts=False, min_count=None, extra=None): """ -- 2.20.1