1 |
commit: ce8c56f9018af95fb2a2918d9c4ed3f647871070 |
2 |
Author: Vikraman Choudhury <vikraman.choudhury <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Aug 1 23:14:44 2011 +0000 |
4 |
Commit: Vikraman Choudhury <vikraman.choudhury <AT> gmail <DOT> com> |
5 |
CommitDate: Mon Aug 1 23:14:44 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoostats.git;a=commit;h=ce8c56f9 |
7 |
|
8 |
export use data to json |
9 |
|
10 |
--- |
11 |
server/use.py | 12 +++++++++--- |
12 |
1 files changed, 9 insertions(+), 3 deletions(-) |
13 |
|
14 |
diff --git a/server/use.py b/server/use.py |
15 |
index 13068ec..4318ee8 100644 |
16 |
--- a/server/use.py |
17 |
+++ b/server/use.py |
18 |
@@ -1,4 +1,5 @@ |
19 |
|
20 |
+import helpers |
21 |
from config import render, db |
22 |
|
23 |
class Use(object): |
24 |
@@ -8,7 +9,10 @@ class Use(object): |
25 |
use_query = db.query('SELECT COUNT(DISTINCT UKEY) AS USE_COUNT FROM USEFLAGS') |
26 |
use_tuple = use_query[0] |
27 |
use_data = {'USE_COUNT':use_tuple['USE_COUNT']} |
28 |
- return render.use(use_data) |
29 |
+ if helpers.is_json_request(): |
30 |
+ return helpers.serialize(use_data) |
31 |
+ else: |
32 |
+ return render.use(use_data) |
33 |
|
34 |
elif l == 1: |
35 |
global_use_query = db.query('SELECT COUNT(DISTINCT UUID) AS GLOBAL_COUNT\ |
36 |
@@ -39,8 +43,10 @@ class Use(object): |
37 |
'MINUS_COUNT':minus_use_tuple['MINUS_COUNT'], |
38 |
'UNSET_COUNT':unset_use_tuple['UNSET_COUNT'] |
39 |
} |
40 |
- |
41 |
- return render.use_useflag(args[0], use_data) |
42 |
+ if helpers.is_json_request(): |
43 |
+ return helpers.serialize(use_data) |
44 |
+ else: |
45 |
+ return render.use_useflag(args[0], use_data) |
46 |
|
47 |
else: |
48 |
return config.internalerror() |