diff --git a/database.py b/database.py index 98d3472..d9cc966 100644 --- a/database.py +++ b/database.py @@ -39,12 +39,11 @@ class GobanTable(SQLObject): player1 = StringCol() player2 = StringCol() size = IntCol() - #name = StringCol(default=helper.generate_game_name(), unique=True,notNone=True,alternateID=True) - turn_number = 1 + turn_number = IntCol(default=1) description = StringCol(default=None) - sgf = gnugo.create_sgf_file(size) - created = int(time.time()) - lastmove = int(time.time()) + sgf = StringCol(default=gnugo.create_sgf_file(size)) + created = IntCol(default=int(time.time())) + lastmove = IntCol(default=int(time.time())) def players(self): """returns both player names as a tuple""" @@ -72,7 +71,7 @@ class Users(SQLObject): timeout - when does session time out? """ username = StringCol(unique=True,notNone=True,alternateID=True) - password = StringCol() + password = StringCol(notNone=True) game1 = StringCol(default=None) game2 = StringCol(default=None) game3 = StringCol(default=None) diff --git a/playgame.py b/playgame.py index baf66e8..39ee424 100644 --- a/playgame.py +++ b/playgame.py @@ -51,9 +51,7 @@ class PlayGame: sessionid = cpg.request.sessionMap["_sessionId"] if myuser.sessionid == sessionid: if coord != None: - ret = self.process_form(game,coord) - if ret == "": - return self.display_goban(game) + return self.process_form(game,coord) else: return self.display_goban(game) @@ -126,7 +124,7 @@ class PlayGame: mygame.sgf = new_sgf mygame.turn_number = turn + 1 mygame.set_time() - return "" + return self.display_goban(gamename) else: #move not ok settings["Data.Message"] = "This is not a legal move (says Gnugo)." return self.display_goban(gamename,settings)