From: Ant Zucaro <azucaro@gmail.com>
Date: Fri, 1 Apr 2011 02:30:54 +0000 (-0400)
Subject: Fix integrity errors when creating player_game_stat records.
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=957d65564bfdb9d430ce39588bc3a33994c5984d;p=xonotic%2Fxonstat.git

Fix integrity errors when creating player_game_stat records.
---

diff --git a/xonstat/__init__.py b/xonstat/__init__.py
index a22c216..5e0995f 100644
--- a/xonstat/__init__.py
+++ b/xonstat/__init__.py
@@ -27,7 +27,10 @@ def main(global_config, **settings):
 
     config.add_static_view('static', 'xonstat:static')
 
-    config.add_route(name="main_index", pattern="/", view=main_index, renderer='index.jinja2') 
+    config.add_route(name="main_index", pattern="/", view=main_index, 
+            renderer='index.jinja2') 
+    config.add_route(name="stats_submit", pattern="stats/submit", view=stats_submit, 
+            renderer='index.jinja2') 
     return config.make_wsgi_app()
 
 
diff --git a/xonstat/views.py b/xonstat/views.py
index 117046e..cc92acf 100644
--- a/xonstat/views.py
+++ b/xonstat/views.py
@@ -22,13 +22,13 @@ def main_index(request):
 ##########################################################################
 @view_config(renderer='player_index.mako')
 def player_index(request):
-    players = Session.query(Player)
+    players = DBSession.query(Player)
     log.debug("testing logging; entered PlayerHandler.index()")
     return {'players':players}
 
 @view_config(renderer='player_info.mako')
 def player_info(request):
-    player = Session.query(Player).filter_by(player_id=p_player_id)
+    player = DBSession.query(Player).filter_by(player_id=p_player_id)
     log.debug("testing logging; entered PlayerHandler.info()")
     return {'player':player}
 
@@ -116,11 +116,14 @@ def create_player_game_stat(session=None, player=None,
 
     # in here setup default values (e.g. if game type is CTF then
     # set kills=0, score=0, captures=0, pickups=0, fckills=0, etc
-    pgstat = PlayerGameStat()
+    pgstat = PlayerGameStat(create_dt=datetime.datetime.now())
 
     # set player id from player record
     pgstat.player_id = player.player_id
 
+    #set game id from game record
+    pgstat.game_id = game.game_id
+
     # all games have a score
     pgstat.score = 0
 
@@ -161,7 +164,7 @@ def create_player_game_stat(session=None, player=None,
 
 @view_config(renderer='stats_submit.mako')
 def stats_submit(request):
-    session = Session()
+    session = DBSession()
 
     # game meta information
     game_meta = {}