Applied feedback from Antibody, improved the *->json functionality

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

diff --git a/xonstat/views/search.py b/xonstat/views/search.py
old mode 100755 (executable)
new mode 100644 (file)
index 330a502..13700b6
--- a/xonstat/views/search.py
+++ b/xonstat/views/search.py
@@ -6,7 +6,7 @@ import time
 from pyramid.response import Response
 from sqlalchemy import desc
 from sqlalchemy.orm.exc import MultipleResultsFound, NoResultFound
-from sqlalchemy.sql import func
+from sqlalchemy import func
 from xonstat.models import *
 from xonstat.util import strip_colors, qfont_decode
 from xonstat.util import page_url, html_colors
@@ -29,6 +29,7 @@ def search_q(nick=None, server_name=None, map_name=None, create_dt=None,
             q = q.filter(
                     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
@@ -73,7 +74,7 @@ def search_q(nick=None, server_name=None, map_name=None, create_dt=None,
 
     return (result_type, q)
 
-def search(request):
+def _search_data(request):
     fs = None
     nick = None
     server_name = None
@@ -82,9 +83,11 @@ def search(request):
     result_type = None
     results = None
     query = None
+    _query = {}
+
 
-    if 'page' in request.matchdict:
-        current_page = request.matchdict['page']
+    if request.params.has_key('page'):
+        current_page = request.params['page']
     else:
         current_page = 1
 
@@ -114,13 +117,25 @@ def search(request):
         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
 
         (result_type, q) = search_q(nick=nick, server_name=server_name,
                 map_name=map_name, gametypes=gametypes)
 
         try:
             if q != None:
-                results = Page(q, current_page, url=page_url)
+                results = Page(q, current_page, items_per_page=10, url=page_url)
         except Exception as e:
             raise e
             result_type = None
@@ -130,3 +145,11 @@ def search(request):
             'results':results,
             'query':query,
             }
+
+
+def search(request):
+    return _search_data(request)
+
+
+def search_json(request):
+    return [{'status':'not implemented'}]