diff -r 98ffc58f0bd3 -r 735e0411e648 server/web/tweetgserver/views.py --- a/server/web/tweetgserver/views.py Wed Feb 22 11:19:36 2012 +0100 +++ b/server/web/tweetgserver/views.py Wed Feb 22 11:33:07 2012 +0100 @@ -42,8 +42,6 @@ @app.route('/podium//', methods=['GET']) def podium(since, tokens): sincetime = datetime.fromtimestamp(since) - delta_td = datetime.now() - sincetime - delta_s = delta_td.total_seconds() token_list = tokens.split(",") query_base = db.session.query(func.count(Tweet.id)).filter(Tweet.created_at >= sincetime) #@UndefinedVariable podium_res = {} @@ -52,9 +50,7 @@ podium_res[token] = query.scalar() res = { "podium" : podium_res, - "total" : query_base.scalar(), - "delta": int(delta_s), - "tweets_per_minute": 60. * ts_list_count / delta_s + "total" : query_base.scalar() } return jsonpwrap(res)