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

Merge branch 'chazdazzle' of git://github.com/ChazDazzle/fpdb-chaz

Browse Source
This commit is contained in:
Worros 2011-03-30 11:50:33 +08:00
commit 9a87d7d88a
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pyfpdb/Database.py
View File

@ -1855,7 +1855,7 @@ class Database:
hbulk.append( [ hdata['tableName'], hbulk.append( [ hdata['tableName'],
hdata['siteHandNo'], hdata['siteHandNo'],
hdata['tourneyId'], hdata['tourneyId'],
hdata['gameTypeId'], hdata['gametypeId'],
hdata['sessionId'], hdata['sessionId'],
hdata['gameSessionId'], hdata['gameSessionId'],
hdata['startTime'], hdata['startTime'],

4
pyfpdb/Hand.py
View File

@ -102,7 +102,7 @@ class Hand(object):
self.seating = [] self.seating = []
self.players = [] self.players = []
self.posted = [] self.posted = []
self.tourneysPlayersIds = [] self.tourneysPlayersIds = {}
# Collections indexed by street names # Collections indexed by street names
self.bets = {} self.bets = {}
@ -277,7 +277,7 @@ dealt whether they were seen in a 'dealt to' line
""" Function to insert Hand into database """ Function to insert Hand into database
Should not commit, and do minimal selects. Callers may want to cache commits Should not commit, and do minimal selects. Callers may want to cache commits
db: a connected Database object""" db: a connected Database object"""
self.hands['gameTypeId'] = self.dbid_gt self.hands['gametypeId'] = self.dbid_gt
self.hands['seats'] = len(self.dbid_pids) self.hands['seats'] = len(self.dbid_pids)
hbulk = db.storeHand(self.hands, hbulk, doinsert, printtest) hbulk = db.storeHand(self.hands, hbulk, doinsert, printtest)
return hbulk return hbulk

2
pyfpdb/WinamaxToFpdb.py
View File

@ -52,7 +52,7 @@ class Winamax(HandHistoryConverter):
siteId = 14 # Needs to match id entry in Sites database siteId = 14 # Needs to match id entry in Sites database
mixes = { } # Legal mixed games mixes = { } # Legal mixed games
sym = {'USD': "\$", 'CAD': "\$", 'T$': "", "EUR": "\xe2\x82\xac", "GBP": "\xa3"} # ADD Euro, Sterling, etc HERE sym = {'USD': "\$", 'CAD': "\$", 'T$': "", "EUR": u"\xe2\x82\xac|\u20ac", "GBP": "\xa3"} # ADD Euro, Sterling, etc HERE
substitutions = { substitutions = {
'LEGAL_ISO' : "USD|EUR|GBP|CAD|FPP", # legal ISO currency codes 'LEGAL_ISO' : "USD|EUR|GBP|CAD|FPP", # legal ISO currency codes
'LS' : u"\$|\xe2\x82\xac|\u20ac|" # legal currency symbols - Euro(cp1252, utf-8) 'LS' : u"\$|\xe2\x82\xac|\u20ac|" # legal currency symbols - Euro(cp1252, utf-8)