author/title match ordering in api filter-books + fix lektura/audiobook filters

[wolnelektury.git] / src / catalogue / feeds.py

diff --git a/src/catalogue/feeds.py b/src/catalogue/feeds.py
index 2411d01..0b7e4d4 100644 (file)
--- a/src/catalogue/feeds.py
+++ b/src/catalogue/feeds.py
@@ -8,6 +8,7 @@ from django.core.urlresolvers import reverse
 
 from catalogue import models
 
 
 from catalogue import models
 

+

 def absolute_url(url):
     return "http://%s%s" % (Site.objects.get_current().domain, url)
 
 def absolute_url(url):
     return "http://%s%s" % (Site.objects.get_current().domain, url)
 


@@ -51,17 +52,16 @@ class AudiobookFeed(Feed):
         return item.name
 
     def item_categories(self, item):
         return item.name
 
     def item_categories(self, item):

-        return sorted(set(author.name for author in
-                            item.book.tags.filter(category='author').iterator()))
+        return sorted(item.book.authors().values_list('name', flat=True))

 
     def item_description(self, item):
         lines = []
         artist = item.extra_info.get('artist_name', None)
         if artist is not None:
             lines.append(u'Czyta: %s' % artist)
 
     def item_description(self, item):
         lines = []
         artist = item.extra_info.get('artist_name', None)
         if artist is not None:
             lines.append(u'Czyta: %s' % artist)

-        director = item.extra_info.get('artist_name', None)
+        director = item.extra_info.get('director_name', None)

         if director is not None:
         if director is not None:

-            lines.append(u'Reżyseruje: %s' % director)
+            lines.append(u'Reżyseria: %s' % director)

         return u'<br/>\n'.join(lines)
 
     def item_link(self, item):
         return u'<br/>\n'.join(lines)
 
     def item_link(self, item):