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

it now stores entries, prizepool and endTime into TT

Browse Source
This commit is contained in:
steffen123 2010-07-08 23:46:54 +02:00
parent e815cc38db
commit 5b64ad771a
4 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pyfpdb/Database.py
View File

@ -1932,7 +1932,7 @@ class Database:
print "***Error sending finish: "+err[2]+"("+str(err[1])+"): "+str(sys.exc_info()[1]) print "***Error sending finish: "+err[2]+"("+str(err[1])+"): "+str(sys.exc_info()[1])
# end def send_finish_msg(): # end def send_finish_msg():
def createOrUpdateTourneyType(self, hand): def createOrUpdateTourneyType(self, hand):#note: this method is used on Hand and TourneySummary objects
tourneyTypeId = 1 tourneyTypeId = 1
# Check if Tourney exists, and if so retrieve TTypeId : in that case, check values of the ttype # Check if Tourney exists, and if so retrieve TTypeId : in that case, check values of the ttype
@ -1978,7 +1978,7 @@ class Database:
return tourneyTypeId return tourneyTypeId
#end def createOrUpdateTourneyType #end def createOrUpdateTourneyType
def createOrUpdateTourney(self, hand): def createOrUpdateTourney(self, hand, source):#note: this method is used on Hand and TourneySummary objects
cursor = self.get_cursor() cursor = self.get_cursor()
cursor.execute (self.sql.query['getTourneyIdByTourneyNo'].replace('%s', self.sql.query['placeholder']), cursor.execute (self.sql.query['getTourneyIdByTourneyNo'].replace('%s', self.sql.query['placeholder']),
(hand.siteId, hand.tourNo)) (hand.siteId, hand.tourNo))
@ -1987,21 +1987,29 @@ class Database:
if result != None and len(result)==1: if result != None and len(result)==1:
tourneyId = result[0] tourneyId = result[0]
else: else:
if source=="HHC":
cursor.execute (self.sql.query['insertTourney'].replace('%s', self.sql.query['placeholder']), cursor.execute (self.sql.query['insertTourney'].replace('%s', self.sql.query['placeholder']),
(hand.tourneyTypeId, hand.tourNo, None, None, (hand.tourneyTypeId, hand.tourNo, None, None,
hand.startTime, None, None, None, hand.startTime, None, None, None, None, None))
None, None)) elif source=="TS":
cursor.execute (self.sql.query['insertTourney'].replace('%s', self.sql.query['placeholder']),
(hand.tourneyTypeId, hand.tourNo, hand.entries, hand.prizepool,
hand.startTime, hand.endTime, hand.tourneyName, hand.matrixIdProcessed, hand.totalRebuyCount, hand.totalAddOnCount))
else:
raise FpdbParseError("invalid source in Database.createOrUpdateTourney")
tourneyId = self.get_last_insert_id(cursor) tourneyId = self.get_last_insert_id(cursor)
return tourneyId return tourneyId
#end def createOrUpdateTourney #end def createOrUpdateTourney
def createOrUpdateTourneysPlayers(self, hand, source=None): def createOrUpdateTourneysPlayers(self, hand, source):#note: this method is used on Hand and TourneySummary objects
tourneysPlayersIds=[] tourneysPlayersIds=[]
for player in hand.players: for player in hand.players:
if source=="TourneySummary": #TODO remove this horrible hack if source=="TS": #TODO remove this horrible hack
playerId = hand.dbid_pids[player] playerId = hand.dbid_pids[player]
else: elif source=="HHC":
playerId = hand.dbid_pids[player[1]] playerId = hand.dbid_pids[player[1]]
else:
raise FpdbParseError("invalid source in Database.createOrUpdateTourneysPlayers")
cursor = self.get_cursor() cursor = self.get_cursor()
cursor.execute (self.sql.query['getTourneysPlayersId'].replace('%s', self.sql.query['placeholder']), cursor.execute (self.sql.query['getTourneysPlayersId'].replace('%s', self.sql.query['placeholder']),

4
pyfpdb/Hand.py
View File

@ -229,9 +229,9 @@ dealt whether they were seen in a 'dealt to' line
if self.tourNo!=None: if self.tourNo!=None:
self.tourneyTypeId = db.createOrUpdateTourneyType(self) self.tourneyTypeId = db.createOrUpdateTourneyType(self)
db.commit() db.commit()
self.tourneyId = db.createOrUpdateTourney(self) self.tourneyId = db.createOrUpdateTourney(self, "HHC")
db.commit() db.commit()
self.tourneysPlayersIds = db.createOrUpdateTourneysPlayers(self) self.tourneysPlayersIds = db.createOrUpdateTourneysPlayers(self, "HHC")
db.commit() db.commit()
#end def prepInsert #end def prepInsert

6
pyfpdb/TourneySummary.py
View File

@ -76,6 +76,7 @@ class TourneySummary(object):
self.isMatrix = False self.isMatrix = False
self.isShootout = False self.isShootout = False
self.matrixMatchId = None # For Matrix tourneys : 1-4 => match tables (traditionnal), 0 => Positional winnings info self.matrixMatchId = None # For Matrix tourneys : 1-4 => match tables (traditionnal), 0 => Positional winnings info
self.matrixIdProcessed = None
self.subTourneyBuyin = None self.subTourneyBuyin = None
self.subTourneyFee = None self.subTourneyFee = None
self.rebuyChips = 0 self.rebuyChips = 0
@ -133,6 +134,7 @@ class TourneySummary(object):
("ADDON", self.isAddOn), ("ADDON", self.isAddOn),
("KO", self.isKO), ("KO", self.isKO),
("MATRIX", self.isMatrix), ("MATRIX", self.isMatrix),
("MATRIX ID PROCESSED", self.matrixIdProcessed),
("SHOOTOUT", self.isShootout), ("SHOOTOUT", self.isShootout),
("MATRIX MATCH ID", self.matrixMatchId), ("MATRIX MATCH ID", self.matrixMatchId),
("SUB TOURNEY BUY IN", self.subTourneyBuyin), ("SUB TOURNEY BUY IN", self.subTourneyBuyin),
@ -202,9 +204,9 @@ class TourneySummary(object):
#print "TS.self before starting insert",self #print "TS.self before starting insert",self
self.tourneyTypeId = self.db.createOrUpdateTourneyType(self) self.tourneyTypeId = self.db.createOrUpdateTourneyType(self)
self.db.commit() self.db.commit()
self.tourneyId = self.db.createOrUpdateTourney(self) self.tourneyId = self.db.createOrUpdateTourney(self, "TS")
self.db.commit() self.db.commit()
self.tourneysPlayersIds = self.db.createOrUpdateTourneysPlayers(self, "TourneySummary") self.tourneysPlayersIds = self.db.createOrUpdateTourneysPlayers(self, "TS")
self.db.commit() self.db.commit()
logging.debug("Tourney Insert/Update done") logging.debug("Tourney Insert/Update done")

2
pyfpdb/fpdb.pyw
View File

@ -741,7 +741,7 @@ class fpdb:
def import_imap_summaries(self, widget, data=None): def import_imap_summaries(self, widget, data=None):
result=ImapSummaries.run(self.config, self.db) result=ImapSummaries.run(self.config, self.db)
print "import imap summaries result:", result #print "import imap summaries result:", result
#end def import_imap_summaries #end def import_imap_summaries
def load_profile(self, create_db = False): def load_profile(self, create_db = False):