From 0c3d93ded6a9a7d6fec0156ad1de3965ad78fefb Mon Sep 17 00:00:00 2001 From: gregor herrmann Date: Wed, 13 Jun 2018 17:58:56 +0200 Subject: [PATCH] fix indentation. or actually logic: mode handling after the sql query --- web/seepark_web.py | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/web/seepark_web.py b/web/seepark_web.py index 68929fc..340c7b6 100644 --- a/web/seepark_web.py +++ b/web/seepark_web.py @@ -54,30 +54,30 @@ def select_sensordata(initial_where, initial_sql_args): cursor = conn.execute(sql, *sql_args) result = [dict(row) for row in cursor] - mode = request.args.get('mode', 'full') - if mode == 'consolidated': - if begin is None or end is None: - pass + mode = request.args.get('mode', 'full') + if mode == 'consolidated': + if begin is None or end is None: + pass + else: + # copied from munin/master/_bin/munin-cgi-graph.in + resolutions = dict( + day = 300, + week = 1800, + month = 7200, + year = 86400, + ) + duration = (end - begin).total_seconds() + day = 60 * 60 * 24 + if duration < day: + resolution = resolutions['day'] + elif duration < 7 * day: + resolution = resolutions['week'] + elif duration < 31 * day: + resolution = resolutions['month'] else: - # copied from munin/master/_bin/munin-cgi-graph.in - resolutions = dict( - day = 300, - week = 1800, - month = 7200, - year = 86400, - ) - duration = (end - begin).total_seconds() - day = 60 * 60 * 24 - if duration < day: - resolution = resolutions['day'] - elif duration < 7 * day: - resolution = resolutions['week'] - elif duration < 31 * day: - resolution = resolutions['month'] - else: - resolution = resolutions['year'] - # TODO: filter out samples from 'result' - # like loop over results and skip if timestamp(n+1)-timestamp(n)