random fixes

[wolnelektury.git] / apps / opds / views.py

diff --git a/apps/opds/views.py b/apps/opds/views.py
index c907fe1..4f1bec0 100644 (file)
--- 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.
 #
 # 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
 import os.path
 from urlparse import urljoin

-from urllib2 import unquote

 
 from django.contrib.syndication.views import Feed
 from django.core.urlresolvers import reverse
 
 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 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
 from lucene import Term, QueryWrapperFilter, TermQuery
 
 import re


@@ -187,10 +185,10 @@ class AcquisitionFeed(Feed):
             return u''
 
     def item_enclosure_url(self, book):
             return u''
 
     def item_enclosure_url(self, book):

-        return full_url(book.root_ancestor.epub_file.url)
+        return full_url(book.epub_file.url)

 
     def item_enclosure_length(self, book):
 
     def item_enclosure_length(self, book):

-        return book.root_ancestor.epub_file.size
+        return book.epub_file.size

 
 @piwik_track
 class RootFeed(Feed):
 
 @piwik_track
 class RootFeed(Feed):


@@ -376,7 +374,7 @@ class SearchFeed(AcquisitionFeed):
             fuzzy = False
 
 
             fuzzy = False
 
 

-        srch = MultiSearch()
+        srch = Search()

         hint = srch.hint()
 
         # Scenario 1: full search terms provided.
         hint = srch.hint()
 
         # Scenario 1: full search terms provided.