Merge pull request #9 from aniversarioperu/haystack

Haystack

manolo/apps/visitors/forms.py

@@ -0,0 +1,19 @@
+from haystack.forms import HighlightedSearchForm
+
+
+class ManoloForm(HighlightedSearchForm):
+    def search(self):
+        sqs = super(ManoloForm, self).search()
+
+        if not self.is_valid():
+            return self.no_query_found()
+
+        if not self.cleaned_data.get('q'):
+            return self.no_query_found()
+
+        sqs = self.searchqueryset.auto_query(self.cleaned_data['q']).order_by('-date')
+
+        if self.load_all:
+            sqs = sqs.load_all()
+
+        return sqs

manolo/apps/visitors/search_indexes.py

@@ -4,7 +4,7 @@
 
 class VisitorIndex(indexes.SearchIndex, indexes.Indexable):
     text = indexes.CharField(document=True, use_template=True)
-    date = indexes.DateField(model_attr='date')
+    date = indexes.DateField(model_attr='date', null=True)
 
     def get_model(self):
         return Visitor

manolo/apps/visitors/views.py

@@ -7,11 +7,27 @@
 from django.http import Http404
 from haystack.query import SearchQuerySet
 
+from visitors.forms import ManoloForm
+
 
 def index(request):
     return render(request, "index.html")
 
 
+def search(request):
+    form = ManoloForm(request.GET)
+    query = request.GET['q']
+    all_items = form.search()
+    paginator, page = do_pagination(request, all_items)
+    return render(request, "search/search.html",
+                  {
+                      "paginator": paginator,
+                      "page": page,
+                      "query": query,
+                  }
+                  )
+
+
 def search_date(request):
     if 'q' in request.GET:
         query = request.GET['q']

manolo/templates/search/search.html

@@ -19,6 +19,7 @@ <h4>Manolo es un buscador de personas que visitan entidades del Estado peruano</
                <label class="sr-only" for="query">Keyword</label>
                  <input style="width:250px;" type="text" id="query" name="q"
                                  class="form-control"
+                                 value="{{ query }}"
                                  placeholder="Tipea persona o palabra clave">
              </div>
                <button type="submit" class="btn btn-info" id="search_button">

manolo/urls.py

@@ -17,7 +17,8 @@
     # Uncomment the next line to enable the admin:
     url(r'^admin/', include(admin.site.urls)),
     url(r'^search_date/$', views.search_date),
-    url(r'^search/', include('haystack.urls')),
+    url(r'^search/', views.search, name='search_view'),
+    # url(r'^search/', include('haystack.urls')),
     url(r'^$', include('visitors.urls', namespace="visitors")),
 ) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 

requirements/base.txt

@@ -4,7 +4,7 @@
 
 pyprind==2.9.1
 Whoosh==2.6.0
-psycopg2==2.5.4
+psycopg2==2.6.0
 Django==1.7.4
 Jinja2==2.7.3
 MarkupSafe==0.23
@@ -21,5 +21,5 @@ django-model-utils==2.2
 docutils==0.12
 python-slugify==0.1.0
 six==1.9
-elasticsearch==1.3.0
+elasticsearch==1.4.0
 wheel==0.24.0