Add a title for the versus page.

[xonotic/xonstat.git] / xonstat / views / search.py

diff --git a/xonstat/views/search.py b/xonstat/views/search.py
index 11c22eb6617c537ddcc48a211ba8c92543c4dbbe..1cceca7464eac42ac4cd074a1fff7e233667d557 100644 (file)
--- a/xonstat/views/search.py
+++ b/xonstat/views/search.py
@@ -1,55 +1,59 @@
-import datetime
 import logging
-import pyramid.httpexceptions
-import re
-import time
-from pyramid.response import Response
-from sqlalchemy import desc
-from sqlalchemy.orm.exc import MultipleResultsFound, NoResultFound
-from sqlalchemy.sql import func
-from xonstat.models import *
-from xonstat.util import strip_colors, qfont_decode
-from xonstat.util import page_url, html_colors
-from webhelpers.paginate import Page, PageURL
+
+from sqlalchemy import func
+from webhelpers.paginate import Page
+from xonstat.models import DBSession, Server, Map, Game, PlayerGameStat, Player
+from xonstat.util import page_url
 
 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:
             q = q.filter(
-                    func.upper(Player.stripped_nick).like('%'+nick.upper()+'%'))
+                    func.upper(Player.stripped_nick).like('%'+nick.upper()+'%')).\
+                    filter(Player.player_id > 2).\
+                    filter(Player.active_ind == True).\
+                    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:
-            q = q.filter(func.upper(Server.name).\
-                    like('%'+server_name.upper()+'%'))
+            q = q.filter(func.upper(Server.name).like('%'+server_name.upper()+'%'))\
+                .filter(Server.active_ind)\
+                .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:
             q = q.filter(func.upper(Map.name).\
-                    like('%'+map_name.upper()+'%'))
+                    like('%'+map_name.upper()+'%')).\
+                    order_by(Map.map_id)
 
     # game searches (all else)
     else:
         result_type = "game"
         q = session.query(Game, Server, Map).\
                 filter(Game.server_id == Server.server_id).\
+                filter(Server.active_ind).\
                 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()+'%')).\
@@ -63,25 +67,68 @@ def search_q(nick=None, server_name=None, map_name=None, create_dt=None):
 
     return (result_type, q)
 
-def search(request):
-    form_submitted = None
+def _search_data(request):
+    fs = None
     nick = None
     server_name = None
     map_name = None
+    gametypes = []
     result_type = None
     results = None
+    query = None
+    _query = {}
+
+
+    if request.params.has_key('page'):
+        current_page = request.params['page']
+    else:
+        current_page = 1
+
+    if request.params.has_key('fs'):
+        query = {'fs':''}
+        if request.params.has_key('nick'):
+            if request.params['nick'] != '':
+                nick = request.params['nick']
+                query['nick'] = nick
+        if request.params.has_key('server_name'):
+            if request.params['server_name'] != '':
+                server_name = request.params['server_name']
+                query['server_name'] = server_name
+        if request.params.has_key('map_name'):
+            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'] = ''
+        if request.params.has_key('stype') and request.params.has_key('sval'):
+            stype = request.params['stype']
+            sval = request.params['sval']
+            if stype == "players":
+                query['nick'] = sval
+                nick = sval
+            if stype == "servers":
+                query['server_name'] = sval
+                server_name = sval
+            if stype == "maps":
+                query['map_name'] = sval
+                map_name = sval
 
-    if request.params.has_key('form_submitted'):
-        nick = request.params['nick']
-        server_name = request.params['server_name']
-        map_name = request.params['map_name']
         (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:
-                results = q.all()
+                results = Page(q, current_page, items_per_page=10, url=page_url)
         except Exception as e:
             raise e
             result_type = None
@@ -89,4 +136,13 @@ def search(request):
 
     return {'result_type':result_type,
             'results':results,
+            'query':query,
             }
+
+
+def search(request):
+    return _search_data(request)
+
+
+def search_json(request):
+    return [{'status':'not implemented'}]