From: azucaro <azucaro@2QJ7BK1-RO.Org.Collegeboard.local>
Date: Wed, 27 Apr 2011 13:13:36 +0000 (-0400)
Subject: Set pwstats to zero if we hit a keyerror.
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b074435f1671c76491611728c51c805d55b538be;p=xonotic%2Fxonstat.git

Set pwstats to zero if we hit a keyerror.
---

diff --git a/xonstat/views.py b/xonstat/views.py
index 7a406d4..1d88d16 100755
--- a/xonstat/views.py
+++ b/xonstat/views.py
@@ -174,23 +174,36 @@ def create_player_weapon_stats(session=None, player=None,
     pwstats = []
 
     for (key,value) in player_events.items():
-        matched = re.search("acc-(.*?)-cnt-fired", key)
+        matched = re.search("acc-(.*?)-.*(fired|hit)", key)
         if matched:
             weapon_cd = matched.group(1)
+            pwstat = PlayerWeaponStat()
+            pwstat.player_id = player.player_id
+            pwstat.game_id = game.game_id
+            pwstat.weapon_cd = weapon_cd
             try:
-                pwstat = PlayerWeaponStat()
-                pwstat.player_id = player.player_id
-                pwstat.game_id = game.game_id
-                pwstat.weapon_cd = weapon_cd
                 pwstat.max = player_events['acc-' + weapon_cd + '-fired']
+            except:
+                pwstat.max = 0
+            try:
                 pwstat.actual = player_events['acc-' + weapon_cd + '-hit']
+            except:
+                pwstat.actual = 0
+            try:
                 pwstat.fired = player_events['acc-' + weapon_cd + '-cnt-fired']
+            except:
+                pwstat.fired = 0
+            try:
                 pwstat.hit = player_events['acc-' + weapon_cd + '-cnt-hit']
+            except:
+                pwstat.hit = 0
+            try:
                 pwstat.frags = player_events['acc-' + weapon_cd + '-frags']
-                session.add(pwstat)
-                pwstats.append(pwstat)
             except:
-                pass
+                pwstat.frags = 0
+
+            session.add(pwstat)
+            pwstats.append(pwstat)
 
     return pwstats