Add gametypes to search.

Users can now search specific gametypes.

diff --git a/xonstat/templates/search.mako b/xonstat/templates/search.mako
index 3015b0b6721d903f390e7bdc3cbb927a5a49482c..d919d8168bbca1704b848544067afd09a67c1313 100755 (executable)
--- a/xonstat/templates/search.mako
+++ b/xonstat/templates/search.mako
@@ -17,9 +17,18 @@
             <td style="text-align:right;">Map:</td>
             <td><input type="text" name="map_name" /></td>
         </tr>
+        <tr>
+            <td style="text-align:right;">Game Type:</td>
+            <td>
+                <input type="checkbox" name="dm" />Deathmatch<br/>
+                <input type="checkbox" name="duel" />Duel<br/>
+                <input type="checkbox" name="ctf" />Capture The Flag<br/>
+                <input type="checkbox" name="tdm" />Team Deathmatch<br/>
+            </td>
+        </tr>
         <tr>
             <td style="text-align:right;"></td>
-            <td><input type="submit" /></td>
+            <td><input type="submit" value="search" /></td>
         </tr>
     </table>
     </form>
@@ -98,3 +107,9 @@
 <!-- navigation links -->
 ${navlinks("search_paged", results.page, results.last_page, query)}
 % endif
+
+<%block name="js">
+${parent.js()}
+</%block>
+
+

diff --git a/xonstat/views/search.py b/xonstat/views/search.py
index 5593956ffa8bc7c66bb3b8797ff7ee10fb5c978a..330a502a57ae1588e9995bc57c90e4ea854d4a2c 100755 (executable)
--- a/xonstat/views/search.py
+++ b/xonstat/views/search.py
@@ -14,13 +14,15 @@ from webhelpers.paginate import Page, PageURL
 
 log = logging.getLogger(__name__)
 
-def search_q(nick=None, server_name=None, map_name=None, create_dt=None):
+def search_q(nick=None, server_name=None, map_name=None, create_dt=None,
+        gametypes=[]):
     session     = DBSession()
     result_type = None
     q           = None
 
     # player-only searches
-    if nick and not server_name and not map_name and not create_dt:
+    if nick and not server_name and not map_name and not create_dt \
+        and len(gametypes) < 1:
         result_type = "player"
         q = session.query(Player)
         if nick:
@@ -30,7 +32,8 @@ def search_q(nick=None, server_name=None, map_name=None, create_dt=None):
                     order_by(Player.player_id)
 
     # server-only searches
-    elif server_name and not nick and not map_name and not create_dt:
+    elif server_name and not nick and not map_name and not create_dt \
+        and len(gametypes) < 1:
         result_type = "server"
         q = session.query(Server)
         if server_name:
@@ -39,7 +42,8 @@ def search_q(nick=None, server_name=None, map_name=None, create_dt=None):
                     order_by(Server.server_id)
 
     # map-only searches
-    elif map_name and not nick and not server_name and not create_dt:
+    elif map_name and not nick and not server_name and not create_dt \
+        and len(gametypes) < 1:
         result_type = "map"
         q = session.query(Map)
         if map_name:
@@ -54,6 +58,8 @@ def search_q(nick=None, server_name=None, map_name=None, create_dt=None):
                 filter(Game.server_id == Server.server_id).\
                 filter(Game.map_id == Map.map_id).\
                 order_by(Game.game_id.desc())
+        if len(gametypes) > 0:
+            q = q.filter(Game.game_type_cd.in_(gametypes))
         if nick:
             q = q.filter(func.upper(PlayerGameStat.stripped_nick).\
                     like('%'+nick.upper()+'%')).\
@@ -72,6 +78,7 @@ def search(request):
     nick = None
     server_name = None
     map_name = None
+    gametypes = []
     result_type = None
     results = None
     query = None
@@ -95,9 +102,21 @@ def search(request):
             if request.params['map_name'] != '':
                 map_name = request.params['map_name']
                 query['map_name'] = map_name
+        if request.params.has_key('dm'):
+                gametypes.append('dm')
+                query['dm'] = ''
+        if request.params.has_key('duel'):
+                gametypes.append('duel')
+                query['duel'] = ''
+        if request.params.has_key('ctf'):
+                gametypes.append('ctf')
+                query['ctf'] = ''
+        if request.params.has_key('tdm'):
+                gametypes.append('tdm')
+                query['tdm'] = ''
+
         (result_type, q) = search_q(nick=nick, server_name=server_name,
-                map_name=map_name)
-        log.debug(q)
+                map_name=map_name, gametypes=gametypes)
 
         try:
             if q != None: