From 1a91b093780f0424a1869620c4c6b11724983dcc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jean-Michel=20Nirgal=20Vourg=C3=A8re?= Date: Fri, 18 Jan 2013 19:58:16 +0000 Subject: [PATCH] colonized field now contains colonizer name rather than True/False --- members.py | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/members.py b/members.py index 8c7aac2..2fc4ab2 100755 --- a/members.py +++ b/members.py @@ -179,7 +179,7 @@ def members_fetch(alliance_tag=None): techno = int(get_merged_leaf_content(row[5])) anthill = int(get_merged_leaf_content(row[6])) active = get_elem(row[7], 'img')[0].attributes['alt'] - colonized = len(get_elem(row[8], 'img')) == 1 + colonized = len(get_elem(row[8], 'img')) == 1 # True will become a string, see bellow #print(nick, grade, field, techno, anthill, active, colonized) else: @@ -210,7 +210,7 @@ def members_fetch(alliance_tag=None): def members_fill_positions(newmembers): for nick, data in newmembers.items(): - if data['id'] is not None: + if data['id'] is not None and data['colonized'] != True: continue httpresponse = httpopen(BASE_URL + '/Membre.php?Pseudo=' + nick) @@ -229,7 +229,13 @@ def members_fill_positions(newmembers): _id = int(match.group(1)) newmembers[nick]['id'] = _id - logging.debug('%s has position %s %s and ID %s', nick, x, y, _id) + match=re.match('.*Fourmilière soumise par