Sépare l'affichage de la recherche.
This commit is contained in:
parent
9e934c2e8c
commit
0492338bf8
1 changed files with 11 additions and 6 deletions
|
@ -25,11 +25,8 @@ MACRO_FILTRE_PRISE = re.compile(r'\(prise=(?P<prise>[a-zA-Z][0-9]{3})\)')
|
||||||
MACRO_FILTRE_ADHESION = re.compile(r'\(adhesion=ok\)')
|
MACRO_FILTRE_ADHESION = re.compile(r'\(adhesion=ok\)')
|
||||||
MACRO_FILTRE_CONNEXION = re.compile(r'\(connexion=ok\)')
|
MACRO_FILTRE_CONNEXION = re.compile(r'\(connexion=ok\)')
|
||||||
|
|
||||||
def explore_db(args):
|
def print_data(data, args):
|
||||||
"""Utilise le contenu de args pour décider comment explorer la base de données."""
|
"""Récupère les données et les affiche"""
|
||||||
data = search_ldap(args)
|
|
||||||
data = macro_expand(data, args)
|
|
||||||
data = limits(data, args)
|
|
||||||
dataLen = sum([len(elem) for elem in data.itervalues()])
|
dataLen = sum([len(elem) for elem in data.itervalues()])
|
||||||
if dataLen:
|
if dataLen:
|
||||||
for (key, elem) in data.iteritems():
|
for (key, elem) in data.iteritems():
|
||||||
|
@ -51,6 +48,14 @@ def explore_db(args):
|
||||||
print lc_ldap.printing.sprint_list(elem).encode(ENCODING)
|
print lc_ldap.printing.sprint_list(elem).encode(ENCODING)
|
||||||
print "%s résultats" % len(elem)
|
print "%s résultats" % len(elem)
|
||||||
|
|
||||||
|
def explore_db(args):
|
||||||
|
"""Utilise le contenu de args pour décider comment explorer la base de données."""
|
||||||
|
data = search_ldap(args)
|
||||||
|
data = macro_expand(data, args)
|
||||||
|
data = limits(data, args)
|
||||||
|
|
||||||
|
return data
|
||||||
|
|
||||||
def search_ldap(args):
|
def search_ldap(args):
|
||||||
"""Cherche et trie"""
|
"""Cherche et trie"""
|
||||||
data = {}
|
data = {}
|
||||||
|
@ -231,4 +236,4 @@ if __name__ == "__main__":
|
||||||
else:
|
else:
|
||||||
LDAP = lc_ldap.shortcuts.lc_ldap_readonly()
|
LDAP = lc_ldap.shortcuts.lc_ldap_readonly()
|
||||||
|
|
||||||
explore_db(args)
|
print_data(explore_db(args), args)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue