use Queryset

VoSeq · May 1, 2017 · ed5cf99 · ed5cf99
1 parent 19a0336
commit ed5cf99
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/voseq/public_interface/forms.py b/voseq/public_interface/forms.py
@@ -6,7 +6,7 @@
 from haystack.query import SearchQuerySet
 from Bio.Alphabet import IUPAC
 
-from public_interface.models import Genes
+from public_interface.models import Genes, Vouchers
 
 
 DateInput = partial(forms.DateInput, {'class': 'datepicker form-control',
@@ -151,7 +151,9 @@ def search(self):
         keywords, sequence_keywords = self.clean_search_keywords()
         sqs = ''
         if keywords and not sequence_keywords:
-            sqs = SearchQuerySet().using('vouchers').filter(**keywords)
+            sqs = Vouchers.objects.filter(**keywords)
+            # print(results)
+            # sqs = SearchQuerySet().using('vouchers').filter(**keywords)
         elif sequence_keywords and not keywords:
             sqs = SearchQuerySet().using('advanced_search').filter(
                 **sequence_keywords)

diff --git a/voseq/public_interface/views.py b/voseq/public_interface/views.py
@@ -10,6 +10,7 @@
 from django.shortcuts import render
 from django.shortcuts import redirect
 from django.conf import settings
+from django.views.generic.list import ListView
 
 from haystack.forms import SearchForm
 from haystack.query import ValuesSearchQuerySet
@@ -145,17 +146,28 @@ def search_advanced(request):
 
         if form.is_valid():
             sqs = form.search()
+            """
             search_view = VoSeqSearchView(
                 url_encoded_query=request.GET.urlencode(),
                 template='public_interface/search_results.html',
                 searchqueryset=sqs,
                 form_class=AdvancedSearchForm,
             )
+            """
 
             if sqs is not None:
-                search_view.__call__(request)
-                search_view.query = sqs.query
-                return search_view.create_response()
+                return render(
+                    request,
+                    'public_interface/search_results.html',
+                    {
+                        'username': username,
+                        'voucher_code_list': sqs,
+                        'simple_query': "self.simple_query",
+                        'url_encoded_query': "self.url_encoded_query",
+                        'result_count': len(sqs),
+                        'version': version,
+                        'stats': stats,
+                })
             else:
                 return render(request, 'public_interface/search_results.html',
                               {