def _game_index_data(request):
+ if request.matchdict.has_key('game_type_cd'):
+ game_type_cd = request.matchdict['game_type_cd']
+ else:
+ game_type_cd = None
+
if request.params.has_key('page'):
current_page = request.params['page']
else:
current_page = 1
-
- games_q = DBSession.query(Game, Server, Map).\
- filter(Game.server_id == Server.server_id).\
- filter(Game.map_id == Map.map_id).\
- order_by(Game.game_id.desc())
-
- games = Page(games_q, current_page, items_per_page=10, url=page_url)
-
- pgstats = {}
- for (game, server, map) in games:
- pgstats[game.game_id] = DBSession.query(PlayerGameStat).\
- filter(PlayerGameStat.game_id == game.game_id).\
- order_by(PlayerGameStat.scoreboardpos).\
- order_by(PlayerGameStat.score).all()
+
+ try:
+ rgs_q = recent_games_q(game_type_cd=game_type_cd)
+
+ games = Page(rgs_q, current_page, items_per_page=10, url=page_url)
+
+ # replace the items in the canned pagination class with more rich ones
+ games.items = [RecentGame(row) for row in games.items]
+
+ pgstats = {}
+ for game in games.items:
+ pgstats[game.game_id] = DBSession.query(PlayerGameStat).\
+ filter(PlayerGameStat.game_id == game.game_id).\
+ order_by(PlayerGameStat.scoreboardpos).\
+ order_by(PlayerGameStat.score).all()
+
+ except Exception as e:
+ games = None
+ pgstats = None
+ game_type_cd = None
return {'games':games,
- 'pgstats':pgstats}
+ 'pgstats':pgstats,
+ 'game_type_cd':game_type_cd,
+ }
def game_index(request):
try:
notfound = False
- (game, server, map) = DBSession.query(Game, Server, Map).\
+ (game, server, map, gametype) = DBSession.query(Game, Server, Map, GameType).\
filter(Game.game_id == game_id).\
filter(Game.server_id == Server.server_id).\
- filter(Game.map_id == Map.map_id).one()
+ filter(Game.map_id == Map.map_id).\
+ filter(Game.game_type_cd == GameType.game_type_cd).one()
pgstats = DBSession.query(PlayerGameStat).\
filter(PlayerGameStat.game_id == game_id).\
captimes = []
if game.game_type_cd == 'ctf':
for pgstat in pgstats:
- if pgstat.fastest_cap is not None:
+ if pgstat.fastest is not None:
captimes.append(pgstat)
- captimes = sorted(captimes, key=lambda x:x.fastest_cap)
+ captimes = sorted(captimes, key=lambda x:x.fastest)
pwstats = {}
for (pwstat, pgstat, weapon) in DBSession.query(PlayerWeaponStat, PlayerGameStat, Weapon).\
game = None
server = None
map = None
+ gametype = None
pgstats = None
pwstats = None
captimes = None
return {'game':game,
'server':server,
'map':map,
+ 'gametype':gametype,
'pgstats':pgstats,
'pwstats':pwstats,
'captimes':captimes,