diff --git a/celerytask/tasks.py b/celerytask/tasks.py index f62a2641..bc2a2825 100755 --- a/celerytask/tasks.py +++ b/celerytask/tasks.py @@ -529,7 +529,7 @@ def refresh_api(api_key_pair): logger.debug("API key %s has a new character on the account: %s" % (api_key_pair.api_id, characters.result[char]['name'])) if new_character: logger.debug("Creating new character %s from api key %s" % (characters.result[char]['name'], api_key_pair.api_id)) - EveManager.create_characters_from_list(characters, user, api_key_pair.api_key) + EveManager.create_characters_from_list(characters, user, api_key_pair.api_id) else: logger.debug("API key %s is no longer valid; it and its characters will be deleted." % api_key_pair.api_id) EveManager.delete_characters_by_api_id(api_key_pair.api_id, user.id) diff --git a/services/managers/evewho_manager.py b/services/managers/evewho_manager.py index 05bba41d..8cdaab8d 100644 --- a/services/managers/evewho_manager.py +++ b/services/managers/evewho_manager.py @@ -15,6 +15,15 @@ class EveWhoManager(): def get_corporation_members(corpid): url = "http://evewho.com/api.php?type=corplist&id=%s" % corpid jsondata = requests.get(url).content - data=json.loads(jsondata.decode()) + data = json.loads(jsondata.decode()) - return {row["character_id"]:{"name":row["name"], "id":row["character_id"]} for row in data["characters"]} + members = {} + page_count=0 + while len(data["characters"]): + for row in data["characters"]: + members[row["character_id"]] = {"name":row["name"], "id":row["character_id"]} + page_count=page_count+1 + jsondata = requests.get(url + "&page=%i" % page_count).content + data = json.loads(jsondata.decode()) + + return members