merged in latest Mikes changes

6 files changed, 160 insertions, 88 deletions

diff --git a/forum/management/commands/once_award_badges.py b/forum/management/commands/once_award_badges.py
index 011c28fd..c26251d7 100644
--- a/forum/management/commands/once_award_badges.py
+++ b/forum/management/commands/once_award_badges.py
@@ -157,7 +157,8 @@ class Command(BaseCommand):
         """

         activity_types = ','.join('%s' % item for item in BADGE_AWARD_TYPE_FIRST.keys())

         # ORDER BY user_id, activity_type

-        query = "SELECT id, user_id, activity_type, content_type_id, object_id FROM activity WHERE is_auditted = 0 AND activity_type IN (%s) ORDER BY user_id, activity_type" % activity_types

+        query = "SELECT id, user_id, activity_type, content_type_id, object_id "+

+            "FROM activity WHERE is_auditted = 0 AND activity_type IN (%s) ORDER BY user_id, activity_type" % activity_types

 

         cursor = connection.cursor()

         try:

@@ -205,7 +206,10 @@ class Command(BaseCommand):
 

         (13, '学生', 3, '学生', '第一次提问并且有一次以上赞成票', 0, 0),

         """

-        query = "SELECT act.user_id, q.vote_up_count, act.object_id FROM activity act, question q WHERE act.activity_type = %s AND act.object_id = q.id AND act.user_id NOT IN (SELECT distinct user_id FROM award WHERE badge_id = %s)" % (TYPE_ACTIVITY_ASK_QUESTION, 13)

+        query = "SELECT act.user_id, q.vote_up_count, act.object_id FROM "+

+                    "activity act, question q WHERE act.activity_type = %s AND "+

+                    "act.object_id = q.id AND "+

+                    "act.user_id NOT IN (SELECT distinct user_id FROM award WHERE badge_id = %s)" % (TYPE_ACTIVITY_ASK_QUESTION, 13)

         cursor = connection.cursor()

         try:

             cursor.execute(query)

@@ -232,7 +236,10 @@ class Command(BaseCommand):
 

         (15, '教师', 3, '教师', '第一次回答问题并且得到一个以上赞成票', 0, 0),

         """

-        query = "SELECT act.user_id, a.vote_up_count, act.object_id FROM activity act, answer a WHERE act.activity_type = %s AND act.object_id = a.id AND act.user_id NOT IN (SELECT distinct user_id FROM award WHERE badge_id = %s)" % (TYPE_ACTIVITY_ANSWER, 15)

+        query = "SELECT act.user_id, a.vote_up_count, act.object_id FROM "+

+                    "activity act, answer a WHERE act.activity_type = %s AND "+

+                    "act.object_id = a.id AND "+

+                    "act.user_id NOT IN (SELECT distinct user_id FROM award WHERE badge_id = %s)" % (TYPE_ACTIVITY_ANSWER, 15)

         cursor = connection.cursor()

         try:

             cursor.execute(query)

@@ -257,7 +264,11 @@ class Command(BaseCommand):
         """

         (32, '学问家', 2, '学问家', '第一次回答被投赞成票10次以上', 0, 0)

         """

-        query = "SELECT act.user_id, act.object_id FROM activity act, answer a WHERE act.object_id = a.id AND act.activity_type = %s AND a.vote_up_count >= 10 AND act.user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s)" % (TYPE_ACTIVITY_ANSWER, 32)

+        query = "SELECT act.user_id, act.object_id FROM "+

+                    "activity act, answer a WHERE act.object_id = a.id AND "+

+                    "act.activity_type = %s AND "+

+                    "a.vote_up_count >= 10 AND "+

+                    "act.user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s)" % (TYPE_ACTIVITY_ANSWER, 32)

         cursor = connection.cursor()

         try:

             cursor.execute(query)

@@ -281,7 +292,11 @@ class Command(BaseCommand):
         """

         (26, '优秀市民', 2, '优秀市民', '投票300次以上', 0, 0)

         """

-        query = "SELECT count(*) vote_count, user_id FROM activity WHERE activity_type = %s OR activity_type = %s AND user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s) GROUP BY user_id HAVING vote_count >= 300" % (TYPE_ACTIVITY_VOTE_UP, TYPE_ACTIVITY_VOTE_DOWN, 26)

+        query = "SELECT count(*) vote_count, user_id FROM activity WHERE "+

+                    "activity_type = %s OR "+

+                    "activity_type = %s AND "+

+                    "user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s) "+

+                    "GROUP BY user_id HAVING vote_count >= 300" % (TYPE_ACTIVITY_VOTE_UP, TYPE_ACTIVITY_VOTE_DOWN, 26)

 

         self.__award_for_count_num(query, 26)

 

@@ -289,7 +304,11 @@ class Command(BaseCommand):
         """

         (27, '编辑主任', 2, '编辑主任', '编辑了100个帖子', 0, 0)

         """

-        query = "SELECT count(*) vote_count, user_id FROM activity WHERE activity_type = %s OR activity_type = %s AND user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s) GROUP BY user_id HAVING vote_count >= 100" % (TYPE_ACTIVITY_UPDATE_QUESTION, TYPE_ACTIVITY_UPDATE_ANSWER, 27)

+        query = "SELECT count(*) vote_count, user_id FROM activity WHERE "+

+                    "activity_type = %s OR "+

+                    "activity_type = %s AND "+

+                    "user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s) "+

+                    "GROUP BY user_id HAVING vote_count >= 100" % (TYPE_ACTIVITY_UPDATE_QUESTION, TYPE_ACTIVITY_UPDATE_ANSWER, 27)

 

         self.__award_for_count_num(query, 27)

 

@@ -297,7 +316,11 @@ class Command(BaseCommand):
         """

         (5, '评论家', 3, '评论家', '评论10次以上', 0, 0),

         """

-        query = "SELECT count(*) vote_count, user_id FROM activity WHERE activity_type = %s OR activity_type = %s AND user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s) GROUP BY user_id HAVING vote_count >= 10" % (TYPE_ACTIVITY_COMMENT_QUESTION, TYPE_ACTIVITY_COMMENT_ANSWER, 5)

+        query = "SELECT count(*) vote_count, user_id FROM activity WHERE "+

+                    "activity_type = %s OR "+

+                    "activity_type = %s AND "+

+                    "user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s) "+

+                    "GROUP BY user_id HAVING vote_count >= 10" % (TYPE_ACTIVITY_COMMENT_QUESTION, TYPE_ACTIVITY_COMMENT_ANSWER, 5)

         self.__award_for_count_num(query, 5)

 

     def __award_for_count_num(self, query, badge):

diff --git a/forum/managers.py b/forum/managers.py
index 94f58ea7..0f22c59c 100644
--- a/forum/managers.py
+++ b/forum/managers.py
@@ -4,8 +4,29 @@ from django.contrib.auth.models import User, UserManager
 from django.db import connection, models, transaction

 from django.db.models import Q

 from forum.models import *

+from urllib import quote, unquote

 

 class QuestionManager(models.Manager):

+    def get_translation_questions(self, orderby, page_size):

+        questions = self.filter(deleted=False, author__id__in=[28,29]).order_by(orderby)[:page_size]

+        return questions

+    

+    def get_questions_by_pagesize(self, orderby, page_size):

+        questions = self.filter(deleted=False).order_by(orderby)[:page_size]

+        return questions

+    

+    def get_questions_by_tag(self, tagname, orderby):

+        questions = self.filter(deleted=False, tags__name = unquote(tagname)).order_by(orderby)

+        return questions

+    

+    def get_unanswered_questions(self, orderby):

+        questions = self.filter(deleted=False, answer_count=0).order_by(orderby)

+        return questions

+    

+    def get_questions(self, orderby):

+        questions = self.filter(deleted=False).order_by(orderby)

+        return questions

+    

     def update_tags(self, question, tagnames, user):

         """

         Updates Tag associations for a question to match the given

@@ -92,7 +113,12 @@ class TagManager(models.Manager):
             'WHERE tag_id = tag.id'

         ') '

         'WHERE id IN (%s)')

-

+    

+    def get_valid_tags(self, page_size):

+      from forum.models import Tag

+      tags = Tag.objects.all().filter(deleted=False).exclude(used_count=0).order_by("-id")[:page_size]

+      return tags

+    

     def get_or_create_multiple(self, names, user):

         """

         Fetches a list of Tags with the given names, creating any Tags

@@ -123,6 +149,19 @@ class TagManager(models.Manager):
         query = self.UPDATE_USED_COUNTS_QUERY % ','.join(['%s'] * len(tags))

         cursor.execute(query, [tag.id for tag in tags])

         transaction.commit_unless_managed()

+    

+    def get_tags_by_questions(self, questions):

+        question_ids = []

+        for question in questions:

+            question_ids.append(question.id)

+

+        question_ids_str = ','.join([str(id) for id in question_ids])

+        related_tags = self.extra(

+                tables=['tag', 'question_tags'],

+                where=["tag.id = question_tags.tag_id AND question_tags.question_id IN (" + question_ids_str + ")"]

+        ).distinct()

+        

+        return related_tags

 

 class AnswerManager(models.Manager):

     GET_ANSWERS_FROM_USER_QUESTIONS = u'SELECT answer.* FROM answer INNER JOIN question ON answer.question_id = question.id WHERE question.author_id =%s AND answer.author_id <> %s'

@@ -205,4 +244,16 @@ class ReputeManager(models.Manager):
             return row[0]

 

         else:

-            return 0    
\ No newline at end of file
+            return 0    

+class AwardManager(models.Manager):

+    def get_recent_awards(self):

+        awards = super(AwardManager, self).extra(

+            select={'badge_id': 'badge.id', 'badge_name':'badge.name',

+                          'badge_description': 'badge.description', 'badge_type': 'badge.type',

+                          'user_id': 'auth_user.id', 'user_name': 'auth_user.username'

+                          },

+            tables=['award', 'badge', 'auth_user'],

+            order_by=['-awarded_at'],

+            where=['auth_user.id=award.user_id AND badge_id=badge.id'],

+        ).values('badge_id', 'badge_name', 'badge_description', 'badge_type', 'user_id', 'user_name')

+        return awards

diff --git a/forum/models.py b/forum/models.py
index aba2bf0b..570db274 100644
--- a/forum/models.py
+++ b/forum/models.py
@@ -351,7 +351,8 @@ class Award(models.Model):
     content_object = generic.GenericForeignKey('content_type', 'object_id')

     awarded_at = models.DateTimeField(default=datetime.datetime.now)

     notified   = models.BooleanField(default=False)

-

+    objects = AwardManager()

+    

     def __unicode__(self):

         return u'[%s] is awarded a badge [%s] at %s' % (self.user.username, self.badge.name, self.awarded_at)

 

diff --git a/forum/templatetags/extra_tags.py b/forum/templatetags/extra_tags.py
index de853135..1a4d3641 100644
--- a/forum/templatetags/extra_tags.py
+++ b/forum/templatetags/extra_tags.py
@@ -1,4 +1,4 @@
-import time

+import time

 import datetime

 import math

 import re

@@ -50,10 +50,10 @@ def tag_font_size(max_size, min_size, current_size):
         weight = 0

     return MIN_FONTSIZE + round((MAX_FONTSIZE - MIN_FONTSIZE) * weight)

 

-    

+

 LEADING_PAGE_RANGE_DISPLAYED = TRAILING_PAGE_RANGE_DISPLAYED = 5

 LEADING_PAGE_RANGE = TRAILING_PAGE_RANGE = 4

-NUM_PAGES_OUTSIDE_RANGE = 1 

+NUM_PAGES_OUTSIDE_RANGE = 1

 ADJACENT_PAGES = 2

 @register.inclusion_tag("paginator.html")

 def cnprog_paginator(context):

@@ -65,10 +65,10 @@ def cnprog_paginator(context):
         " Initialize variables "

         in_leading_range = in_trailing_range = False

         pages_outside_leading_range = pages_outside_trailing_range = range(0)

- 

+

         if (context["pages"] <= LEADING_PAGE_RANGE_DISPLAYED):

             in_leading_range = in_trailing_range = True

-            page_numbers = [n for n in range(1, context["pages"] + 1) if n > 0 and n <= context["pages"]]           

+            page_numbers = [n for n in range(1, context["pages"] + 1) if n > 0 and n <= context["pages"]]

         elif (context["page"] <= LEADING_PAGE_RANGE):

             in_leading_range = True

             page_numbers = [n for n in range(1, LEADING_PAGE_RANGE_DISPLAYED + 1) if n > 0 and n <= context["pages"]]

@@ -77,11 +77,11 @@ def cnprog_paginator(context):
             in_trailing_range = True

             page_numbers = [n for n in range(context["pages"] - TRAILING_PAGE_RANGE_DISPLAYED + 1, context["pages"] + 1) if n > 0 and n <= context["pages"]]

             pages_outside_trailing_range = [n + 1 for n in range(0, NUM_PAGES_OUTSIDE_RANGE)]

-        else: 

+        else:

             page_numbers = [n for n in range(context["page"] - ADJACENT_PAGES, context["page"] + ADJACENT_PAGES + 1) if n > 0 and n <= context["pages"]]

             pages_outside_leading_range = [n + context["pages"] for n in range(0, -NUM_PAGES_OUTSIDE_RANGE, -1)]

             pages_outside_trailing_range = [n + 1 for n in range(0, NUM_PAGES_OUTSIDE_RANGE)]

-            

+

         extend_url = context.get('extend_url', '')

         return {

             "base_url": context["base_url"],

@@ -205,12 +205,12 @@ def format_number(value):
         m = re.match(pattern, strValue)

     return first + result

 

-@register.simple_tag   

+@register.simple_tag

 def convert2tagname_list(question):

     question['tagnames'] = [name for name in question['tagnames'].split(u' ')]

     return ''

 

-@register.simple_tag    

+@register.simple_tag

 def diff_date(date, limen=2):

     current_time = datetime.datetime(*time.localtime()[0:6])

     diff = current_time - date

@@ -237,4 +237,4 @@ def get_latest_changed_timestamp():
         timestr = strftime("%H:%M %b-%d-%Y %Z", localtime(latest))

     except:

         timestr = ''

-    return timestr

+    return timestr
\ No newline at end of file
diff --git a/forum/user.py b/forum/user.py
index 13e9be30..233baf0c 100644
--- a/forum/user.py
+++ b/forum/user.py
@@ -1,3 +1,4 @@
+# coding=utf-8

 from django.utils.translation import ugettext as _

 class UserView:

     def __init__(self, id, tab_title, tab_description, page_title, view_name, template_file, data_size=0):

diff --git a/forum/views.py b/forum/views.py
index 25574e0b..08a0e958 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -77,29 +77,17 @@ def index(request):
         orderby = "-last_activity_at"

     # group questions by author_id of 28,29

     if view_id == 'trans':

-        questions = Question.objects.filter(deleted=False, author__id__in=[28,29]).order_by(orderby)[:INDEX_PAGE_SIZE]

+        questions = Question.objects.get_translation_questions(orderby, INDEX_PAGE_SIZE)

     else:

-        questions = Question.objects.filter(deleted=False).order_by(orderby)[:INDEX_PAGE_SIZE]

+        questions = Question.objects.get_questions_by_pagesize(orderby, INDEX_PAGE_SIZE)

     # RISK - inner join queries

-    questions = questions.select_related();

-    tags = Tag.objects.all().filter(deleted=False).exclude(used_count=0).order_by("-id")[:INDEX_TAGS_SIZE]

+    questions = questions.select_related()

+    tags = Tag.objects.get_valid_tags(INDEX_TAGS_SIZE)

 

-    awards = Award.objects.extra(

-        select={'badge_id': 'badge.id', 'badge_name':'badge.name',

-                      'badge_description': 'badge.description', 'badge_type': 'badge.type',

-                      'user_id': 'auth_user.id', 'user_name': 'auth_user.username'

-                      },

-        tables=['award', 'badge', 'auth_user'],

-        order_by=['-awarded_at'],

-        where=['auth_user.id=award.user_id AND badge_id=badge.id'],

-    ).values('badge_id', 'badge_name', 'badge_description', 'badge_type', 'user_id', 'user_name')

-

-    class testvar:

-        content = 'haha'

+    awards = Award.objects.get_recent_awards()

 

     return render_to_response('index.html', {

         "questions" : questions,

-        'testvar':testvar,

         "tab_id" : view_id,

         "tags" : tags,

         "awards" : awards[:INDEX_AWARD_SIZE],

@@ -127,29 +115,11 @@ def questions(request, tagname=None, unanswered=False):
     # Set flag to False by default. If it is equal to True, then need to be saved.

     pagesize_changed = False

     # get pagesize from session, if failed then get default value

-    user_page_size = request.session.get("pagesize", QUESTIONS_PAGE_SIZE)

-    # set pagesize equal to logon user specified value in database

-    if request.user.is_authenticated() and request.user.questions_per_page > 0:

-        user_page_size = request.user.questions_per_page

-

+    pagesize = request.session.get("pagesize")

     try:

         page = int(request.GET.get('page', '1'))

-        # get new pagesize from UI selection

-        pagesize = int(request.GET.get('pagesize', user_page_size))

-        if pagesize <> user_page_size:

-            pagesize_changed = True

-

     except ValueError:

         page = 1

-        pagesize  = user_page_size

-

-    # save this pagesize to user database

-    if pagesize_changed:

-        request.session["pagesize"] = pagesize

-        if request.user.is_authenticated():

-            user = request.user

-            user.questions_per_page = pagesize

-            user.save()

 

     view_id = request.GET.get('sort', None)

     view_dic = {"latest":"-added_at", "active":"-last_activity_at", "hottest":"-answer_count", "mostvoted":"-score" }

@@ -161,29 +131,24 @@ def questions(request, tagname=None, unanswered=False):
 

     # check if request is from tagged questions

     if tagname is not None:

-        #print datetime.datetime.now()

-        objects = Question.objects.filter(deleted=False, tags__name = unquote(tagname)).order_by(orderby)

-        #print datetime.datetime.now()

+        objects = Question.objects.get_questions_by_tag(tagname, orderby)

     elif unanswered:

         #check if request is from unanswered questions

         template_file = "unanswered.html"

-        objects = Question.objects.filter(deleted=False, answer_count=0).order_by(orderby)

+        objects = Question.objects.get_unanswered_questions(orderby)

     else:

-        objects = Question.objects.filter(deleted=False).order_by(orderby)

+        objects = Question.objects.get_questions(orderby)

 

     # RISK - inner join queries

-    objects = objects.select_related();

+    objects = objects.select_related(depth=1);

     objects_list = Paginator(objects, pagesize)

     questions = objects_list.page(page)

 

     # Get related tags from this page objects

-    related_tags = []

-    for question in questions.object_list:

-        tags = list(question.tags.all())

-        for tag in tags:

-            if tag not in related_tags:

-                related_tags.append(tag)

-

+    if questions.object_list.count() > 0:

+        related_tags = Tag.objects.get_tags_by_questions(questions.object_list)

+    else:

+        related_tags = None

     return render_to_response(template_file, {

         "questions" : questions,

         "tab_id" : view_id,

@@ -1022,6 +987,7 @@ def user_stats(request, user_id, user_view):
                         'title',

                         'author_id',

                         'accepted',

+                        'vote_count',

                         'answer_count',

                         'vote_up_count',

                         'vote_down_count')[:100]

@@ -1090,7 +1056,8 @@ def user_recent(request, user_id, user_view):
             'activity_type' : 'activity.activity_type'

             },

         tables=['activity', 'question'],

-        where=['activity.content_type_id = %s AND activity.object_id = question.id AND activity.user_id = %s AND activity.activity_type = %s'],

+        where=['activity.content_type_id = %s AND activity.object_id = ' +

+            'question.id AND activity.user_id = %s AND activity.activity_type = %s'],

         params=[question_type_id, user_id, TYPE_ACTIVITY_ASK_QUESTION],

         order_by=['-activity.active_at']

     ).values(

@@ -1114,8 +1081,8 @@ def user_recent(request, user_id, user_view):
             'activity_type' : 'activity.activity_type'

             },

         tables=['activity', 'answer', 'question'],

-        where=['activity.content_type_id = %s AND activity.object_id = answer.id '

-			     'AND answer.question_id=question.id AND activity.user_id=%s AND activity.activity_type=%s'],

+        where=['activity.content_type_id = %s AND activity.object_id = answer.id AND ' + 

+            'answer.question_id=question.id AND activity.user_id=%s AND activity.activity_type=%s'],

         params=[answer_type_id, user_id, TYPE_ACTIVITY_ANSWER],

         order_by=['-activity.active_at']

     ).values(

@@ -1140,7 +1107,9 @@ def user_recent(request, user_id, user_view):
             },

         tables=['activity', 'question', 'comment'],

 

-        where=['activity.content_type_id = %s AND activity.object_id = comment.id AND activity.user_id = comment.user_id AND comment.object_id=question.id AND comment.content_type_id=%s AND activity.user_id = %s AND activity.activity_type=%s'],

+        where=['activity.content_type_id = %s AND activity.object_id = comment.id AND '+

+            'activity.user_id = comment.user_id AND comment.object_id=question.id AND '+

+            'comment.content_type_id=%s AND activity.user_id = %s AND activity.activity_type=%s'],

         params=[comment_type_id, question_type_id, user_id, TYPE_ACTIVITY_COMMENT_QUESTION],

         order_by=['-comment.added_at']

     ).values(

@@ -1166,7 +1135,10 @@ def user_recent(request, user_id, user_view):
             },

         tables=['activity', 'question', 'answer', 'comment'],

 

-        where=['activity.content_type_id = %s AND activity.object_id = comment.id AND activity.user_id = comment.user_id AND comment.object_id=answer.id AND comment.content_type_id=%s AND question.id = answer.question_id AND activity.user_id = %s AND activity.activity_type=%s'],

+        where=['activity.content_type_id = %s AND activity.object_id = comment.id AND '+

+            'activity.user_id = comment.user_id AND comment.object_id=answer.id AND '+

+            'comment.content_type_id=%s AND question.id = answer.question_id AND '+

+            'activity.user_id = %s AND activity.activity_type=%s'],

         params=[comment_type_id, answer_type_id, user_id, TYPE_ACTIVITY_COMMENT_ANSWER],

         order_by=['-comment.added_at']

     ).values(

@@ -1192,7 +1164,9 @@ def user_recent(request, user_id, user_view):
             'summary' : 'question_revision.summary'

             },

         tables=['activity', 'question_revision'],

-        where=['activity.content_type_id = %s AND activity.object_id = question_revision.id AND activity.user_id = question_revision.author_id AND activity.user_id = %s AND activity.activity_type=%s'],

+        where=['activity.content_type_id = %s AND activity.object_id = question_revision.id AND '+

+            'activity.user_id = question_revision.author_id AND activity.user_id = %s AND '+

+            'activity.activity_type=%s'],

         params=[question_revision_type_id, user_id, TYPE_ACTIVITY_UPDATE_QUESTION],

         order_by=['-activity.active_at']

     ).values(

@@ -1220,7 +1194,10 @@ def user_recent(request, user_id, user_view):
             },

         tables=['activity', 'answer_revision', 'question', 'answer'],

 

-        where=['activity.content_type_id = %s AND activity.object_id = answer_revision.id AND activity.user_id = answer_revision.author_id AND activity.user_id = %s AND answer_revision.answer_id=answer.id AND answer.question_id = question.id AND activity.activity_type=%s'],

+        where=['activity.content_type_id = %s AND activity.object_id = answer_revision.id AND '+

+            'activity.user_id = answer_revision.author_id AND activity.user_id = %s AND '+

+            'answer_revision.answer_id=answer.id AND answer.question_id = question.id AND '+

+            'activity.activity_type=%s'],

         params=[answer_revision_type_id, user_id, TYPE_ACTIVITY_UPDATE_ANSWER],

         order_by=['-activity.active_at']

     ).values(

@@ -1246,7 +1223,9 @@ def user_recent(request, user_id, user_view):
             'activity_type' : 'activity.activity_type',

             },

         tables=['activity', 'answer', 'question'],

-        where=['activity.content_type_id = %s AND activity.object_id = answer.id AND activity.user_id = question.author_id AND activity.user_id = %s AND answer.question_id=question.id AND activity.activity_type=%s'],

+        where=['activity.content_type_id = %s AND activity.object_id = answer.id AND '+

+            'activity.user_id = question.author_id AND activity.user_id = %s AND '+

+            'answer.question_id=question.id AND activity.activity_type=%s'],

         params=[answer_type_id, user_id, TYPE_ACTIVITY_MARK_ANSWER],

         order_by=['-activity.active_at']

     ).values(

@@ -1267,7 +1246,8 @@ def user_recent(request, user_id, user_view):
             'activity_type' : 'activity.activity_type'

             },

         tables=['activity', 'award', 'badge'],

-        where=['activity.user_id = award.user_id AND activity.user_id = %s AND award.badge_id=badge.id AND activity.object_id=award.id AND activity.activity_type=%s'],

+        where=['activity.user_id = award.user_id AND activity.user_id = %s AND '+

+            'award.badge_id=badge.id AND activity.object_id=award.id AND activity.activity_type=%s'],

         params=[user_id, TYPE_ACTIVITY_PRIZE],

         order_by=['-activity.active_at']

     ).values(

@@ -1320,7 +1300,8 @@ def user_responses(request, user_id, user_view):
             },

         select_params=[user_id],

         tables=['answer', 'question', 'auth_user'],

-        where=['answer.question_id = question.id AND answer.deleted=0 AND question.deleted = 0 AND question.author_id = %s AND answer.author_id <> %s AND answer.author_id=auth_user.id'],

+        where=['answer.question_id = question.id AND answer.deleted=0 AND question.deleted = 0 AND '+

+            'question.author_id = %s AND answer.author_id <> %s AND answer.author_id=auth_user.id'],

         params=[user_id, user_id],

         order_by=['-answer.id']

     ).values(

@@ -1349,7 +1330,8 @@ def user_responses(request, user_id, user_view):
             'user_id' : 'auth_user.id'

             },

         tables=['question', 'auth_user', 'comment'],

-        where=['question.deleted = 0 AND question.author_id = %s AND comment.object_id=question.id AND comment.content_type_id=%s AND comment.user_id <> %s AND comment.user_id = auth_user.id'],

+        where=['question.deleted = 0 AND question.author_id = %s AND comment.object_id=question.id AND '+

+            'comment.content_type_id=%s AND comment.user_id <> %s AND comment.user_id = auth_user.id'],

         params=[user_id, question_type_id, user_id],

         order_by=['-comment.added_at']

     ).values(

@@ -1378,7 +1360,9 @@ def user_responses(request, user_id, user_view):
             'user_id' : 'auth_user.id'

             },

         tables=['answer', 'auth_user', 'comment', 'question'],

-        where=['answer.deleted = 0 AND answer.author_id = %s AND comment.object_id=answer.id AND comment.content_type_id=%s AND comment.user_id <> %s AND comment.user_id = auth_user.id AND question.id = answer.question_id'],

+        where=['answer.deleted = 0 AND answer.author_id = %s AND comment.object_id=answer.id AND '+

+            'comment.content_type_id=%s AND comment.user_id <> %s AND comment.user_id = auth_user.id '+

+            'AND question.id = answer.question_id'],

         params=[user_id, answer_type_id, user_id],

         order_by=['-comment.added_at']

     ).values(

@@ -1409,7 +1393,8 @@ def user_responses(request, user_id, user_view):
             },

         select_params=[user_id],

         tables=['answer', 'question', 'auth_user'],

-        where=['answer.question_id = question.id AND answer.deleted=0 AND question.deleted = 0 AND answer.author_id = %s AND answer.accepted=1 AND question.author_id=auth_user.id'],

+        where=['answer.question_id = question.id AND answer.deleted=0 AND question.deleted = 0 AND '+

+            'answer.author_id = %s AND answer.accepted=1 AND question.author_id=auth_user.id'],

         params=[user_id],

         order_by=['-answer.id']

     ).values(

@@ -1453,7 +1438,8 @@ def user_votes(request, user_id, user_view):
             },

         select_params=[user_id],

         tables=['vote', 'question', 'auth_user'],

-        where=['vote.content_type_id = %s AND vote.user_id = %s AND vote.object_id = question.id AND vote.user_id=auth_user.id'],

+        where=['vote.content_type_id = %s AND vote.user_id = %s AND vote.object_id = question.id '+

+            'AND vote.user_id=auth_user.id'],

         params=[question_type_id, user_id],

         order_by=['-vote.id']

     ).values(

@@ -1476,7 +1462,8 @@ def user_votes(request, user_id, user_view):
             },

         select_params=[user_id],

         tables=['vote', 'answer', 'question', 'auth_user'],

-        where=['vote.content_type_id = %s AND vote.user_id = %s AND vote.object_id = answer.id AND answer.question_id = question.id AND vote.user_id=auth_user.id'],

+        where=['vote.content_type_id = %s AND vote.user_id = %s AND vote.object_id = answer.id '+

+            'AND answer.question_id = question.id AND vote.user_id=auth_user.id'],

         params=[answer_type_id, user_id],

         order_by=['-vote.id']

     ).values(

@@ -1501,7 +1488,8 @@ def user_votes(request, user_id, user_view):
 def user_reputation(request, user_id, user_view):

     user = get_object_or_404(User, id=user_id)

     reputation = Repute.objects.extra(

-        select={'positive': 'sum(positive)', 'negative': 'sum(negative)', 'question_id':'question_id', 'title': 'question.title'},

+        select={'positive': 'sum(positive)', 'negative': 'sum(negative)', 'question_id':'question_id', 

+            'title': 'question.title'},

         tables=['repute', 'question'],

         order_by=['-reputed_at'],

         where=['user_id=%s AND question_id=question.id'],

@@ -1510,6 +1498,7 @@ def user_reputation(request, user_id, user_view):
 

     reputation.query.group_by = ['question_id']

 

+

     rep_list = []

     for rep in Repute.objects.filter(user=user).order_by('reputed_at'):

         dic = '[%s,%s]' % (calendar.timegm(rep.reputed_at.timetuple()) * 1000, rep.reputation)

@@ -1531,7 +1520,8 @@ def user_favorites(request, user_id, user_view):
     questions = Question.objects.extra(

         select={

             'vote_count' : 'question.vote_up_count + question.vote_down_count',

-            'favorited_myself' : 'SELECT count(*) FROM favorite_question f WHERE f.user_id = %s AND f.question_id = question.id',

+            'favorited_myself' : 'SELECT count(*) FROM favorite_question f WHERE f.user_id = %s '+

+                'AND f.question_id = question.id',

             'la_user_id' : 'auth_user.id',

             'la_username' : 'auth_user.username',

             'la_user_gold' : 'auth_user.gold',

@@ -1541,7 +1531,8 @@ def user_favorites(request, user_id, user_view):
             },

         select_params=[user_id],

         tables=['question', 'auth_user', 'favorite_question'],

-        where=['question.deleted = 0 AND question.last_activity_by_id = auth_user.id AND favorite_question.question_id = question.id AND favorite_question.user_id = %s'],

+        where=['question.deleted = 0 AND question.last_activity_by_id = auth_user.id '+

+            'AND favorite_question.question_id = question.id AND favorite_question.user_id = %s'],

         params=[user_id],

         order_by=['-vote_count', '-question.id']

     ).values('vote_count',

@@ -1672,7 +1663,12 @@ def badges(request):
 def badge(request, id):

     badge = get_object_or_404(Badge, id=id)

     awards = Award.objects.extra(

-        select={'id': 'auth_user.id', 'name': 'auth_user.username', 'rep':'auth_user.reputation', 'gold': 'auth_user.gold', 'silver': 'auth_user.silver', 'bronze': 'auth_user.bronze'},

+        select={'id': 'auth_user.id', 

+                'name': 'auth_user.username', 

+                'rep':'auth_user.reputation', 

+                'gold': 'auth_user.gold', 

+                'silver': 'auth_user.silver', 

+                'bronze': 'auth_user.bronze'},

         tables=['award', 'auth_user'],

         where=['badge_id=%s AND user_id=auth_user.id'],

         params=[id]