Merge branch 'master' of git://git.assembla.com/fpdb-sql

pyfpdb/FpdbSQLQueries.py

@@ -1053,6 +1053,8 @@ class FpdbSQLQueries:
                      where hc.playerId in <player_test>
                      and   <gtbigBlind_test>
                      and   hc.activeSeats <seats_test>
+                     and   concat( '20', substring(hc.styleKey,2,2), '-', substring(hc.styleKey,4,2), '-' 
+                                 , substring(hc.styleKey,6,2) ) <datestest>
                      group by gt.base
                           ,gt.category
                           ,upper(gt.limitType)
@@ -1073,6 +1075,7 @@ class FpdbSQLQueries:
                            inner join Hands h        ON h.id            = hp.handId
                            where hp.playerId in <player_test>
                            and   hp.tourneysPlayersId IS NULL
+                           and   date_format(h.handStart, '%Y-%m-%d') <datestest>
                            group by hp.handId, gtId, hp.totalProfit
                           ) hprof
                       group by hprof.gtId
@@ -1153,6 +1156,8 @@ class FpdbSQLQueries:
                      where hc.playerId in <player_test>
                      and   <gtbigBlind_test>
                      and   hc.activeSeats <seats_test>
+                     and   '20' || SUBSTR(hc.styleKey,2,2) || '-' || SUBSTR(hc.styleKey,4,2) || '-' 
+                           || SUBSTR(hc.styleKey,6,2) <datestest>
                      group by gt.base
                           ,gt.category
                           ,upper(gt.limitType)
@@ -1173,6 +1178,7 @@ class FpdbSQLQueries:
                            inner join Hands h   ON (h.id = hp.handId)
                            where hp.playerId in <player_test>
                            and   hp.tourneysPlayersId IS NULL
+                           and   to_char(h.handStart, 'YYYY-MM-DD') <datestest>
                            group by hp.handId, gtId, hp.totalProfit
                           ) hprof
                       group by hprof.gtId
@@ -1275,6 +1281,8 @@ class FpdbSQLQueries:
                      where hc.playerId in <player_test>
                      and   <gtbigBlind_test>
                      and   hc.activeSeats <seats_test>
+                     and   concat( '20', substring(hc.styleKey,2,2), '-', substring(hc.styleKey,4,2), '-' 
+                                 , substring(hc.styleKey,6,2) ) <datestest>
                      group by gt.base
                           ,gt.category
                           ,upper(gt.limitType)
@@ -1305,6 +1313,7 @@ class FpdbSQLQueries:
                            inner join Hands h  ON  (h.id = hp.handId)
                            where hp.playerId in <player_test>
                            and   hp.tourneysPlayersId IS NULL
+                           and   date_format(h.handStart, '%Y-%m-%d') <datestest>
                            group by hp.handId, gtId, hp.position, hp.totalProfit
                           ) hprof
                       group by hprof.gtId, PlPosition
@@ -1409,6 +1418,8 @@ class FpdbSQLQueries:
                      where hc.playerId in <player_test>
                      and   <gtbigBlind_test>
                      and   hc.activeSeats <seats_test>
+                     and   '20' || SUBSTR(hc.styleKey,2,2) || '-' || SUBSTR(hc.styleKey,4,2) || '-' 
+                           || SUBSTR(hc.styleKey,6,2) <datestest>
                      group by gt.base
                           ,gt.category
                           ,upper(gt.limitType)
@@ -1439,6 +1450,7 @@ class FpdbSQLQueries:
                            inner join Hands h  ON  (h.id = hp.handId)
                            where hp.playerId in <player_test>
                            and   hp.tourneysPlayersId IS NULL
+                           and   to_char(h.handStart, 'YYYY-MM-DD') <datestest>
                            group by hp.handId, gameTypeId, hp.position, hp.totalProfit
                           ) hprof
                       group by hprof.gtId, PlPosition
@@ -1662,7 +1674,7 @@ class FpdbSQLQueries:
                 )
                 SELECT h.gametypeId
                       ,hp.playerId
-                      ,hp.activeSeats
+                      ,h.seats
                       ,case when hp.position = 'B' then 'B'
                             when hp.position = 'S' then 'S'
                             when hp.position = '0' then 'D'
@@ -1678,7 +1690,7 @@ class FpdbSQLQueries:
                             else 'E'
                        end                                            AS hc_position
                       ,hp.tourneyTypeId
-                      ,'A000000'  /* All-time cache, no key required */
+                      ,date_format(h.handStart, 'd%y%m%d')
                       ,count(1)
                       ,sum(wonWhenSeenStreet1)
                       ,sum(wonAtSD)
@@ -1738,9 +1750,158 @@ class FpdbSQLQueries:
                 INNER JOIN Hands h ON (h.id = hp.handId)
                 GROUP BY h.gametypeId
                         ,hp.playerId
-                        ,hp.activeSeats
+                        ,h.seats
                         ,hc_position
                         ,hp.tourneyTypeId
+                        ,date_format(h.handStart, 'd%y%m%d')
+"""
+        elif (self.dbname == 'PostgreSQL')  or (self.dbname == 'SQLite'):
+            self.query['rebuildHudCache'] = """
+                INSERT INTO HudCache
+                (gametypeId
+                ,playerId
+                ,activeSeats
+                ,position
+                ,tourneyTypeId
+                ,styleKey
+                ,HDs
+                ,wonWhenSeenStreet1
+                ,wonAtSD
+                ,street0VPI
+                ,street0Aggr
+                ,street0_3BChance
+                ,street0_3BDone
+                ,street1Seen
+                ,street2Seen
+                ,street3Seen
+                ,street4Seen
+                ,sawShowdown
+                ,street1Aggr
+                ,street2Aggr
+                ,street3Aggr
+                ,street4Aggr
+                ,otherRaisedStreet1
+                ,otherRaisedStreet2
+                ,otherRaisedStreet3
+                ,otherRaisedStreet4
+                ,foldToOtherRaisedStreet1
+                ,foldToOtherRaisedStreet2
+                ,foldToOtherRaisedStreet3
+                ,foldToOtherRaisedStreet4
+                ,stealAttemptChance
+                ,stealAttempted
+                ,foldBbToStealChance
+                ,foldedBbToSteal
+                ,foldSbToStealChance
+                ,foldedSbToSteal
+                ,street1CBChance
+                ,street1CBDone
+                ,street2CBChance
+                ,street2CBDone
+                ,street3CBChance
+                ,street3CBDone
+                ,street4CBChance
+                ,street4CBDone
+                ,foldToStreet1CBChance
+                ,foldToStreet1CBDone
+                ,foldToStreet2CBChance
+                ,foldToStreet2CBDone
+                ,foldToStreet3CBChance
+                ,foldToStreet3CBDone
+                ,foldToStreet4CBChance
+                ,foldToStreet4CBDone
+                ,totalProfit
+                ,street1CheckCallRaiseChance
+                ,street1CheckCallRaiseDone
+                ,street2CheckCallRaiseChance
+                ,street2CheckCallRaiseDone
+                ,street3CheckCallRaiseChance
+                ,street3CheckCallRaiseDone
+                ,street4CheckCallRaiseChance
+                ,street4CheckCallRaiseDone
+                )
+                SELECT h.gametypeId
+                      ,hp.playerId
+                      ,h.seats
+                      ,case when hp.position = 'B' then 'B'
+                            when hp.position = 'S' then 'S'
+                            when hp.position = '0' then 'D'
+                            when hp.position = '1' then 'C'
+                            when hp.position = '2' then 'M'
+                            when hp.position = '3' then 'M'
+                            when hp.position = '4' then 'M'
+                            when hp.position = '5' then 'E'
+                            when hp.position = '6' then 'E'
+                            when hp.position = '7' then 'E'
+                            when hp.position = '8' then 'E'
+                            when hp.position = '9' then 'E'
+                            else 'E'
+                       end                                            AS hc_position
+                      ,hp.tourneyTypeId
+                      ,'d' || to_char(h.handStart, 'YYMMDD')
+                      ,count(1)
+                      ,sum(wonWhenSeenStreet1)
+                      ,sum(wonAtSD)
+                      ,sum(CAST(street0VPI as integer)) 
+                      ,sum(CAST(street0Aggr as integer)) 
+                      ,sum(CAST(street0_3BChance as integer)) 
+                      ,sum(CAST(street0_3BDone as integer)) 
+                      ,sum(CAST(street1Seen as integer)) 
+                      ,sum(CAST(street2Seen as integer)) 
+                      ,sum(CAST(street3Seen as integer)) 
+                      ,sum(CAST(street4Seen as integer)) 
+                      ,sum(CAST(sawShowdown as integer)) 
+                      ,sum(CAST(street1Aggr as integer)) 
+                      ,sum(CAST(street2Aggr as integer)) 
+                      ,sum(CAST(street3Aggr as integer)) 
+                      ,sum(CAST(street4Aggr as integer)) 
+                      ,sum(CAST(otherRaisedStreet1 as integer)) 
+                      ,sum(CAST(otherRaisedStreet2 as integer)) 
+                      ,sum(CAST(otherRaisedStreet3 as integer)) 
+                      ,sum(CAST(otherRaisedStreet4 as integer)) 
+                      ,sum(CAST(foldToOtherRaisedStreet1 as integer)) 
+                      ,sum(CAST(foldToOtherRaisedStreet2 as integer)) 
+                      ,sum(CAST(foldToOtherRaisedStreet3 as integer)) 
+                      ,sum(CAST(foldToOtherRaisedStreet4 as integer)) 
+                      ,sum(CAST(stealAttemptChance as integer)) 
+                      ,sum(CAST(stealAttempted as integer)) 
+                      ,sum(CAST(foldBbToStealChance as integer)) 
+                      ,sum(CAST(foldedBbToSteal as integer)) 
+                      ,sum(CAST(foldSbToStealChance as integer)) 
+                      ,sum(CAST(foldedSbToSteal as integer)) 
+                      ,sum(CAST(street1CBChance as integer)) 
+                      ,sum(CAST(street1CBDone as integer)) 
+                      ,sum(CAST(street2CBChance as integer)) 
+                      ,sum(CAST(street2CBDone as integer)) 
+                      ,sum(CAST(street3CBChance as integer)) 
+                      ,sum(CAST(street3CBDone as integer)) 
+                      ,sum(CAST(street4CBChance as integer)) 
+                      ,sum(CAST(street4CBDone as integer)) 
+                      ,sum(CAST(foldToStreet1CBChance as integer)) 
+                      ,sum(CAST(foldToStreet1CBDone as integer)) 
+                      ,sum(CAST(foldToStreet2CBChance as integer)) 
+                      ,sum(CAST(foldToStreet2CBDone as integer)) 
+                      ,sum(CAST(foldToStreet3CBChance as integer)) 
+                      ,sum(CAST(foldToStreet3CBDone as integer)) 
+                      ,sum(CAST(foldToStreet4CBChance as integer)) 
+                      ,sum(CAST(foldToStreet4CBDone as integer)) 
+                      ,sum(CAST(totalProfit as integer)) 
+                      ,sum(CAST(street1CheckCallRaiseChance as integer)) 
+                      ,sum(CAST(street1CheckCallRaiseDone as integer)) 
+                      ,sum(CAST(street2CheckCallRaiseChance as integer)) 
+                      ,sum(CAST(street2CheckCallRaiseDone as integer)) 
+                      ,sum(CAST(street3CheckCallRaiseChance as integer)) 
+                      ,sum(CAST(street3CheckCallRaiseDone as integer)) 
+                      ,sum(CAST(street4CheckCallRaiseChance as integer)) 
+                      ,sum(CAST(street4CheckCallRaiseDone as integer)) 
+                FROM HandsPlayers hp
+                INNER JOIN Hands h ON (h.id = hp.handId)
+                GROUP BY h.gametypeId
+                        ,hp.playerId
+                        ,h.seats
+                        ,hc_position
+                        ,hp.tourneyTypeId
+                        ,to_char(h.handStart, 'YYMMDD')
 """
 
 

pyfpdb/GuiPlayerStats.py

@@ -259,11 +259,14 @@ class GuiPlayerStats (threading.Thread):
                 if col == 1 and holecards:
                     listcols[col].pack_start(textcell, expand=True)
                 else:
-                    listcols[col].pack_start(textcell, expand=False)
+                    listcols[col].pack_start(textcell, expand=True)
                 listcols[col].add_attribute(textcell, 'text', col)
+                listcols[col].set_expand(True)
             else:
-                listcols[col].pack_start(numcell, expand=False)
+                listcols[col].pack_start(numcell, expand=True)
                 listcols[col].add_attribute(numcell, 'text', col)
+                listcols[col].set_alignment(1.0)
+                listcols[col].set_expand(True)
 
         rows = len(result) # +1 for title row
 
@@ -435,6 +438,3 @@ class GuiPlayerStats (threading.Thread):
         detailDialog.destroy()
 
 
-
-
-

pyfpdb/GuiPositionalStats.py

@@ -53,7 +53,7 @@ class GuiPositionalStats (threading.Thread):
                             "LimitSep" :  True,
                             "Seats"    :  True,
                             "SeatSep"  :  True,
-                            "Dates"    :  False,
+                            "Dates"    :  True,
                             "Button1"  :  True,
                             "Button2"  :  False
                           }
@@ -117,6 +117,7 @@ class GuiPositionalStats (threading.Thread):
         siteids = self.filters.getSiteIds()
         limits  = self.filters.getLimits()
         seats = self.filters.getSeats()
+        dates = self.filters.getDates()
         sitenos = []
         playerids = []
 
@@ -140,24 +141,16 @@ class GuiPositionalStats (threading.Thread):
             print "No limits found"
             return
 
-        self.createStatsTable(vbox, playerids, sitenos, limits, seats)
+        self.createStatsTable(vbox, playerids, sitenos, limits, seats, dates)
-
-    def createStatsTable(self, vbox, playerids, sitenos, limits, seats):
-
-
-
 
+    def createStatsTable(self, vbox, playerids, sitenos, limits, seats, dates):
         self.stats_table = gtk.Table(1, 1, False) # gtk table expands as required
         self.stats_table.set_col_spacings(4)
         self.stats_table.show()
         vbox.add(self.stats_table)
 
         row = 0
-
-
-
         col = 0
-
         for t in self.posnheads:
             l = gtk.Label(self.posnheads[col])
             l.show()
@@ -165,7 +158,7 @@ class GuiPositionalStats (threading.Thread):
             col +=1 
 
         tmp = self.sql.query['playerStatsByPosition']
-        tmp = self.refineQuery(tmp, playerids, sitenos, limits, seats)
+        tmp = self.refineQuery(tmp, playerids, sitenos, limits, seats, dates)
         self.cursor.execute(tmp)
         result = self.cursor.fetchall()
 
@@ -219,8 +212,7 @@ class GuiPositionalStats (threading.Thread):
         
         # show totals at bottom
         tmp = self.sql.query['playerStats']
-        tmp = self.refineQuery(tmp, playerids, sitenos, limits, seats)
+        tmp = self.refineQuery(tmp, playerids, sitenos, limits, seats, dates)
-
         self.cursor.execute(tmp)
         result = self.cursor.fetchall()
         rows = len(result)
@@ -274,7 +266,7 @@ class GuiPositionalStats (threading.Thread):
         self.db.db.rollback()
     #end def fillStatsFrame(self, vbox):
 
-    def refineQuery(self, query, playerids, sitenos, limits, seats):
+    def refineQuery(self, query, playerids, sitenos, limits, seats, dates):
         if playerids:
             nametest = str(tuple(playerids))
             nametest = nametest.replace("L", "")
@@ -359,6 +351,10 @@ class GuiPositionalStats (threading.Thread):
             query = query.replace("<groupbygt.bigBlind>", ",gt.bigBlind")
             query = query.replace("<hcgametypeId>", "hc.gametypeId")
             query = query.replace("<hgameTypeId>", "h.gameTypeId")
+
+        # Filter on dates
+        query = query.replace("<datestest>", " between '" + dates[0] + "' and '" + dates[1] + "'")
+
         #print "query =\n", query
         return(query)
     #end def refineQuery(self, query, playerids, sitenos, limits):

pyfpdb/fpdb_import.py

@@ -303,8 +303,7 @@ class Importer:
         try: # sometimes we seem to be getting an empty self.lines, in which case, we just want to return.
             firstline = self.lines[0]
         except:
-            # just skip the debug message and return silently:
+            print "DEBUG: import_fpdb_file: failed on self.lines[0]: '%s' '%s' '%s' '%s' " %( file, site, self.lines, loc)
-            #print "DEBUG: import_fpdb_file: failed on self.lines[0]: '%s' '%s' '%s' '%s' " %( file, site, self.lines, loc)
             return (0,0,0,1,0)
 
         if firstline.find("Tournament Summary")!=-1: