On second thought, don't

[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 3e16e77..13700b6
--- a/xonstat/views/search.py
+++ b/xonstat/views/search.py
@@ -74,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
@@ -85,8 +85,9 @@ def search(request):
     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
 
@@ -134,7 +135,7 @@ def search(request):
 
         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
@@ -144,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'}]