X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/b0fadf2591f3af957c1c8e0307d0bcef9e9f8538..98062d2158ebe1f734d811691ab15e6887684281:/src/search/views.py?ds=sidebyside

diff --git a/src/search/views.py b/src/search/views.py
index e5eb3a274..b5cc0baa3 100644
--- a/src/search/views.py
+++ b/src/search/views.py
@@ -11,6 +11,7 @@ from catalogue.models import Book, Tag
 from pdcounter.models import Author
 from picture.models import Picture
 from search.index import Search, SearchResult, PictureResult
+from .forms import SearchFilters
 from suggest.forms import PublishingSuggestForm
 import re
 import json
@@ -90,14 +91,14 @@ def hint(request, mozhint=False, param='term'):
             translator = b.translator()
             if translator:
                 author_str += ' (tłum. ' + translator + ')'
-                data.append(
-                    {
-                        'label': b.title,
-                        'author': author_str,
-                        'id': b.id,
-                        'url': b.get_absolute_url()
-                    }
-                )
+            data.append(
+                {
+                    'label': b.title,
+                    'author': author_str,
+                    'id': b.id,
+                    'url': b.get_absolute_url()
+                }
+            )
 
     if mozhint:
         data = [
@@ -116,8 +117,29 @@ def hint(request, mozhint=False, param='term'):
         return JsonResponse(data, safe=False)
 
 
+
+@cache.never_cache
+def search(request):
+    filters = SearchFilters(request.GET)
+    ctx = {
+        'title': 'Wynik wyszukiwania',
+        'query': request.GET.get('q', ''),
+        'filters': filters,
+    }
+    if filters.is_valid():
+        ctx['results'] = filters.results()
+        for k, v in ctx['results'].items():
+            if v:
+                ctx['hasresults'] = True
+                break
+    return render(request, 'search/results.html', ctx)
+
+
 @cache.never_cache
 def main(request):
+    if request.EXPERIMENTS['layout'].value:
+        return search(request)
+
     query = request.GET.get('q', '')
 
     format = request.GET.get('format')