X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=quotes%2Fviews.py;h=9ff7aacc996bd07db6077490ace90d4b8c7b9d7d;hb=5a0c0284b85a13255f86513565d145ebecfa9637;hp=615719209327f58096622d8b3d5e8b51d3928c98;hpb=45be55604156dc0064aa32ea508df0d90ac5a17a;p=djsite.git

diff --git a/quotes/views.py b/quotes/views.py
index 6157192..9ff7aac 100644
--- a/quotes/views.py
+++ b/quotes/views.py
@@ -1,32 +1,61 @@
 from django.shortcuts import render
-from django.http import HttpResponse
-from django.template import loader
 
 from random import randint
 
-from .models import Author, Quote, Tag
+from quotes.models import Author, Work, Quote, QuoteTag
+from quotes import search
+from quotes import tagcloud
+from quotes.massimport import domassimport
+
+# 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, 'quotations/onequote.html', context)
+    return render(request, 'quotes/onequote.html', context)
 
 def random(request):
     count = Quote.objects.count()
     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, 'quotations/tag.html', context)
+    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, 'quotations/author.html', context)
+    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)
 
 def all(request):
     quotes = Quote.objects.all()
     context = { 'quotes' : quotes }
-    return render(request, 'quotations/all.html', context)
+    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', clouddata)
+
+def massimport(request):
+    if 'quotes' in request.POST:
+        resultcontext = domassimport(request.POST['quotes'])
+        return render(request, 'quotes/domassimport.html', resultcontext)
+    else:
+        return render(request, 'quotes/massimport.html', {})