Introduce DRF and start replacing the views.

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

diff --git a/src/opds/views.py b/src/opds/views.py
index a96bfb3..0c31cd2 100644 (file)
--- a/src/opds/views.py
+++ b/src/opds/views.py
@@ -10,7 +10,7 @@ from django.core.urlresolvers import reverse
 from django.shortcuts import get_object_or_404
 from django.utils.feedgenerator import Atom1Feed
 from django.conf import settings
 from django.shortcuts import get_object_or_404
 from django.utils.feedgenerator import Atom1Feed
 from django.conf import settings

-from django.http import Http404, HttpResponse
+from django.http import Http404

 from django.contrib.sites.models import Site
 from django.utils.functional import lazy
 
 from django.contrib.sites.models import Site
 from django.utils.functional import lazy
 


@@ -201,7 +201,7 @@ class AcquisitionFeed(Feed):
             return u''
 
     def item_enclosure_url(self, book):
             return u''
 
     def item_enclosure_url(self, book):

-        return full_url(book.epub_file.url) if book.epub_file else None
+        return full_url(book.epub_url()) if book.epub_file else None

 
     def item_enclosure_length(self, book):
         return book.epub_file.size if book.epub_file else None
 
     def item_enclosure_length(self, book):
         return book.epub_file.size if book.epub_file else None


@@ -361,9 +361,6 @@ class SearchFeed(AcquisitionFeed):
 
     ATOM_PLACEHOLDER = re.compile(r"^{(atom|opds):\w+}$")
 
 
     ATOM_PLACEHOLDER = re.compile(r"^{(atom|opds):\w+}$")
 

-    def __call__(self, *args, **kwargs):
-        return HttpResponse('Search is temporarily disabled', status=503)
-

     def get_object(self, request):
         """
         For OPDS 1.1 We should handle a query for search terms
     def get_object(self, request):
         """
         For OPDS 1.1 We should handle a query for search terms