Redo SQLA query for game_index (it works!). Change template to utilize paging parameters.

diff --git a/xonstat/templates/game_index.mako b/xonstat/templates/game_index.mako
index 56cb2a515e31dae17d118ab3a5636df6d7ccc842..633ae749d1edc03e11089bc8a5b4951048c8db2c 100755 (executable)
--- a/xonstat/templates/game_index.mako
+++ b/xonstat/templates/game_index.mako
@@ -10,8 +10,15 @@ Game Index - ${parent.title()}
 % else:\r
 <h2>Recent Games</h2>\r
 <ul>\r
-% for (game_id, server_id, server_name, map_id, map_name) in games:\r
-   <li>game <a href="${request.route_url("game_info", id=game_id)}" name="Game info page for game #${game_id}">#${game_id}:</a> <a href="${request.route_url("map_info", id=map_id)}" name="Map info page for ${map_name}">${map_name}</a> on <a href="${request.route_url("server_info", id=server_id)}" name="Server info page for ${server_name}">${server_name}</a></li>\r
+% for (game, server, map) in games:\r
+   <li>game <a href="${request.route_url("game_info", id=game.game_id)}" name="Game info page for game #${game.game_id}">#${game.game_id}:</a> <a href="${request.route_url("map_info", id=map.map_id)}" name="Map info page for ${map.name}">${map.name}</a> on <a href="${request.route_url("server_info", id=server.server_id)}" name="Server info page for ${server.name}">${server.name}</a></li>\r
 % endfor\r
 </ul>\r
 % endif\r
+\r
+% if games.last_page:\r
+<a href="${request.route_url("game_index_paged", page=games.previous_page)}" name="Previous Page">Previous</a>\r
+% endif\r
+% if games.next_page:\r
+<a href="${request.route_url("game_index_paged", page=games.next_page)}" name="Next Page">Next</a>\r
+% endif\r

diff --git a/xonstat/views.py b/xonstat/views.py
index 3f9c58a04b8063e9f7f8557d0876f665a88159fe..30861629b422fa7b2c7c8bbb0be4956001103487 100755 (executable)
--- a/xonstat/views.py
+++ b/xonstat/views.py
@@ -7,6 +7,7 @@ from webhelpers.paginate import Page, PageURL
 
 from xonstat.models import *
 from sqlalchemy.orm.exc import MultipleResultsFound, NoResultFound
+from sqlalchemy import desc
 
 
 import logging
@@ -63,22 +64,20 @@ def page_url(page):
     return current_route_url(request, page=page, _query=request.GET)
 
 def game_index(request):
-    if 'page_number' in request.matchdict:
-        current_page = request.matchdict['page_number']
+    if 'page' in request.matchdict:
+        current_page = request.matchdict['page']
     else:
         current_page = 1
 
-    games_q = DBSession.query("game_id", "server_id", "server_name", 
-                "map_id", "map_name").\
-                from_statement("select g.game_id, s.server_id, "
-                "s.name as server_name, m.map_id, m.name as map_name "
-                "from games g, servers s, maps m "
-                "where g.server_id = s.server_id "
-                "and g.map_id = m.map_id "
-                "order by g.start_dt desc")
+    games_q = DBSession.query(Game, Server, Map).\
+            filter(Game.server_id == Server.server_id).\
+            filter(Game.map_id == Map.map_id).\
+            order_by(Game.game_id.desc())
 
     games = Page(games_q, current_page, url=page_url)
 
+    log.debug(games)
+
     return {'games':games}