Split function select_sensordata().

diff --git a/web/seepark_web.py b/web/seepark_web.py
index fc28fdead7f895951f9fd03ccf72ddbf573d83b4..18bedc9c6548e98f20772d5f5dad0af748e7ec42 100644 (file)
--- a/web/seepark_web.py
+++ b/web/seepark_web.py
@@ -61,17 +61,16 @@ class Sensors(db.Model):
     __tablename__ = 'sensors'
 
 
-def select_sensordata(initial_where):
-    query = Sensors.query.filter(initial_where)
-    begin = request.args.get('begin', None, parse_datetime)
-    end = request.args.get('end', None, parse_datetime)
+def select_sensordata(sensor_id, sensor_type, begin, end, mode):
+    query = Sensors.query
+    if sensor_id is not None:
+        query = query.filter(Sensors.sensor_id == sensor_id)
+    if sensor_type is not None:
+        query = query.filter(Sensors.value_type == sensor_type)
     if begin is not None:
         query = query.filter(Sensors.timestamp >= begin)
     if end is not None:
         query = query.filter(Sensors.timestamp <= end)
-    result = query.all()
-
-    mode = request.args.get('mode', 'full')
     if mode == 'consolidated':
         if begin is None or end is None:
             pass
@@ -95,17 +94,29 @@ def select_sensordata(initial_where):
                 resolution = resolutions['year']
             # TODO: filter out samples from 'result'
             # like loop over results and skip if timestamp(n+1)-timestamp(n)<resolution
+    return query.all()
+
+
+def convert_to_c3(result):
+    c3result = defaultdict(list)
+    for row in result:
+        c3result[row.sensor_id].append(row.value)
+        dt = row.timestamp.strftime('%Y-%m-%d %H:%M:%S')
+        c3result[row.sensor_id + '_x'].append(dt)
+    return c3result
 
+
+def sensordata(sensor_id=None, sensor_type=None):
+    begin = request.args.get('begin', None, parse_datetime)
+    end = request.args.get('end', None, parse_datetime)
+    mode = request.args.get('mode', 'full')
     format = request.args.get('format', 'default')
+
+    result = select_sensordata(sensor_id, sensor_type, begin, end, mode)
+
     if format == 'c3':
-        c3result = defaultdict(list)
-        for row in result:
-            c3result[row.sensor_id].append(row.value)
-            dt = row.timestamp.strftime('%Y-%m-%d %H:%M:%S')
-            c3result[row.sensor_id + '_x'].append(dt)
-        return c3result
-    else:
-        return result
+        return convert_to_c3(result)
+    return result
 
 
 def currentairtemperature(apikey, cityid):
@@ -139,7 +150,7 @@ def sensorid(version, sensor_id):
     mode=<full|consolidated>, optional. return all rows (default) or with lower resolution (for charts)
     format=<default|c3>, optional. return result as returned by sqlalchemy (default) or formatted for c3.js
     """
-    result = select_sensordata(Sensors.sensor_id == sensor_id)
+    result = sensordata(sensor_id=sensor_id)
     return jsonify(result)
 
 
@@ -153,7 +164,7 @@ def sensortype(version, sensor_type):
     mode=<full|consolidated>, optional. return all rows (default) or with lower resolution (for charts)
     format=<default|c3>, optional. return result as returned by sqlalchemy (default) or formatted for c3.js
     """
-    result = select_sensordata(Sensors.value_type == sensor_type)
+    result = sensordata(sensor_type=sensor_type)
     return jsonify(result)