-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 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 webhelpers.paginate import Page
+from xonstat.models import DBSession, Server, Map, Game, PlayerGameStat, Player
+from xonstat.util import page_url
log = logging.getLogger(__name__)
order_by(Player.player_id)
# server-only searches
- elif server_name and not nick and not map_name and not create_dt \
- and len(gametypes) < 1:
+ 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()+'%')).\
- order_by(Server.server_id)
+ 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 \
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:
def search(request):
return _search_data(request)
+
+
+def search_json(request):
+ return [{'status':'not implemented'}]