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

[comptage_upload] Tout plein de bugs que j'avais pas pu dépister

Browse source
This commit is contained in:
Pierre-Elliott Bécue 2014-06-17 23:41:47 +02:00
parent 9a1c89591f
commit 19847201d2
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
gestion/gen_confs/filtrage.py
View file

@ -18,7 +18,7 @@ import lc_ldap.objets
from gestion.gen_confs import gen_config from gestion.gen_confs import gen_config
import psycopg2 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 # Génération des la tables d'exemptions
####################################### #######################################
@ -32,7 +32,7 @@ class exemptions(gen_config):
return "surveillance_exemptions" return "surveillance_exemptions"
def _gen(self): def _gen(self):
machines = ldap_conn.search(u'(exempt=*)') machines = ldap_conn.search(u'(exempt=*)', sizelimit=9999)
pgsql = psycopg2.connect(database='filtrage', user='crans') pgsql = psycopg2.connect(database='filtrage', user='crans')
curseur = pgsql.cursor() curseur = pgsql.cursor()
@ -68,7 +68,7 @@ class machines(gen_config):
return "surveillance_liste_machines" return "surveillance_liste_machines"
def _gen(self): 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) # liste des machines (on prend que les paimement ok)
# machines = self.machines # machines = self.machines
@ -82,11 +82,13 @@ class machines(gen_config):
# ajout des entrée # ajout des entrée
for m in machines: for m in machines:
if m.proprio().__class__ == lc_ldap.objets.club: if m.proprio().__class__ == lc_ldap.objets.club:
if not m['macAddress'][0].value == '<automatique>':
curseur.execute("INSERT INTO machines (mac_addr, type, id) VALUES ('%s','club',%s);" % (m['macAddress'][0], m.proprio()['cid'][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: 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 == '<automatique>':
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: 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 # on commit
pgsql.commit() pgsql.commit()