Fixing home and removing old search

Luan
1 parent 79e8a63d
Showing 7 changed files with 108 additions and 26 deletions Show diff stats
src/colab/deprecated/views/other.py
src/colab/urls.py
src/search/forms.py
src/search/urls.py
src/search/views.py
src/templates/home.html
src/templates/search/preview-search.html
@@ -6,12 +6,16 @@ other.py
 Created by Sergio Campos on 2012-01-10.
 """
+import datetime
+
 from django.template import RequestContext
 from django.http import HttpResponseNotAllowed
 from django.shortcuts import render_to_response
+from django.utils import timezone
 from django.utils.translation import ugettext as _
-from colab.deprecated import solrutils
+from haystack.query import SearchQuerySet
+
 from super_archives import queries
@@ -21,11 +25,21 @@ def home(request):
     latest_threads = queries.get_latest_threads()
     hottest_threads = queries.get_hottest_threads()
+    count_types = {}
+    six_months = timezone.now() - datetime.timedelta(days=180)
+    for type in ['wiki', 'thread', 'changeset', 'ticket']:
+        count_types[type] = SearchQuerySet().filter(
+            type=type,
+            modified__gte=six_months,
+        ).count()
+
     template_data = {
         'hottest_threads': hottest_threads[:6],
         'latest_threads': latest_threads[:6],
-        'type_count': solrutils.count_types(sample=1000),
-        'latest_docs': solrutils.get_latest_collaborations(6),
+        'type_count': count_types,
+        'latest_results': SearchQuerySet().all().order_by(
+            '-modified', '-created'
+        )[:6],
     }
     return render_to_response('home.html', template_data,
                               context_instance=RequestContext(request))
@@ -34,7 +48,7 @@ def home(request):
 def search(request):
     if request.method != 'GET':
         return HttpResponseNotAllowed(['GET'])
-    
+
     query = request.GET.get('q')
     sort = request.GET.get('o')
     type_ = request.GET.get('type')
@@ -42,7 +56,7 @@ def search(request):
         page_number = int(request.GET.get('p', '1'))
     except ValueError:
         page_number = 1
-    
+
     try:
         results_per_page = int(request.GET.get('per_page', 16))
     except ValueError:
-
 from django.conf.urls import patterns, include, url
 from django.conf import settings
 from django.views.generic import TemplateView
 from django.contrib import admin
-from haystack.forms import ModelSearchForm
-from haystack.query import SearchQuerySet
-from haystack.views import SearchView
 from accounts.models import User
 from search.forms import ColabSearchForm
@@ -17,14 +13,7 @@ admin.autodiscover()
 urlpatterns = patterns('',
     url(r'^$', 'colab.deprecated.views.other.home', name='home'),
-    # TODO change search to full_search with haystack
-    url(r'^search/$', 'colab.deprecated.views.other.search', name='search'),
-    url(r'^full_search/', SearchView(
-        template='search/search.html',
-        searchqueryset=SearchQuerySet(),
-        form_class=ColabSearchForm,
-    ), name='haystack_search'),
-
+    url(r'^search/', include('search.urls')),
     url(r'open-data/$', TemplateView.as_view(template_name='open-data.html'),
         name='opendata'),
@@ -12,7 +12,7 @@ from super_archives.models import Message
 class ColabSearchForm(SearchForm):
-    q = forms.CharField(label=_('Search'))
+    q = forms.CharField(label=_('Search'), required=False)
     order = forms.CharField(widget=forms.HiddenInput(), required=False)
     type = forms.CharField(required=False, label=_(u'Type'))
@@ -0,0 +1,14 @@
+from django.conf.urls import patterns, include, url
+from haystack.query import SearchQuerySet
+
+from .forms import ColabSearchForm
+from .views import ColabSearchView
+
+
+urlpatterns = patterns('',
+    url(r'^$', ColabSearchView(
+        template='search/search.html',
+        searchqueryset=SearchQuerySet(),
+        form_class=ColabSearchForm,
+    ), name='haystack_search'),
+)
-from django.shortcuts import render
+# -*- coding:utf-8 -*-
-# Create your views here.
+from django.conf import settings
+from haystack.views import SearchView
+
+
+class ColabSearchView(SearchView):
+    def extra_context(self, *args, **kwargs):
+        # Retornar todos os campos de cada tipo a serem filtrados
+        # retornar os nomes dos campos
+        # retornar os ícones dos tipos
+
+        # a critical point on the system
+        types = {
+            'wiki': {
+                'icon': 'file',
+                'fields': [
+                    'title', 'description', 'author', 'collaborators',
+                    'created', 'modified',
+                ],
+            },
+            'discussion': {
+                'icon': 'thread',
+                'fields': [
+                    'title', 'description', 'created', 'modified', 'author',
+                    'tag',
+                ],
+            },
+            'ticket': {
+                'icon': 'ticket',
+                'fields': [
+                    'title', 'description', 'milestone', 'priority',
+                    'component', 'version', 'severity', 'reporter', 'author',
+                    'status', 'keywords', 'collaborators', 'created',
+                    'modified',
+                ],
+            },
+            'changeset': {
+                'icon': 'changeset',
+                'fields': [
+                    'title', 'author', 'description', 'repository_name',
+                    'created', 'modified',
+                ],
+            },
+            'user': {
+                'icon': 'user',
+                'fields': [
+                    'title', 'description', 'username', 'name',
+                    'email', 'institution', 'role', 'google_talk', 'webpage',
+                ],
+            },
+        }
+        types = self.form.cleaned_data['type']
+        return dict(
+            types=types.split(),
+            types_str=types,
+            order_data=settings.ORDERING_DATA
+        )
@@ -27,12 +27,12 @@
          title="{% trans 'RSS - Latest collaborations' %}">
       </a>
       <ul class="message-list">
-        {% for doc in latest_docs %}
-          {% include "message-preview.html" %}
+        {% for result in latest_results %}
+          {% include "search/preview-search.html" %}
         {% endfor %}
       </ul>
       <a class="column-align"
-         href="{% url 'search' %}?o=modified+desc">
+         href="{% url 'haystack_search' %}?order=latest">
         {% trans "View more collaborations..." %}
       </a>
       <div>&nbsp;</div>
@@ -14,14 +14,18 @@
   <a href="{{ result.url }}" {% if result.description %}title="{{ result.description|escape|truncatechars:200 }}"{% endif %}>
     <span class="subject">
       <!-- a striptags filter was raising an error here because using with highlight -->
-      {% highlight result.title with query max_length "1000" %}
+      {% if query %}
+        {% highlight result.title with query max_length "1000" %}
+      {% else %}
+        {{ result.title }}
+      {% endif %}
     </span>
   </a>
 {% endif %}
 {% if result.description %}
       <!-- a striptags filter was raising an error here because using with highlight -->
-  <span class="quiet">- {% highlight result.description with query max_length "150" %}</span>
+  <span class="quiet">- {% if query %}{% highlight result.description with query max_length "150" %}{% else %}{{ result.description }}{% endif %}</span>
 {% endif %}
 {% if result.author or result.modified %}
@@ -29,7 +33,13 @@
     {% if result.author %}
       <span class="pull-left">{% trans "by" %}
         {% if result.author and result.author_url %}
-          <a href="{{ result.author_url }}">{% highlight result.author with query %}</a>
+          <a href="{{ result.author_url }}">
+            {% if query %}
+              {% highlight result.author with query %}
+            {% else %}
+              {{ result.author }}
+            {% endif %}
+          </a>
         {% else %}
           <span>{{ result.author }}</span>
         {% endif %}
	@@ -12,7 +12,7 @@ from super_archives.models import Message		@@ -12,7 +12,7 @@ from super_archives.models import Message
12		12
13		13
14	class ColabSearchForm(SearchForm):	14	class ColabSearchForm(SearchForm):
15	- q = forms.CharField(label=_('Search'))	15	+ q = forms.CharField(label=_('Search'), required=False)
16	order = forms.CharField(widget=forms.HiddenInput(), required=False)	16	order = forms.CharField(widget=forms.HiddenInput(), required=False)
17	type = forms.CharField(required=False, label=_(u'Type'))	17	type = forms.CharField(required=False, label=_(u'Type'))
18		18
@@ -0,0 +1,14 @@		@@ -0,0 +1,14 @@
	1	+from django.conf.urls import patterns, include, url
	2	+from haystack.query import SearchQuerySet
	3	+
	4	+from .forms import ColabSearchForm
	5	+from .views import ColabSearchView
	6	+
	7	+
	8	+urlpatterns = patterns('',
	9	+ url(r'^$', ColabSearchView(
	10	+ template='search/search.html',
	11	+ searchqueryset=SearchQuerySet(),
	12	+ form_class=ColabSearchForm,
	13	+ ), name='haystack_search'),
	14	+)
1	-from django.shortcuts import render	1	+# -- coding:utf-8 --
2		2
3	-# Create your views here.	3	+from django.conf import settings
		4	+from haystack.views import SearchView
		5	+
		6	+
		7	+class ColabSearchView(SearchView):
		8	+ def extra_context(self, args, *kwargs):
		9	+ # Retornar todos os campos de cada tipo a serem filtrados
		10	+ # retornar os nomes dos campos
		11	+ # retornar os ícones dos tipos
		12	+
		13	+ # a critical point on the system
		14	+ types = {
		15	+ 'wiki': {
		16	+ 'icon': 'file',
		17	+ 'fields': [
		18	+ 'title', 'description', 'author', 'collaborators',
		19	+ 'created', 'modified',
		20	+ ],
		21	+ },
		22	+ 'discussion': {
		23	+ 'icon': 'thread',
		24	+ 'fields': [
		25	+ 'title', 'description', 'created', 'modified', 'author',
		26	+ 'tag',
		27	+ ],
		28	+ },
		29	+ 'ticket': {
		30	+ 'icon': 'ticket',
		31	+ 'fields': [
		32	+ 'title', 'description', 'milestone', 'priority',
		33	+ 'component', 'version', 'severity', 'reporter', 'author',
		34	+ 'status', 'keywords', 'collaborators', 'created',
		35	+ 'modified',
		36	+ ],
		37	+ },
		38	+ 'changeset': {
		39	+ 'icon': 'changeset',
		40	+ 'fields': [
		41	+ 'title', 'author', 'description', 'repository_name',
		42	+ 'created', 'modified',
		43	+ ],
		44	+ },
		45	+ 'user': {
		46	+ 'icon': 'user',
		47	+ 'fields': [
		48	+ 'title', 'description', 'username', 'name',
		49	+ 'email', 'institution', 'role', 'google_talk', 'webpage',
		50	+ ],
		51	+ },
		52	+ }
		53	+ types = self.form.cleaned_data['type']
		54	+ return dict(
		55	+ types=types.split(),
		56	+ types_str=types,
		57	+ order_data=settings.ORDERING_DATA
		58	+ )