Merge branch 'master' of github.com:fnp/wolnelektury

diff --combined apps/opds/views.py
index bb38b7b,5a9e44a..ec93da1
--- 1/apps/opds/views.py
--- 2/apps/opds/views.py
+++ b/apps/opds/views.py
@@@ -259,7 -259,7 +259,7 @@@ class ByTagFeed(AcquisitionFeed)
  
      def items(self, tag):
          books = Book.tagged.with_any([tag])
-         l_tags = Tag.objects.filter(category='book', slug__in=[book.book_tag_slug() for book in books])
+         l_tags = Tag.objects.filter(category='book', slug__in=[book.book_tag_slug() for book in books.iterator()])
          descendants_keys = [book.pk for book in Book.tagged.with_any(l_tags)]
          if descendants_keys:
              books = books.exclude(pk__in=descendants_keys)
@@@ -370,11 -370,6 +370,11 @@@ class SearchFeed(AcquisitionFeed)
              author = request.GET.get('author', '')
              title = request.GET.get('title', '')
              translator = request.GET.get('translator', '')
 +
 +            # Our client didn't handle the opds placeholders
 +            if author == '{atom:author}': author = ''       
 +            if title == '{atom:title}': title = ''
 +            if translator == '{atom:contributor}': translator = ''
              categories = None
              fuzzy = False