From 40c17cffaa082396735cd1b930fa6aa23bf3f2df Mon Sep 17 00:00:00 2001 From: Worros Date: Sun, 22 Mar 2009 18:52:30 +0900 Subject: [PATCH 1/3] Recognise deep 6 tables at Full Tilt --- pyfpdb/FulltiltToFpdb.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py index b5f0cc4e..6a897bad 100755 --- a/pyfpdb/FulltiltToFpdb.py +++ b/pyfpdb/FulltiltToFpdb.py @@ -124,8 +124,8 @@ follow : whether to tail -f the input""" hand.starttime = time.strptime(m.group('DATETIME'), "%H:%M:%S ET - %Y/%m/%d") hand.maxseats = 8 # assume 8-max until we see otherwise if m.group('TABLEATTRIBUTES'): - m2 = re.search("(\d+) max", m.group('TABLEATTRIBUTES')) - hand.maxseats = int(m2.group(1)) + m2 = re.search("(deep )?(\d+)( max)?", m.group('TABLEATTRIBUTES')) + hand.maxseats = int(m2.group(2)) # These work, but the info is already in the Hand class - should be used for tourneys though. # m.group('SB') # m.group('BB') From 6e021ea3a4ff8d4f41fca9845dd02f9dfef2e2d1 Mon Sep 17 00:00:00 2001 From: Worros Date: Sun, 22 Mar 2009 18:56:51 +0900 Subject: [PATCH 2/3] Remove old graph queries from file --- pyfpdb/FpdbSQLQueries.py | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/pyfpdb/FpdbSQLQueries.py b/pyfpdb/FpdbSQLQueries.py index c3260466..24948986 100644 --- a/pyfpdb/FpdbSQLQueries.py +++ b/pyfpdb/FpdbSQLQueries.py @@ -599,37 +599,6 @@ class FpdbSQLQueries: ################################ - # Returns all cash game handIds and the money won(winnings is the final pot) - # by the playerId for a single site. - if(self.dbname == 'MySQL InnoDB') or (self.dbname == 'PostgreSQL'): - self.query['getRingWinningsAllGamesPlayerIdSite'] = """SELECT handId, winnings FROM HandsPlayers - INNER JOIN Players ON HandsPlayers.playerId = Players.id - INNER JOIN Hands ON Hands.id = HandsPlayers.handId - WHERE Players.name = %s AND Players.siteId = %s AND (tourneysPlayersId IS NULL) - ORDER BY handStart""" - elif(self.dbname == 'SQLite'): - #Probably doesn't work. - self.query['getRingWinningsAllGamesPlayerIdSite'] = """SELECT handId, winnings FROM HandsPlayers - INNER JOIN Players ON HandsPlayers.playerId = Players.id - INNER JOIN Hands ON Hands.id = HandsPlayers.handId - WHERE Players.name = %s AND Players.siteId = %s AND (tourneysPlayersId IS NULL) - ORDER BY handStart""" - - # Returns the profit for a given ring game handId, Total pot - money invested by playerId - if(self.dbname == 'MySQL InnoDB') or (self.dbname == 'PostgreSQL'): - self.query['getRingProfitFromHandId'] = """SELECT SUM(amount) FROM HandsActions - INNER JOIN HandsPlayers ON HandsActions.handPlayerId = HandsPlayers.id - INNER JOIN Players ON HandsPlayers.playerId = Players.id - WHERE Players.name = %s AND HandsPlayers.handId = %s - AND Players.siteId = %s AND (tourneysPlayersId IS NULL)""" - elif(self.dbname == 'SQLite'): - #Probably doesn't work. - self.query['getRingProfitFromHandId'] = """SELECT SUM(amount) FROM HandsActions - INNER JOIN HandsPlayers ON HandsActions.handPlayerId = HandsPlayers.id - INNER JOIN Players ON HandsPlayers.playerId = Players.id - WHERE Players.name = %s AND HandsPlayers.handId = %s - AND Players.siteId = %s AND (tourneysPlayersId IS NULL)""" - if(self.dbname == 'MySQL InnoDB') or (self.dbname == 'PostgreSQL'): self.query['getPlayerId'] = """SELECT id from Players where name = %s""" elif(self.dbname == 'SQLite'): From 5e5e79f08ad331b40dfe2263ff26bf8d78e4f22f Mon Sep 17 00:00:00 2001 From: Worros Date: Mon, 23 Mar 2009 22:18:22 +0900 Subject: [PATCH 3/3] Fix typo --- pyfpdb/fpdb.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py index 5cdd3d3b..b5931bde 100755 --- a/pyfpdb/fpdb.py +++ b/pyfpdb/fpdb.py @@ -337,7 +337,7 @@ class fpdb: new_ps_thread=GuiPositionalStats.GuiPositionalStats(self.db, self.config, self.querydict) self.threads.append(new_ps_thread) ps_tab=new_ps_thread.get_vbox() - self.add_and_display_tab(ps_tab, "Ppositional Stats") + self.add_and_display_tab(ps_tab, "Positional Stats") def tab_main_help(self, widget, data):