From 0b3f36bda8f666d282b7a4bb149b766edf1e3212 Mon Sep 17 00:00:00 2001 From: glondu Date: Sat, 6 May 2006 06:22:07 +0200 Subject: [PATCH] Factorisation. darcs-hash:20060506042207-68412-9a1b2dc973c00b7bdcc6ca8da05d29a7e329a82b.gz --- gestion/gen_confs/surveillance.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gestion/gen_confs/surveillance.py b/gestion/gen_confs/surveillance.py index 3cd1de4e..4b2d090d 100755 --- a/gestion/gen_confs/surveillance.py +++ b/gestion/gen_confs/surveillance.py @@ -12,10 +12,12 @@ Utilis import sys, os, commands sys.path.append('/usr/scripts/gestion') -from ldap_crans import crans_ldap +from ldap_crans import crans_ldap, Club, Adherent, AssociationCrans from gen_confs import gen_config from pyPgSQL import PgSQL +db = crans_ldap() + # Génération des la tables d'exemptions ####################################### @@ -29,7 +31,7 @@ class exemptions(gen_config) : def _gen (self) : - machines = crans_ldap().search('exempt=*')['machine'] + machines = db.search('exempt=*')['machine'] pgsql = PgSQL.connect(host='/var/run/postgresql', database='filtrage', user='crans') curseur = pgsql.cursor() @@ -63,12 +65,11 @@ class machines(gen_config) : # recherche de toutes les machines dans ldap import sys sys.path.append('/usr/scripts/gestion') - from ldap_crans import crans_ldap, Club, Adherent, AssociationCrans - machines = crans_ldap().search('ip=*')['machine'] + machines = db.search('ip=*')['machine'] # liste des machines (on prend que les paimement ok) machines = self.machines - # machines = crans_ldap().search('ip=*')['machine'] + # machines = db.search('ip=*')['machine'] # connexion à la base postgresql from pyPgSQL import PgSQL