return query.all()
-def convert_to_c3(result):
+def convert_to_c3(result, id, field_x, field_y):
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)
+ c3result[getattr(row, id)].append(getattr(row, field_y))
+ dt = getattr(row, field_x).strftime('%Y-%m-%d %H:%M:%S')
+ c3result[str(getattr(row, id)) + '_x'].append(dt)
return c3result
result = select_sensordata(sensor_id, sensor_type, begin, end, mode)
if format == 'c3':
- return convert_to_c3(result)
+ return convert_to_c3(result, 'sensor_id', 'timestamp', 'value')
return result
result = select_openweatherdata(cityid, begin, end, mode)
if format == 'c3':
- return convert_to_c3(result)
+ return convert_to_c3(result, 'cityid', 'datetime', 'temp')
return result