crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

On étale les requêtes SQL pour la lisibilité

Browse source
This commit is contained in:
Pierre-Elliott Bécue 2015-03-29 23:09:19 +02:00
parent 83a1a611ef
commit 64bb5252ea
1 changed files with 37 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

44
surveillance/mac_prises/mac_prise_analyzer.py
View file

@ -43,10 +43,6 @@ for club in clubs:
except: except:
pass pass
requete = "SELECT * FROM signales WHERE date >= timestamp 'now' - interval '1 day';"
cur.execute(requete)
signales = cur.fetchall()
longueur = (24, 7) longueur = (24, 7)
titres = (u'mac', u'chambres') titres = (u'mac', u'chambres')
alignements = ('c', 'c') alignements = ('c', 'c')
@ -69,7 +65,20 @@ def genere_comptage(duree):
global Logs global Logs
pb_comptage_suspect = {} pb_comptage_suspect = {}
output = "" output = ""
requete = "SELECT array_to_string(array_agg(DISTINCT date), ', ') AS dates , mac, array_to_string(array_agg(DISTINCT chambre), ', ') AS chambres, COUNT(DISTINCT chambre) AS nb_chambres_distinctes, COUNT(chambre) AS nb_chambres, COUNT(DISTINCT date) as nb_dates_distinctes, COUNT(DISTINCT mac) as nb_macs_distinctes FROM correspondance WHERE date >= timestamp 'now' - interval '%(delay)s' GROUP BY mac;" % {'delay': mac_prise.delay[duree]} requete = """SELECT
array_to_string(array_agg(DISTINCT date), ', ') AS dates,
mac,
array_to_string(array_agg(DISTINCT chambre), ', ') AS chambres,
COUNT(DISTINCT chambre) AS nb_chambres_distinctes,
COUNT(chambre) AS nb_chambres,
COUNT(DISTINCT date) AS nb_dates_distinctes,
COUNT(DISTINCT mac) AS nb_macs_distinctes
FROM
correspondance
WHERE
date >= timestamp 'now' - interval '%(delay)s'
GROUP BY
mac;""" % {'delay': mac_prise.delay[duree]}
cur.execute(requete) cur.execute(requete)
fetched = cur.fetchall() fetched = cur.fetchall()
@ -109,7 +118,15 @@ def summary():
output = u"" output = u""
Logs = u"" Logs = u""
requete = "SELECT * FROM spotted WHERE date >= timestamp 'now' - interval '1 day' ORDER BY date ASC;" requete = """SELECT
*
FROM
spotted
WHERE
date >= timestamp 'now' - interval '1 day'
ORDER BY
date
ASC;"""
cur.execute(requete) cur.execute(requete)
fetched = cur.fetchall() fetched = cur.fetchall()
liste_triee = collections.defaultdict(dict) liste_triee = collections.defaultdict(dict)
@ -163,7 +180,20 @@ def reperage_mac_inconnue():
output = u"" output = u""
probleme = {} probleme = {}
requete = "SELECT chambre, mac, COUNT(mac) as nb_min FROM correspondance WHERE date >= timestamp 'now' - interval '24 hours' GROUP BY chambre, mac ORDER BY chambre ASC;" requete = """SELECT
chambre,
mac,
COUNT(mac) AS nb_min
FROM
correspondance
WHERE
date >= timestamp 'now' - interval '24 hours'
GROUP BY
chambre,
mac
ORDER BY
chambre
ASC;"""
cur.execute(requete) cur.execute(requete)
fetched = cur.fetchall() fetched = cur.fetchall()
liste_parsee = collections.defaultdict(dict) liste_parsee = collections.defaultdict(dict)