X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=quotes%2Fviews.py;h=01cb4e33f5ced7d73efac3edfd0ae303d26b604f;hb=5be623b47010e85eddcfa152f606822231c13456;hp=002c4e34a6b8ada081f5ffcd0ffab4663c204d7a;hpb=5c563ff1701456a2ca7108a301e4e48457475daa;p=djsite.git

diff --git a/quotes/views.py b/quotes/views.py
index 002c4e3..01cb4e3 100644
--- a/quotes/views.py
+++ b/quotes/views.py
@@ -2,11 +2,17 @@ from django.shortcuts import render
 
 from random import randint
 
-from .models import Author, Work, Quote
+from quotes.models import Author, Work, Quote, QuoteTag
+import quotes.search as search
+import quotes.tagcloud as tagcloud
+
+# create your views here.
+def index(request):
+    return render(request, 'quotes/index.html')
 
-# Create your views here.
 def onequote(request, quote_id):
     q = Quote.objects.get(id=quote_id)
+    q.incr_display()
     context = { 'quote' : q }
     return render(request, 'quotes/onequote.html', context)
 
@@ -15,17 +21,19 @@ def random(request):
     return onequote(request, randint(1, count))
 
 def tags(request, tag_id):
-    tag = Tag.objects.get(id=tag_id)
+    tag = QuoteTag.objects.get(id=tag_id)
     context = { 'tag' : tag }
     return render(request, 'quotes/tag.html', context)
 
 def author(request, author_id):
     author = Author.objects.get(id=author_id)
+    author.incr_display()
     context = { 'author' : author }
     return render(request, 'quotes/author.html', context)
 
 def work(request, work_id):
     work = Work.objects.get(id=work_id)
+    work.incr_display()
     context = { 'work': work }
     return render(request, 'quotes/work.html', context)
 
@@ -33,3 +41,13 @@ def all(request):
     quotes = Quote.objects.all()
     context = { 'quotes' : quotes }
     return render(request, 'quotes/all.html', context)
+
+def searchpage(request):
+    results = {}
+    if 'q' in request.POST:
+        results = search.search(request.POST['q'])
+    return render(request, 'quotes/search.html', results)
+
+def cloud(request):
+    clouddata = tagcloud.build_cloud()
+    return render(request, 'quotes/cloud.html', { 'cloud': clouddata })