From: Marcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Date: Thu, 19 Jul 2012 07:24:15 +0000 (+0200)
Subject: Merge branch 'master' into production
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/144b39a1f3d9f49e59ba083ef4c3bb0803a504ce?hp=ff055d2d24cf5bb1bc56edf6a9c8c99735caf10b

Merge branch 'master' into production
---

diff --git a/apps/opds/views.py b/apps/opds/views.py
index 136712504..8fe0b8f1b 100644
--- a/apps/opds/views.py
+++ b/apps/opds/views.py
@@ -390,8 +390,8 @@ class SearchFeed(AcquisitionFeed):
 
             if author:
                 log.info( "narrow to author %s" % author)
-                hint.tags(srch.search_tags(srch.get_phrase(srch.get_tokens(author, field='authors'), field='authors'),
-                                           filt=srch.term_filter(Term('tag_category', 'author'))))
+                hint.tags(srch.search_tags(srch.make_phrase(srch.get_tokens(author, field='authors'), field='authors'), 
+                                            filt=srch.term_filter(Term('tag_category', 'author'))))
 
             if translator:
                 log.info( "filter by translator %s" % translator)
diff --git a/lib/librarian b/lib/librarian
index bd2ad2356..5c55be51e 160000
--- a/lib/librarian
+++ b/lib/librarian
@@ -1 +1 @@
-Subproject commit bd2ad2356d916f72762de867890b5d176830f73b
+Subproject commit 5c55be51e46b296d368b86375f2f4b90ea46c00b