X-Git-Url: https://git.toastfreeware.priv.at/chrisu/seepark.git/blobdiff_plain/86bcc8d9b0a98df464ac5cc9fb52c1eb64946eca..ef900e67a4f4451a834e94fe26dec367821eb5f6:/web/seepark_web.py?ds=sidebyside diff --git a/web/seepark_web.py b/web/seepark_web.py index 82b3323..95c3f9d 100644 --- a/web/seepark_web.py +++ b/web/seepark_web.py @@ -4,6 +4,7 @@ import time import configparser import os import sys +from collections import defaultdict from flask import Flask, render_template, jsonify, request import flask.json from sqlalchemy import create_engine @@ -87,13 +88,9 @@ def select_sensordata(initial_where, initial_sql_args): format = request.args.get('format', 'default') if format == 'c3': - c3result = dict() + c3result = defaultdict(list) for row in result: - if not row['sensor_id'] in c3result: - c3result[row['sensor_id']] = list() c3result[row['sensor_id']].append(row['value']) - if not row['sensor_id'] + '_x' in c3result: - c3result[row['sensor_id'] + '_x'] = list() dt = row['timestamp'].strftime('%Y-%m-%d %H:%M:%S') c3result[row['sensor_id'] + '_x'].append(dt) result = c3result