From 156b69a27d24fd2a596f6c998596513e815c8ff1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Gru=CC=88ndger?= Date: Sun, 15 Nov 2015 10:00:09 +0100 Subject: [PATCH] Take ReceiverDevice instead of ReceiverBeacon --- ogn/db_analysis.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ogn/db_analysis.py b/ogn/db_analysis.py index b9d9bfa..9055e3b 100644 --- a/ogn/db_analysis.py +++ b/ogn/db_analysis.py @@ -5,6 +5,7 @@ from sqlalchemy import distinct, and_ from ogn.db import session from ogn.model import ReceiverBeacon +from ogn.model.receiver_device import ReceiverDevice back_24h = datetime.utcnow() - timedelta(days=1) receiver_messages_per_24h = 24*60 / 5 @@ -16,13 +17,13 @@ def get_receiver_info(): group_by(ReceiverBeacon.name).\ subquery() - query = session.query(ReceiverBeacon, sq.c.messages_count).\ - filter(and_(ReceiverBeacon.name == sq.c.name, ReceiverBeacon.timestamp == sq.c.lastseen)).\ - order_by(ReceiverBeacon.name) + query = session.query(ReceiverDevice, sq.c.messages_count).\ + filter(ReceiverDevice.name == sq.c.name).\ + order_by(ReceiverDevice.name) print('--- Receivers ---') for [receiver, messages_count] in query.all(): - print('%9s: %3d%% avail, %s, %s ' % (receiver.name, 100.0*float(messages_count/receiver_messages_per_24h), receiver.version, receiver.platform)) + print('%9s (%2s): %3d%% avail, %s, %s ' % (receiver.name, receiver.country_code, 100.0*float(messages_count/receiver_messages_per_24h), receiver.version, receiver.platform)) def get_software_stats():