Use secure transport for requirements.

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

diff --git a/apps/search/views.py b/apps/search/views.py
index 9a0b469..a508971 100644 (file)
--- a/apps/search/views.py
+++ b/apps/search/views.py
@@ -1,17 +1,18 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from django.conf import settings
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
 from django.views.decorators import cache
 from django.conf import settings
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
 from django.views.decorators import cache

-from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpResponsePermanentRedirect
+from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpResponsePermanentRedirect, JsonResponse

 from django.utils.translation import ugettext as _
 
 from catalogue.utils import split_tags
 from catalogue.models import Book, Tag, Fragment
 from pdcounter.models import Author as PDCounterAuthor, BookStub as PDCounterBook
 from django.utils.translation import ugettext as _
 
 from catalogue.utils import split_tags
 from catalogue.models import Book, Tag, Fragment
 from pdcounter.models import Author as PDCounterAuthor, BookStub as PDCounterBook

-from catalogue.views import JSONResponse
-from search import Search, SearchResult
+from search.index import Search, SearchResult

 from suggest.forms import PublishingSuggestForm
 import re
 #import enchant
 from suggest.forms import PublishingSuggestForm
 import re
 #import enchant


@@ -58,10 +59,11 @@ def did_you_mean(query, tokens):
     # return query
 
 
     # return query
 
 

+@cache.never_cache

 def hint(request):
     prefix = request.GET.get('term', '')
     if len(prefix) < 2:
 def hint(request):
     prefix = request.GET.get('term', '')
     if len(prefix) < 2:

-        return JSONResponse([])
+        return JsonResponse([], safe=False)

 
     prefix = remove_query_syntax_chars(prefix)
 
 
     prefix = remove_query_syntax_chars(prefix)
 


@@ -105,9 +107,10 @@ def hint(request):
         return HttpResponse("%s(%s);" % (callback, json.dumps(data)),
                             content_type="application/json; charset=utf-8")
     else:
         return HttpResponse("%s(%s);" % (callback, json.dumps(data)),
                             content_type="application/json; charset=utf-8")
     else:

-        return JSONResponse(data)
+        return JsonResponse(data, safe=False)

 
 
 
 

+@cache.never_cache

 def main(request):
     results = {}
 
 def main(request):
     results = {}