evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added HandsPlayers.sitout as discussed on ML

Browse Source
This commit is contained in:
steffen123 2010-07-02 22:17:15 +02:00
parent 6e296cf38f
commit 6b417ebdd4
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pyfpdb/Database.py
View File

@ -75,7 +75,7 @@ except ImportError:
use_numpy = False use_numpy = False
DB_VERSION = 122 DB_VERSION = 123
# Variance created as sqlite has a bunch of undefined aggregate functions. # Variance created as sqlite has a bunch of undefined aggregate functions.
@ -1561,6 +1561,7 @@ class Database:
pids[p], pids[p],
pdata[p]['startCash'], pdata[p]['startCash'],
pdata[p]['seatNo'], pdata[p]['seatNo'],
pdata[p]['sitout'],
pdata[p]['card1'], pdata[p]['card1'],
pdata[p]['card2'], pdata[p]['card2'],
pdata[p]['card3'], pdata[p]['card3'],

2
pyfpdb/DerivedStats.py
View File

@ -1,4 +1,5 @@
#!/usr/bin/python #!/usr/bin/python
# -*- coding: utf-8 -*-
#Copyright 2008 Carl Gherardi #Copyright 2008 Carl Gherardi
#This program is free software: you can redistribute it and/or modify #This program is free software: you can redistribute it and/or modify
@ -139,6 +140,7 @@ class DerivedStats():
for player in hand.players: for player in hand.players:
self.handsplayers[player[1]]['seatNo'] = player[0] self.handsplayers[player[1]]['seatNo'] = player[0]
self.handsplayers[player[1]]['startCash'] = int(100 * Decimal(player[2])) self.handsplayers[player[1]]['startCash'] = int(100 * Decimal(player[2]))
self.handsplayers[player[1]]['sitout'] = False #TODO: implement actual sitout detection
# XXX: enumerate(list, start=x) is python 2.6 syntax; 'start' # XXX: enumerate(list, start=x) is python 2.6 syntax; 'start'
#for i, street in enumerate(hand.actionStreets[2:], start=1): #for i, street in enumerate(hand.actionStreets[2:], start=1):

7
pyfpdb/SQL.py
View File

@ -494,6 +494,7 @@ class Sql:
startCash INT NOT NULL, startCash INT NOT NULL,
position CHAR(1), position CHAR(1),
seatNo SMALLINT NOT NULL, seatNo SMALLINT NOT NULL,
sitout BOOLEAN NOT NULL,
card1 smallint NOT NULL, /* 0=none, 1-13=2-Ah 14-26=2-Ad 27-39=2-Ac 40-52=2-As */ card1 smallint NOT NULL, /* 0=none, 1-13=2-Ah 14-26=2-Ad 27-39=2-Ac 40-52=2-As */
card2 smallint NOT NULL, card2 smallint NOT NULL,
@ -610,6 +611,7 @@ class Sql:
startCash INT NOT NULL, startCash INT NOT NULL,
position CHAR(1), position CHAR(1),
seatNo SMALLINT NOT NULL, seatNo SMALLINT NOT NULL,
sitout BOOLEAN NOT NULL,
card1 smallint NOT NULL, /* 0=none, 1-13=2-Ah 14-26=2-Ad 27-39=2-Ac 40-52=2-As */ card1 smallint NOT NULL, /* 0=none, 1-13=2-Ah 14-26=2-Ad 27-39=2-Ac 40-52=2-As */
card2 smallint NOT NULL, card2 smallint NOT NULL,
@ -725,6 +727,7 @@ class Sql:
startCash INT NOT NULL, startCash INT NOT NULL,
position TEXT, position TEXT,
seatNo INT NOT NULL, seatNo INT NOT NULL,
sitout BOOLEAN NOT NULL,
card1 INT NOT NULL, /* 0=none, 1-13=2-Ah 14-26=2-Ad 27-39=2-Ac 40-52=2-As */ card1 INT NOT NULL, /* 0=none, 1-13=2-Ah 14-26=2-Ad 27-39=2-Ac 40-52=2-As */
card2 INT NOT NULL, card2 INT NOT NULL,
@ -3748,6 +3751,7 @@ class Sql:
playerId, playerId,
startCash, startCash,
seatNo, seatNo,
sitout,
card1, card1,
card2, card2,
card3, card3,
@ -3847,7 +3851,8 @@ class Sql:
%s, %s, %s, %s, %s, %s, %s, %s, %s, %s,
%s, %s, %s, %s, %s, %s, %s, %s, %s, %s,
%s, %s, %s, %s, %s, %s, %s, %s, %s, %s,
%s, %s, %s, %s, %s %s, %s, %s, %s, %s,
%s
)""" )"""
if db_server == 'mysql': if db_server == 'mysql':