X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/cb91a32c4411dcc5bd3b433536fea0dea64ea493..978606e5eeeb0f0d3cfaeecf378afa983a4a7b11:/apps/opds/views.py?ds=sidebyside

diff --git a/apps/opds/views.py b/apps/opds/views.py
index cd91a743f..e01c17283 100644
--- a/apps/opds/views.py
+++ b/apps/opds/views.py
@@ -2,10 +2,8 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
-from base64 import b64encode
 import os.path
 from urlparse import urljoin
-from urllib2 import unquote
 
 from django.contrib.syndication.views import Feed
 from django.core.urlresolvers import reverse
@@ -18,7 +16,7 @@ from django.contrib.sites.models import Site
 from basicauth import logged_in_or_basicauth, factory_decorator
 from catalogue.models import Book, Tag
 
-from search import MultiSearch, SearchResult, JVM
+from search import Search, SearchResult, JVM
 from lucene import Term, QueryWrapperFilter, TermQuery
 
 import re
@@ -187,19 +185,19 @@ class AcquisitionFeed(Feed):
             return u''
 
     def item_enclosure_url(self, book):
-        return full_url(book.root_ancestor.epub_file.url)
+        return full_url(book.epub_file.url) if book.epub_file else None
 
     def item_enclosure_length(self, book):
-        return book.root_ancestor.epub_file.size
+        return book.epub_file.size if book.epub_file else None
 
 @piwik_track
 class RootFeed(Feed):
     feed_type = OPDSFeed
     title = u'Wolne Lektury'
-    link = u'http://www.wolnelektury.pl/'
+    link = u'http://wolnelektury.pl/'
     description = u"Spis utworów na stronie http://WolneLektury.pl"
     author_name = u"Wolne Lektury"
-    author_link = u"http://www.wolnelektury.pl/"
+    author_link = u"http://wolnelektury.pl/"
 
     def items(self):
         return _root_feeds
@@ -216,10 +214,10 @@ class RootFeed(Feed):
 @piwik_track
 class ByCategoryFeed(Feed):
     feed_type = OPDSFeed
-    link = u'http://www.wolnelektury.pl/'
+    link = u'http://wolnelektury.pl/'
     description = u"Spis utworów na stronie http://WolneLektury.pl"
     author_name = u"Wolne Lektury"
-    author_link = u"http://www.wolnelektury.pl/"
+    author_link = u"http://wolnelektury.pl/"
 
     def get_object(self, request, category):
         feed = [feed for feed in _root_feeds if feed['category']==category]
@@ -234,7 +232,7 @@ class ByCategoryFeed(Feed):
         return feed['title']
 
     def items(self, feed):
-        return (tag for tag in Tag.objects.filter(category=feed['category']) if tag.get_count() > 0)
+        return Tag.objects.filter(category=feed['category']).exclude(book_count=0)
 
     def item_title(self, item):
         return item.name
@@ -276,7 +274,7 @@ class UserFeed(Feed):
     link = u'http://www.wolnelektury.pl/'
     description = u"Półki użytkownika na stronie http://WolneLektury.pl"
     author_name = u"Wolne Lektury"
-    author_link = u"http://www.wolnelektury.pl/"
+    author_link = u"http://wolnelektury.pl/"
 
     def get_object(self, request):
         return request.user
@@ -285,7 +283,7 @@ class UserFeed(Feed):
         return u"Półki użytkownika %s" % user.username
 
     def items(self, user):
-        return (tag for tag in Tag.objects.filter(category='set', user=user) if tag.get_count() > 0)
+        return Tag.objects.filter(category='set', user=user).exclude(book_count=0)
 
     def item_title(self, item):
         return item.name
@@ -332,7 +330,11 @@ class SearchFeed(AcquisitionFeed):
     def get_object(self, request):
         """
         For OPDS 1.1 We should handle a query for search terms
-        and atom:author, atom:contributor, atom:title
+        and criteria provided either as opensearch or 'inline' query.
+        OpenSearch defines fields: atom:author, atom:contributor (treated as translator),
+        atom:title. Inline query provides author, title, categories (treated as book tags),
+        description (treated as content search terms).
+        
         if search terms are provided, we shall search for books
         according to Hint information (from author & contributror & title).
 
@@ -372,7 +374,7 @@ class SearchFeed(AcquisitionFeed):
             fuzzy = False
 
 
-        srch = MultiSearch()
+        srch = Search()
         hint = srch.hint()
 
         # Scenario 1: full search terms provided.
@@ -382,7 +384,7 @@ class SearchFeed(AcquisitionFeed):
 
             if author:
                 print "narrow to author %s" % author
-                hint.tags(srch.search_tags(author, filter=srch.term_filter(Term('tag_category', 'author'))))
+                hint.tags(srch.search_tags(author, filt=srch.term_filter(Term('tag_category', 'author'))))
 
             if translator:
                 print "filter by translator %s" % translator
@@ -399,7 +401,7 @@ class SearchFeed(AcquisitionFeed):
             if title:
                 print "hint by book title %s" % title
                 q = srch.make_phrase(srch.get_tokens(title, field='title'), field='title')
-                hint.books(*srch.search_books(q, filter=flt))
+                hint.books(*srch.search_books(q, filt=flt))
 
             toks = srch.get_tokens(query)
             print "tokens: %s" % toks
@@ -426,7 +428,7 @@ class SearchFeed(AcquisitionFeed):
                         srch.make_phrase(srch.get_tokens(q, field=fld), field=fld)))
 
             flt = srch.chain_filters(filters)
-            books = srch.search_books(TermQuery(Term('is_book', 'true')), filter=flt)
+            books = srch.search_books(TermQuery(Term('is_book', 'true')), filt=flt)
             return books
 
     def get_link(self, query):