From 19847201d2ebe54eaac86dadc0b498c08d2e88c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= Date: Tue, 17 Jun 2014 23:41:47 +0200 Subject: [PATCH] =?UTF-8?q?[comptage=5Fupload]=20Tout=20plein=20de=20bugs?= =?UTF-8?q?=20que=20j'avais=20pas=20pu=20d=C3=A9pister?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gestion/gen_confs/filtrage.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gestion/gen_confs/filtrage.py b/gestion/gen_confs/filtrage.py index a92a3240..db295ade 100644 --- a/gestion/gen_confs/filtrage.py +++ b/gestion/gen_confs/filtrage.py @@ -18,7 +18,7 @@ import lc_ldap.objets from gestion.gen_confs import gen_config import psycopg2 -ldap_conn = lc_ldap.shortcuts.lc_ldap.readonly() +ldap_conn = lc_ldap.shortcuts.lc_ldap_readonly() # Génération des la tables d'exemptions ####################################### @@ -32,7 +32,7 @@ class exemptions(gen_config): return "surveillance_exemptions" def _gen(self): - machines = ldap_conn.search(u'(exempt=*)') + machines = ldap_conn.search(u'(exempt=*)', sizelimit=9999) pgsql = psycopg2.connect(database='filtrage', user='crans') curseur = pgsql.cursor() @@ -68,7 +68,7 @@ class machines(gen_config): return "surveillance_liste_machines" def _gen(self): - machines = ldap_conn.search(u"(ipHostNumber=*)")['machine'] + machines = ldap_conn.search(u"(ipHostNumber=*)", sizelimit=9999) # liste des machines (on prend que les paimement ok) # machines = self.machines @@ -82,11 +82,13 @@ class machines(gen_config): # ajout des entrée for m in machines: if m.proprio().__class__ == lc_ldap.objets.club: - curseur.execute("INSERT INTO machines (mac_addr, type, id) VALUES ('%s','club',%s);" % (m['macAddress'][0], m.proprio()['cid'][0].value)) + if not m['macAddress'][0].value == '': + curseur.execute("INSERT INTO machines (mac_addr, type, id) VALUES ('%s','club',%s);" % (m['macAddress'][0], m.proprio()['cid'][0].value)) elif m.proprio().__class__ == lc_ldap.objets.adherent: - curseur.execute("INSERT INTO machines (mac_addr, type, id) VALUES ('%s','adherent',%s);" % (m['macAddress'], m.proprio()['cid'][0].value)) + if not m['macAddress'][0].value == '': + curseur.execute("INSERT INTO machines (mac_addr, type, id) VALUES ('%s','adherent',%s);" % (m['macAddress'][0], m.proprio()['aid'][0].value)) elif m.proprio().__class__ == lc_ldap.objets.AssociationCrans: - curseur.execute("INSERT INTO machines (mac_addr, type, id) VALUES ('%s','crans',%s);" % (m['macAddress'], m['mid'][0].value)) + curseur.execute("INSERT INTO machines (mac_addr, type, id) VALUES ('%s','crans',%s);" % (m['macAddress'][0], m['mid'][0].value)) # on commit pgsql.commit()