information about questions, answers and comments count

[osqa.git] / forum_modules / updates / base.py

diff --git a/forum_modules/updates/base.py b/forum_modules/updates/base.py
index 366ce4d154442b6a6ccf2f7e0e96dee1098abbd7..2303152fc38c29f47aea73f5d9e06d08177aab83 100644 (file)
--- a/forum_modules/updates/base.py
+++ b/forum_modules/updates/base.py
@@ -1,5 +1,6 @@
 import os
 import sys
 import os
 import sys

+import platform

 import bz2
 import urllib2, urllib
 import binascii
 import bz2
 import urllib2, urllib
 import binascii


@@ -14,7 +15,7 @@ import logging
 
 from xml.dom.minidom import parse, parseString
 from forum.base import get_database_engine
 
 from xml.dom.minidom import parse, parseString
 from forum.base import get_database_engine

-from forum.models import Question, User
+from forum.models import Question, Answer, Comment, User

 from forum.settings import APP_URL, SVN_REVISION, APP_TITLE, APP_DESCRIPTION
 from django import VERSION as DJANGO_VERSION
 from django.utils import simplejson
 from forum.settings import APP_URL, SVN_REVISION, APP_TITLE, APP_DESCRIPTION
 from django import VERSION as DJANGO_VERSION
 from django.utils import simplejson


@@ -98,6 +99,9 @@ def check_for_updates():
     <app_description value="%(app_description)s" />
     <svn_revision value="%(svn_revision)d" />
     <views value="%(site_views)d" />
     <app_description value="%(app_description)s" />
     <svn_revision value="%(svn_revision)d" />
     <views value="%(site_views)d" />

+    <questions_count value="%(questions_count)d" />
+    <answers_count value="%(answers_count)d" />
+    <comments_count value="%(comments_count)d" />

     <active_users value="%(active_users)d" />
     <server value="%(server_name)s" />
     <python_version value="%(python_version)s" />
     <active_users value="%(active_users)d" />
     <server value="%(server_name)s" />
     <python_version value="%(python_version)s" />


@@ -113,11 +117,14 @@ def check_for_updates():
         'svn_revision' : svn_revision,
         'site_views' : get_site_views(),
         'server_name' : get_server_name(),
         'svn_revision' : svn_revision,
         'site_views' : get_site_views(),
         'server_name' : get_server_name(),

+        'questions_count' : Question.objects.filter_state(deleted=False).count(),
+        'answers_count' : Answer.objects.filter_state(deleted=False).count(),
+        'comments_count' : Comment.objects.filter_state(deleted=False).count(),

         'active_users' : get_active_users(),
         'python_version' : ''.join(sys.version.splitlines()),
         'django_version' : str(DJANGO_VERSION),
         'database' : database_type,
         'active_users' : get_active_users(),
         'python_version' : ''.join(sys.version.splitlines()),
         'django_version' : str(DJANGO_VERSION),
         'database' : database_type,

-        'os' : str(os.uname()),
+        'os' : str(platform.uname()),

         'emails' : admin_emails_xml,
     }
 
         'emails' : admin_emails_xml,
     }