From 814fd6c667b91d66b18e8383b6b9f48ccec66b14 Mon Sep 17 00:00:00 2001
From: Gregory Soutade <gregory@soutade.fr>
Date: Tue, 18 Mar 2014 20:30:17 +0100
Subject: [PATCH] Add internal post search to Dynastie

---
 dynastie/sites/blog.soutade.fr/_base.html     |  1 +
 .../sites/blog.soutade.fr/_base_post.html     |  1 +
 dynastie/templates/view_blog.html             |  4 ++
 dynastie/urls.py                              |  1 +
 dynastie/views.py                             | 37 +++++++++++++++++++
 5 files changed, 44 insertions(+)

diff --git a/dynastie/sites/blog.soutade.fr/_base.html b/dynastie/sites/blog.soutade.fr/_base.html
index 5eba06e..a89831c 100755
--- a/dynastie/sites/blog.soutade.fr/_base.html
+++ b/dynastie/sites/blog.soutade.fr/_base.html
@@ -6,6 +6,7 @@
     <meta content="Blog de Grégory Soutadé" name="description"/>
     <meta content="Dynastie" name="generator"/>
     <title>Blog de Grégory Soutadé</title>
+    <link rel="icon" type="image/png" href="/images/favicon.png" />
     <link href="/rss.xml" rel="alternate" type="application/rss+xml" title="RSS 2.0" />
     <link href="/atom.xml" rel="alternate" type="application/atom+xml" title="Atom 1.0" />
     <link href="/css/blog.css" rel="stylesheet" type="text/css"/>
diff --git a/dynastie/sites/blog.soutade.fr/_base_post.html b/dynastie/sites/blog.soutade.fr/_base_post.html
index ac30ed1..9e87521 100644
--- a/dynastie/sites/blog.soutade.fr/_base_post.html
+++ b/dynastie/sites/blog.soutade.fr/_base_post.html
@@ -8,6 +8,7 @@
     <dyn:meta name="author"/>
     <meta content="Dynastie" name="generator"/>
     <title>Blog de Grégory Soutadé</title>
+    <link rel="icon" type="image/png" href="/images/favicon.png" />
     <link href="/rss.xml" rel="alternate" type="application/rss+xml" title="RSS 2.0" />
     <link href="/atom.xml" rel="alternate" type="application/atom+xml" title="Atom 1.0" />
     <link href="/css/blog.css" rel="stylesheet" type="text/css"/>
diff --git a/dynastie/templates/view_blog.html b/dynastie/templates/view_blog.html
index ee1e985..4079ee7 100755
--- a/dynastie/templates/view_blog.html
+++ b/dynastie/templates/view_blog.html
@@ -15,6 +15,10 @@
 <br/><br/>
 <a href="/post/add/{{ blog.id }}">Add a post</a> <a href="/generate/{{ blog.id }}">Generate blog</a> <a href="/search/generate/{{ blog.id }}">Generate search index</a>
 <br/><br/>
+<form action="/blog/search/{{ blog.id }}" method="post">
+{% csrf_token %}
+<input name="text"/><input type="submit" name="search" value="Search" />
+</form>
 {% if posts|length == 0 %}
 <br/><br/>
 <b>Any post available</b><br/><br/>
diff --git a/dynastie/urls.py b/dynastie/urls.py
index 73ee258..101f9d8 100755
--- a/dynastie/urls.py
+++ b/dynastie/urls.py
@@ -40,6 +40,7 @@ urlpatterns = patterns('',
     url(r'^blog/add$',            'dynastie.views.add_blog',     name='add_blog'),
     url(r'^blog/(\d+)$',          'dynastie.views.view_blog',    name='view_blog'),
     url(r'^blog/edit/(\d+)$',     'dynastie.views.edit_blog',    name='edit_blog'),
+    url(r'^blog/search/(\d+)$',   'dynastie.views.search_blog',  name='search_blog'),
     url(r'^post/add/(\d+)$',      'dynastie.views.add_post',     name='add_post'),
     url(r'^post/edit/(\d+)$',     'dynastie.views.edit_post',    name='edit_post'),
     url(r'^post/delete/(\d+)$',   'dynastie.views.delete_post',  name='delete_post'),
diff --git a/dynastie/views.py b/dynastie/views.py
index c7d4f5f..28843cb 100755
--- a/dynastie/views.py
+++ b/dynastie/views.py
@@ -416,6 +416,43 @@ def edit_blog(request, blog_id):
 
     return render(request, 'view_blog.html', c)
 
+@login_required
+def search_blog(request, blog_id):
+    from dynastie.generators import search
+    b,_ = have_I_right(request, blog_id)
+
+    text = request.POST['text']
+
+    if text is None or text == '':
+        return HttpResponseRedirect('/blog')
+
+    s = Search()
+    post_list = s.search(b, text)
+
+    posts = []
+    if not post_list is None:
+        post_list = post_list[:50]
+        for post_id in post_list:
+            try:
+                post = Post.objects.get(pk=post_id)
+            except:
+                continue
+            if not post is None:
+                posts.append(post)
+
+    comments = Comment.objects.all()
+    dict_comments = {}
+    for comment in comments:
+        key = comment.post.id
+        if not key in dict_comments:
+            dict_comments[key] = 1
+        else:
+            dict_comments[key] = dict_comments[key] + 1
+
+    c = {'blog' : b, 'posts' : posts, 'comments' : dict_comments}
+
+    return render(request, 'search_blog.html', c)
+
 @login_required
 def add_post(request, blog_id):
     (b,_) = have_I_right(request, blog_id)