Fix the random page to not assume 1-based, no gap indexes

[djsite.git] / quotes / views.py

diff --git a/quotes/views.py b/quotes/views.py
index 9ff7aacc996bd07db6077490ace90d4b8c7b9d7d..642cb433581d953dcd1fced549bd7a784ebd394d 100644 (file)
--- a/quotes/views.py
+++ b/quotes/views.py
@@ -5,7 +5,6 @@ from random import randint
 from quotes.models import Author, Work, Quote, QuoteTag
 from quotes import search
 from quotes import tagcloud
 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):
 
 # create your views here.
 def index(request):


@@ -13,13 +12,17 @@ def index(request):
 
 def onequote(request, quote_id):
     q = Quote.objects.get(id=quote_id)
 
 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)
+    return _onequote(request, q)

 
 def random(request):
     count = Quote.objects.count()
 
 def random(request):
     count = Quote.objects.count()

-    return onequote(request, randint(1, count))
+    q = Quote.objects.all()[randint(0, count-1)]
+    return _onequote(request, q)
+
+def _onequote(request, q):
+    q.incr_display()
+    context = { 'quote' : q }
+    return render(request, 'quotes/onequote.html', context)

 
 def tags(request, tag_id):
     tag = QuoteTag.objects.get(id=tag_id)
 
 def tags(request, tag_id):
     tag = QuoteTag.objects.get(id=tag_id)


@@ -52,10 +55,3 @@ def searchpage(request):
 def cloud(request):
     clouddata = tagcloud.build_cloud()
     return render(request, 'quotes/cloud.html', clouddata)
 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', {})