From d888b7d463ee19c4d94a4a8c7ca4d0cbfa68f2e9 Mon Sep 17 00:00:00 2001
From: grindi <email-is-hidden>
Date: Sun, 8 Nov 2009 23:09:14 +0300
Subject: [PATCH 001/320] Party hhc: cleand, added getTableTitleRe

---
 pyfpdb/PartyPokerToFpdb.py | 103 +++++++++++++++++--------------------
 1 file changed, 48 insertions(+), 55 deletions(-)

diff --git a/pyfpdb/PartyPokerToFpdb.py b/pyfpdb/PartyPokerToFpdb.py
index 4ed0c965..ba597881 100755
--- a/pyfpdb/PartyPokerToFpdb.py
+++ b/pyfpdb/PartyPokerToFpdb.py
@@ -26,29 +26,21 @@ from HandHistoryConverter import *
 
 # PartyPoker HH Format
 
-class PartyPokerParseError(FpdbParseError):
-    "Usage: raise PartyPokerParseError(<msg>[, hh=<hh>][, hid=<hid>])"
+class FpdbParseError(FpdbParseError):
+    "Usage: raise FpdbParseError(<msg>[, hh=<hh>][, hid=<hid>])"
 
     def __init__(self, msg='', hh=None, hid=None):
-        if hh is not None:
-            msg += "\n\nHand history attached below:\n" + self.wrapHh(hh)
-        return super(PartyPokerParseError, self).__init__(msg, hid=hid)
+        return super(FpdbParseError, self).__init__(msg, hid=hid)
 
     def wrapHh(self, hh):
         return ("%(DELIMETER)s\n%(HH)s\n%(DELIMETER)s") % \
                 {'DELIMETER': '#'*50, 'HH': hh}
 
 class PartyPoker(HandHistoryConverter):
-
-############################################################
-#    Class Variables
-
     sitename = "PartyPoker"
     codepage = "cp1252"
-    siteId = 9 # TODO: automate; it's a class variable so shouldn't hit DB too often
-    filetype = "text" # "text" or "xml". I propose we subclass HHC to HHC_Text and HHC_XML.
-
-
+    siteId = 9 
+    filetype = "text" 
     sym = {'USD': "\$", }
 
     # Static regexes
@@ -86,15 +78,15 @@ class PartyPoker(HandHistoryConverter):
 
     re_HandInfo     = re.compile("""
             ^Table\s+
-            (?P<TTYPE>[a-zA-Z0-9 ]+)\s+
-            (?: \#|\(|)(?P<TABLE>\d+)\)?\s+
-            (?:[^ ]+\s+\#(?P<MTTTABLE>\d+).+)? # table number for mtt
-            \((?P<PLAY>Real|Play)\s+Money\)\s+ # FIXME: check if play money is correct
-            Seat\s+(?P<BUTTON>\d+)\sis\sthe\sbutton
+            (?P<TABLE_TYPE>[^#()]+)\s+          # Regular, Speed, etc
+            (?P<TABLE_ID_WRAPPER>\(|\#| )        # \# means sng, ( - mtt, nothing - cash game
+            (?P<TABLE_ID>\d+)  \)?   \s+        # it's global unique id for this table
+            (?:Table\s+\#(?P<TABLE_NUM>\d+).+)? # table num for mtt tournaments
+            \((?P<PLAY>Real|Play)\s+Money\)\s*  
             """,
-          re.MULTILINE|re.VERBOSE)
+          re.VERBOSE|re.MULTILINE)
 
-#    re_TotalPlayers = re.compile("^Total\s+number\s+of\s+players\s*:\s*(?P<MAXSEATS>\d+)", re.MULTILINE)
+    re_CountedSeats = re.compile("^Total\s+number\s+of\s+players\s*:\s*(?P<COUNTED_SEATS>\d+)", re.MULTILINE)
     re_SplitHands   = re.compile('\x00+')
     re_TailSplitHands   = re.compile('(\x00+)')
     lineSplitter    = '\n'
@@ -131,16 +123,12 @@ class PartyPoker(HandHistoryConverter):
                 'CUR': hand.gametype['currency'] if hand.gametype['currency']!='T$' else ''}
             for key in ('CUR_SYM', 'CUR'):
                 subst[key] = re.escape(subst[key])
-            log.debug("player_re: '%s'" % subst['PLYR'])
-            log.debug("CUR_SYM: '%s'" % subst['CUR_SYM'])
-            log.debug("CUR: '%s'" % subst['CUR'])
             self.re_PostSB = re.compile(
-                r"^%(PLYR)s posts small blind \[%(CUR_SYM)s(?P<SB>[.0-9]+) ?%(CUR)s\]\." %  subst,
+                r"^%(PLYR)s posts small blind \[%(CUR_SYM)s(?P<SB>[,.0-9]+) ?%(CUR)s\]\." %  subst,
                 re.MULTILINE)
             self.re_PostBB = re.compile(
-                r"^%(PLYR)s posts big blind \[%(CUR_SYM)s(?P<BB>[.0-9]+) ?%(CUR)s\]\." %  subst,
+                r"^%(PLYR)s posts big blind \[%(CUR_SYM)s(?P<BB>[.,0-9]+) ?%(CUR)s\]\." %  subst,
                 re.MULTILINE)
-            # NOTE: comma is used as a fraction part delimeter in re below
             self.re_PostDead = re.compile(
                 r"^%(PLYR)s posts big blind \+ dead \[(?P<BBNDEAD>[.,0-9]+) ?%(CUR_SYM)s\]\." %  subst,
                 re.MULTILINE)
@@ -195,8 +183,6 @@ class PartyPoker(HandHistoryConverter):
         gametype dict is:
         {'limitType': xxx, 'base': xxx, 'category': xxx}"""
 
-        log.debug(PartyPokerParseError().wrapHh( handText ))
-
         info = {}
         m = self._getGameType(handText)
         if m is None:
@@ -213,22 +199,16 @@ class PartyPoker(HandHistoryConverter):
 
         for expectedField in ['LIMIT', 'GAME']:
             if mg[expectedField] is None:
-                raise PartyPokerParseError(
-                    "Cannot fetch field '%s'" % expectedField,
-                    hh = handText)
+                raise FpdbParseError( "Cannot fetch field '%s'" % expectedField)
         try:
             info['limitType'] = limits[mg['LIMIT'].strip()]
         except:
-            raise PartyPokerParseError(
-                "Unknown limit '%s'" % mg['LIMIT'],
-                hh = handText)
+            raise FpdbParseError("Unknown limit '%s'" % mg['LIMIT'])
 
         try:
             (info['base'], info['category']) = games[mg['GAME']]
         except:
-            raise PartyPokerParseError(
-                "Unknown game type '%s'" % mg['GAME'],
-                hh = handText)
+            raise FpdbParseError("Unknown game type '%s'" % mg['GAME'])
 
         if 'TOURNO' in mg:
             info['type'] = 'tour'
@@ -251,23 +231,21 @@ class PartyPoker(HandHistoryConverter):
         try:
             info.update(self.re_Hid.search(hand.handText).groupdict())
         except:
-            raise PartyPokerParseError("Cannot read HID for current hand", hh=hand.handText)
+            raise FpdbParseError("Cannot read HID for current hand")
 
         try:
             info.update(self.re_HandInfo.search(hand.handText,re.DOTALL).groupdict())
         except:
-            raise PartyPokerParseError("Cannot read Handinfo for current hand",
-            hh=hand.handText, hid = info['HID'])
+            raise FpdbParseError("Cannot read Handinfo for current hand", hid = info['HID'])
 
         try:
             info.update(self._getGameType(hand.handText).groupdict())
         except:
-            raise PartyPokerParseError("Cannot read GameType for current hand",
-            hh=hand.handText, hid = info['HID'])
+            raise FpdbParseError("Cannot read GameType for current hand", hid = info['HID'])
 
 
-#        m = self.re_TotalPlayers.search(hand.handText)
-#        if m: info.update(m.groupdict())
+        m = self.re_CountedSeats.search(hand.handText)
+        if m: info.update(m.groupdict())
 
 
         # FIXME: it's dirty hack
@@ -294,6 +272,7 @@ class PartyPoker(HandHistoryConverter):
             if key == 'DATETIME':
                 #Saturday, July 25, 07:53:52 EDT 2009
                 #Thursday, July 30, 21:40:41 MSKS 2009
+                #Sunday, October 25, 13:39:07 MSK 2009
                 m2 = re.search("\w+, (?P<M>\w+) (?P<D>\d+), (?P<H>\d+):(?P<MIN>\d+):(?P<S>\d+) (?P<TZ>[A-Z]+) (?P<Y>\d+)", info[key])
                 # we cant use '%B' due to locale problems
                 months = ['January', 'February', 'March', 'April','May', 'June',
@@ -307,21 +286,28 @@ class PartyPoker(HandHistoryConverter):
 
             if key == 'HID':
                 hand.handid = info[key]
-            if key == 'TABLE':
-                hand.tablename = info[key]
-            if key == 'BUTTON':
-                hand.buttonpos = info[key]
             if key == 'TOURNO':
                 hand.tourNo = info[key]
+            if key == 'TABLE_ID_WRAPPER':
+                if info[key] == '#':
+                    # FIXME: there is no such property in Hand class
+                    self.isSNG = True
             if key == 'BUYIN':
                 # FIXME: it's dirty hack T_T
                 # code below assumes that tournament rake is equal to zero
                 cur = info[key][0] if info[key][0] not in '0123456789' else ''
                 hand.buyin = info[key] + '+%s0' % cur
+            if key == 'TABLE_ID':
+                hand.tablename = info[key]
+            if key == 'TABLE_NUM':
+                # FIXME: there is no such property in Hand class
+                hand.table_num = info[key]
+            if key == 'COUNTED_SEATS':
+                hand.counted_seats  = info[key]
             if key == 'LEVEL':
                 hand.level = info[key]
             if key == 'PLAY' and info['PLAY'] != 'Real':
-                # if realy there's no play money hh on party
+                # if realy party doesn's save play money hh
                 hand.gametype['currency'] = 'play'
 
     def readButton(self, hand):
@@ -406,8 +392,6 @@ class PartyPoker(HandHistoryConverter):
             blind = smartMin(hand.bb, playersMap[bigBlindSeat][1])
             hand.addBlind(playersMap[bigBlindSeat][0], 'big blind', blind)
 
-
-
     def readHeroCards(self, hand):
         # we need to grab hero's cards
         for street in ('PREFLOP',):
@@ -418,7 +402,6 @@ class PartyPoker(HandHistoryConverter):
                     newcards = renderCards(found.group('NEWCARDS'))
                     hand.addHoleCards(street, hand.hero, closed=newcards, shown=False, mucked=False, dealt=True)
 
-
     def readAction(self, hand, street):
         m = self.re_Action.finditer(hand.streets[street])
         for action in m:
@@ -453,10 +436,9 @@ class PartyPoker(HandHistoryConverter):
             elif actionType == 'checks':
                 hand.addCheck( street, playerName )
             else:
-                raise PartyPokerParseError(
+                raise FpdbParseError(
                     "Unimplemented readAction: '%s' '%s'" % (playerName,actionType,),
-                    hid = hand.hid, hh = hand.handText )
-
+                    hid = hand.hid, )
 
     def readShowdownActions(self, hand):
         # all action in readShownCards
@@ -475,6 +457,17 @@ class PartyPoker(HandHistoryConverter):
 
                 hand.addShownCards(cards=cards, player=m.group('PNAME'), shown=True, mucked=mucked)
 
+    @staticmethod
+    def getTableTitleRe(type, table_name=None, tournament = None, table_number=None):
+        "Returns string to search in windows titles"
+        if type=="tour":
+            print 'party', 'getTableTitleRe', "%s.+Table\s#%s" % (table_name, table_number)
+            return "%s.+Table\s#%s" % (table_name, table_number)
+        else:
+            print 'party', 'getTableTitleRe', table_number
+            return table_name
+
+
 def ringBlinds(ringLimit):
     "Returns blinds for current limit in cash games"
     ringLimit = float(clearMoneyString(ringLimit))

From 2da6e44a75c803ac45c73a8e23c35e90edddc01c Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Mon, 23 Nov 2009 19:29:56 -0500
Subject: [PATCH 002/320] Changes for improved logging.

---
 pyfpdb/Configuration.py | 63 +++++++++++++++++++++++++++--------------
 1 file changed, 41 insertions(+), 22 deletions(-)

diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py
index 3f183204..3e3c00a3 100755
--- a/pyfpdb/Configuration.py
+++ b/pyfpdb/Configuration.py
@@ -58,29 +58,29 @@ def get_exec_path():
         return os.path.dirname(sys.path[0])
 
 def get_config(file_name, fallback = True):
-    """Looks in cwd and in self.default_config_path for a config file."""
-    config_path = os.path.join(get_exec_path(), file_name)
-    if os.path.exists(config_path):    # there is a file in the cwd
-        return config_path             # so we use it
-    else: # no file in the cwd, look where it should be in the first place
-        config_path = os.path.join(get_default_config_path(), file_name)
-        if os.path.exists(config_path):
+    """Looks in exec dir and in self.default_config_path for a config file."""
+    config_path = os.path.join(DIR_SELF, file_name) # look in exec dir
+    if os.path.exists(config_path) and os.path.isfile(config_path):
+        return config_path # there is a file in the exec dir so we use it
+    else:
+        config_path = os.path.join(DIR_CONFIG, file_name) # look in config dir
+        if os.path.exists(config_path) and os.path.isfile(config_path):
             return config_path
 
 #    No file found
     if not fallback:
         return False
 
-#    OK, fall back to the .example file, should be in the start dir
-    if os.path.exists(file_name + ".example"):
+#    OK, fall back to the .example file, should be in the exec dir
+    if os.path.exists(os.path.join(DIR_SELF, file_name + ".example")):
         try:
-            shutil.copyfile(file_name + ".example", file_name)
+            shutil.copyfile(os.path.join(DIR_SELF, file_name + ".example"), os.path.join(DIR_CONFIG, file_name))
             print "No %s found, using %s.example.\n" % (file_name, file_name)
-            print "A %s file has been created.  You will probably have to edit it." % file_name
-            sys.stderr.write("No %s found, using %s.example.\n" % (file_name, file_name) )
+            print "A %s file has been created.  You will probably have to edit it." % os.path.join(DIR_CONFIG, file_name)
+            log.error("No %s found, using %s.example.\n" % (file_name, file_name) )
         except:
             print "No %s found, cannot fall back. Exiting.\n" % file_name
-            sys.stderr.write("No %s found, cannot fall back. Exiting.\n" % file_name)
+            log.critical("No %s found, cannot fall back. Exiting.\n" % file_name)
             sys.exit()
     return file_name
 
@@ -90,18 +90,26 @@ def get_logger(file_name, config = "config", fallback = False):
         try:
             logging.config.fileConfig(conf)
             log = logging.getLogger(config)
-            log.debug("%s logger initialised" % config)
             return log
         except:
             pass
 
     log = logging.basicConfig()
     log = logging.getLogger()
-    log.debug("config logger initialised")
+    log.error("basicConfig logger initialised")
     return log
 
-#    find a logging.conf file and set up logging
-log = get_logger("logging.conf")
+def check_dir(path, create = True):
+    """Check if a dir exists, optionally creates if not."""
+    if os.path.exists(path):
+        if os.path.isdir(path):
+            return path
+        else:
+            return False
+    if create:
+        print "creating directory %s" % path
+    else:
+        return False
 
 ########################################################################
 # application wide consts
@@ -109,19 +117,31 @@ log = get_logger("logging.conf")
 APPLICATION_NAME_SHORT = 'fpdb'
 APPLICATION_VERSION = 'xx.xx.xx'
 
-DIR_SELF = os.path.dirname(get_exec_path())
-#TODO: imo no good idea to place 'database' in parent dir
-DIR_DATABASES = os.path.join(os.path.dirname(DIR_SELF), 'database')
+DIR_SELF     = get_exec_path()
+DIR_CONFIG   = check_dir(get_default_config_path())
+DIR_DATABASE = check_dir(os.path.join(DIR_CONFIG, 'database'))
+DIR_LOG      = check_dir(os.path.join(DIR_CONFIG, 'log'))
 
 DATABASE_TYPE_POSTGRESQL = 'postgresql'
 DATABASE_TYPE_SQLITE = 'sqlite'
 DATABASE_TYPE_MYSQL = 'mysql'
+#TODO: should this be a tuple or a dict
 DATABASE_TYPES = (
         DATABASE_TYPE_POSTGRESQL,
         DATABASE_TYPE_SQLITE,
         DATABASE_TYPE_MYSQL,
         )
 
+#    find a logging.conf file and set up logging
+log = get_logger("logging.conf", config = "config")
+log.debug("config logger initialised")
+
+# and then log our consts
+log.info("DIR SELF = %s" % DIR_SELF)
+log.info("DIR CONFIG = %s" % DIR_CONFIG)
+log.info("DIR DATABASE = %s" % DIR_DATABASE)
+log.info("DIR LOG = %s" % DIR_LOG)
+
 ########################################################################
 def string_to_bool(string, default=True):
     """converts a string representation of a boolean value to boolean True or False
@@ -398,8 +418,7 @@ class Config:
         if file is not None: # config file path passed in
             file = os.path.expanduser(file)
             if not os.path.exists(file):
-                print "Configuration file %s not found.  Using defaults." % (file)
-                sys.stderr.write("Configuration file %s not found.  Using defaults." % (file))
+                log.error("Specified configuration file %s not found.  Using defaults." % (file))
                 file = None
 
         if file is None: file = get_config("HUD_config.xml")

From bdc3248597261ba97cc015371f2a974e4c49f407 Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Mon, 23 Nov 2009 19:32:19 -0500
Subject: [PATCH 003/320] Changes for new logging scheme.

---
 pyfpdb/Database.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index 0314d78d..d2fb5651 100755
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -45,7 +45,8 @@ import Card
 import Tourney
 from Exceptions import *
 
-log = Configuration.get_logger("logging.conf")
+log = Configuration.get_logger("logging.conf", config = "db")
+log.debug("db logger initialized.")
 
 class Database:
 
@@ -186,14 +187,13 @@ class Database:
         self.config = c
         self.fdb = fpdb_db.fpdb_db()   # sets self.fdb.db self.fdb.cursor and self.fdb.sql
         self.do_connect(c)
-        
+        print "connection =", self.connection
         if self.backend == self.PGSQL:
             from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT, ISOLATION_LEVEL_READ_COMMITTED, ISOLATION_LEVEL_SERIALIZABLE
             #ISOLATION_LEVEL_AUTOCOMMIT     = 0
             #ISOLATION_LEVEL_READ_COMMITTED = 1 
             #ISOLATION_LEVEL_SERIALIZABLE   = 2
 
-
         # where possible avoid creating new SQL instance by using the global one passed in
         if sql is None:
             self.sql = SQL.Sql(db_server = self.db_server)

From ad91c0a5268fe6dfdd8492d7c5f9cbf1ba70db80 Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Mon, 23 Nov 2009 19:34:40 -0500
Subject: [PATCH 004/320] Changes for logging.

---
 pyfpdb/HUD_main.py | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/pyfpdb/HUD_main.py b/pyfpdb/HUD_main.py
index 48a412ee..4b8b2eaa 100755
--- a/pyfpdb/HUD_main.py
+++ b/pyfpdb/HUD_main.py
@@ -36,9 +36,7 @@ import traceback
 (options, sys.argv) = Options.fpdb_options()
 
 if not options.errorsToConsole:
-    print "Note: error output is being diverted to fpdb-error-log.txt and HUD-error.txt. Any major error will be reported there _only_."
-    errorFile = open('HUD-error.txt', 'w', 0)
-    sys.stderr = errorFile
+    print "Note: error output is being logged. Any major error will be reported there _only_."
 
 import thread
 import time
@@ -52,6 +50,13 @@ import gobject
 
 #    FreePokerTools modules
 import Configuration
+
+print "start logging"
+log = Configuration.get_logger("logging.conf", config = 'hud')
+log.debug("%s logger initialized." % "dud")
+print "logging started"
+
+
 import Database
 from HandHistoryConverter import getTableTitleRe
 #    get the correct module for the current os
@@ -97,6 +102,7 @@ class HUD_main(object):
 
     def __init__(self, db_name = 'fpdb'):
         self.db_name = db_name
+        self.log = log
         self.config = Configuration.Config(file=options.config, dbname=options.dbname)
         self.hud_dict = {}
         self.hud_params = self.config.get_hud_ui_parameters()
@@ -116,6 +122,7 @@ class HUD_main(object):
         self.main_window.show_all()
 
     def destroy(self, *args):             # call back for terminating the main eventloop
+        self.log.info("Terminating normally.")
         gtk.main_quit()
 
     def kill_hud(self, event, table):
@@ -180,11 +187,11 @@ class HUD_main(object):
 #    function idle_func() to be run by the gui thread, at its leisure.
         def idle_func():
             gtk.gdk.threads_enter()
-#            try: 
-            self.hud_dict[table_name].update(new_hand_id, config)
-            [aw.update_gui(new_hand_id) for aw in self.hud_dict[table_name].aux_windows]
-#            finally:
-            gtk.gdk.threads_leave()
+            try: 
+                self.hud_dict[table_name].update(new_hand_id, config)
+                [aw.update_gui(new_hand_id) for aw in self.hud_dict[table_name].aux_windows]
+            finally:
+                gtk.gdk.threads_leave()
             return False
                 
         gobject.idle_add(idle_func)
@@ -197,7 +204,6 @@ class HUD_main(object):
 #    need their own access to the database, but should open their own
 #    if it is required.
         self.db_connection = Database.Database(self.config)
-        
 #       get hero's screen names and player ids
         self.hero, self.hero_ids = {}, {}
         for site in self.config.get_supported_sites():
@@ -206,10 +212,11 @@ class HUD_main(object):
                 site_id = result[0][0]
                 self.hero[site_id] = self.config.supported_sites[site].screen_name
                 self.hero_ids[site_id] = self.db_connection.get_player_id(self.config, site, self.hero[site_id])
-    
+
         while 1: # wait for a new hand number on stdin
             new_hand_id = sys.stdin.readline()
             new_hand_id = string.rstrip(new_hand_id)
+            self.log.debug("Received hand no %s" % new_hand_id)
             if new_hand_id == "":           # blank line means quit
                 self.destroy()
                 break # this thread is not always killed immediately with gtk.main_quit()
@@ -220,8 +227,7 @@ class HUD_main(object):
                 (table_name, max, poker_game, type, site_id, site_name, tour_number, tab_number) = \
                                 self.db_connection.get_table_info(new_hand_id)
             except Exception, err:
-                print "db error: skipping %s" % new_hand_id 
-                sys.stderr.write("Database error: could not find hand %s.\n" % new_hand_id)
+                self.log.error("db error: skipping %s" % new_hand_id)
                 continue
 
             if type == "tour":   # hand is from a tournament
@@ -262,7 +268,8 @@ class HUD_main(object):
 #        If no client window is found on the screen, complain and continue
                     if type == "tour":
                         table_name = "%s %s" % (tour_number, tab_number)
-                    sys.stderr.write("HUD create: table name "+table_name+" not found, skipping.\n")
+#                    sys.stderr.write("HUD create: table name "+table_name+" not found, skipping.\n")
+                    self.log.error("HUD create: table name %s not found, skipping." % table_name)
                 else:
                     tablewindow.max = max
                     tablewindow.site = site_name
@@ -271,8 +278,8 @@ class HUD_main(object):
 
 if __name__== "__main__":
 
-    sys.stderr.write("HUD_main starting\n")
-    sys.stderr.write("Using db name = %s\n" % (options.dbname))
+    log.info("HUD_main starting")
+    log.info("Using db name = %s" % (options.dbname))
 
 #    start the HUD_main object
     hm = HUD_main(db_name = options.dbname)

From 3e76033cd5ba2e18c4e155a201062b3a774ddd51 Mon Sep 17 00:00:00 2001
From: Mika Bostrom <bostik@odin.bostik.iki.fi>
Date: Sun, 29 Nov 2009 11:21:11 +0200
Subject: [PATCH 005/320] Do not minimize window when workspace changes

When we have the systray icon enabled, any window visibility event seems
to have WINDOW_STATE_ICONIFIED bit on. By checking both _ICONIFIED and
_WITHDRAWN the behaviour appears nicer.
---
 pyfpdb/fpdb.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py
index 80d3fb93..77f13ca7 100755
--- a/pyfpdb/fpdb.py
+++ b/pyfpdb/fpdb.py
@@ -669,8 +669,8 @@ This program is licensed under the AGPL3, see docs"""+os.sep+"agpl-3.0.txt")
         sys.stderr.write("fpdb starting ...")
 
     def window_state_event_cb(self, window, event):
-        print "window_state_event", event
-        if event.changed_mask & gtk.gdk.WINDOW_STATE_ICONIFIED:
+        print "window_state_event: %s, mask=%s" % (event, event.changed_mask)
+        if event.changed_mask & gtk.gdk.WINDOW_STATE_ICONIFIED & gtk.gdk.WINDOW_STATE_WITHDRAWN:
             # -20 = GWL_EXSTYLE can't find it in the pywin32 libs
             #bits = win32api.GetWindowLong(self.window.window.handle, -20)
             #bits = bits ^ (win32con.WS_EX_TOOLWINDOW | win32con.WS_EX_APPWINDOW)

From 761d53f2f44b3dd50a1eac7ac17f70feb4539da1 Mon Sep 17 00:00:00 2001
From: Mika Bostrom <bostik@odin.bostik.iki.fi>
Date: Wed, 2 Dec 2009 18:38:58 +0200
Subject: [PATCH 006/320] Revert "Use wider try-except block"

This reverts commit 2f742e371be64964fe9499824901c71f0509601c.
---
 pyfpdb/HUD_main.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pyfpdb/HUD_main.py b/pyfpdb/HUD_main.py
index 4f7e8845..39096065 100755
--- a/pyfpdb/HUD_main.py
+++ b/pyfpdb/HUD_main.py
@@ -215,10 +215,10 @@ class HUD_main(object):
 #        Update an existing HUD
             if temp_key in self.hud_dict:
                 # get stats using hud's specific params and get cards
-                try:
-                    self.db_connection.init_hud_stat_vars( self.hud_dict[temp_key].hud_params['hud_days']
+                self.db_connection.init_hud_stat_vars( self.hud_dict[temp_key].hud_params['hud_days']
                                                      , self.hud_dict[temp_key].hud_params['h_hud_days'])
-                    stat_dict = self.db_connection.get_stats_from_hand(new_hand_id, type, self.hud_dict[temp_key].hud_params, self.hero_ids[site_id])
+                stat_dict = self.db_connection.get_stats_from_hand(new_hand_id, type, self.hud_dict[temp_key].hud_params, self.hero_ids[site_id])
+                try:
                     self.hud_dict[temp_key].stat_dict = stat_dict
                 except KeyError:    # HUD instance has been killed off, key is stale
                     sys.stderr.write('hud_dict[%s] was not found\n' % temp_key)

From 3e9353e3b9816aa36705c46c97b3f6a023e9cace Mon Sep 17 00:00:00 2001
From: Mika Bostrom <bostik@odin.bostik.iki.fi>
Date: Wed, 2 Dec 2009 18:39:06 +0200
Subject: [PATCH 007/320] Revert "Revert "Use wider try-except block""

This reverts commit 761d53f2f44b3dd50a1eac7ac17f70feb4539da1.
---
 pyfpdb/HUD_main.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pyfpdb/HUD_main.py b/pyfpdb/HUD_main.py
index 39096065..4f7e8845 100755
--- a/pyfpdb/HUD_main.py
+++ b/pyfpdb/HUD_main.py
@@ -215,10 +215,10 @@ class HUD_main(object):
 #        Update an existing HUD
             if temp_key in self.hud_dict:
                 # get stats using hud's specific params and get cards
-                self.db_connection.init_hud_stat_vars( self.hud_dict[temp_key].hud_params['hud_days']
-                                                     , self.hud_dict[temp_key].hud_params['h_hud_days'])
-                stat_dict = self.db_connection.get_stats_from_hand(new_hand_id, type, self.hud_dict[temp_key].hud_params, self.hero_ids[site_id])
                 try:
+                    self.db_connection.init_hud_stat_vars( self.hud_dict[temp_key].hud_params['hud_days']
+                                                     , self.hud_dict[temp_key].hud_params['h_hud_days'])
+                    stat_dict = self.db_connection.get_stats_from_hand(new_hand_id, type, self.hud_dict[temp_key].hud_params, self.hero_ids[site_id])
                     self.hud_dict[temp_key].stat_dict = stat_dict
                 except KeyError:    # HUD instance has been killed off, key is stale
                     sys.stderr.write('hud_dict[%s] was not found\n' % temp_key)

From 87a8d57669343ebcfd78bd722d3973793566281a Mon Sep 17 00:00:00 2001
From: Mika Bostrom <bostik@odin.bostik.iki.fi>
Date: Wed, 2 Dec 2009 18:39:58 +0200
Subject: [PATCH 008/320] Revert "Do not minimize window when workspace
 changes"

This reverts commit 3e76033cd5ba2e18c4e155a201062b3a774ddd51.
---
 pyfpdb/fpdb.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py
index 77f13ca7..80d3fb93 100755
--- a/pyfpdb/fpdb.py
+++ b/pyfpdb/fpdb.py
@@ -669,8 +669,8 @@ This program is licensed under the AGPL3, see docs"""+os.sep+"agpl-3.0.txt")
         sys.stderr.write("fpdb starting ...")
 
     def window_state_event_cb(self, window, event):
-        print "window_state_event: %s, mask=%s" % (event, event.changed_mask)
-        if event.changed_mask & gtk.gdk.WINDOW_STATE_ICONIFIED & gtk.gdk.WINDOW_STATE_WITHDRAWN:
+        print "window_state_event", event
+        if event.changed_mask & gtk.gdk.WINDOW_STATE_ICONIFIED:
             # -20 = GWL_EXSTYLE can't find it in the pywin32 libs
             #bits = win32api.GetWindowLong(self.window.window.handle, -20)
             #bits = bits ^ (win32con.WS_EX_TOOLWINDOW | win32con.WS_EX_APPWINDOW)

From e62ae6c31ff2d35277f7c89ac90d9e1e8db8110b Mon Sep 17 00:00:00 2001
From: Mika Bostrom <bostik@odin.bostik.iki.fi>
Date: Sun, 6 Dec 2009 14:08:27 +0200
Subject: [PATCH 009/320] Enclose dict key lookup in try-except block

Some recent changes moved the dictionary access outside try-except block
again. Widen the block enough again.
---
 pyfpdb/HUD_main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/HUD_main.py b/pyfpdb/HUD_main.py
index 7e2d5fa6..108b89c7 100755
--- a/pyfpdb/HUD_main.py
+++ b/pyfpdb/HUD_main.py
@@ -159,10 +159,10 @@ class HUD_main(object):
 #    function idle_func() to be run by the gui thread, at its leisure.
         def idle_func():
             gtk.gdk.threads_enter()
-            self.hud_dict[table_name].update(new_hand_id, config)
+            try:
+                self.hud_dict[table_name].update(new_hand_id, config)
             # The HUD could get destroyed in the above call ^^, which leaves us with a KeyError here vv
             # if we ever get an error we need to expect ^^ then we need to handle it vv - Eric
-            try:
                 [aw.update_gui(new_hand_id) for aw in self.hud_dict[table_name].aux_windows]
             except KeyError:
                 pass

From 5e7bd33cd03ce567f68af774d6806d5bf146b37b Mon Sep 17 00:00:00 2001
From: Eric Blade <blade.eric@gmail.com>
Date: Tue, 8 Dec 2009 17:48:52 -0500
Subject: [PATCH 010/320] no changes here

---
 .../Flop/PLO8-6max-USD-0.01-0.02-200911.txt   | 1204 ++++++++---------
 ...7-StudHL-USD-0.04-0.08-200911.Cardtest.txt |  192 +--
 pyfpdb/test1.py                               |   58 +-
 pyfpdb/test2.py                               |  114 +-
 4 files changed, 784 insertions(+), 784 deletions(-)

diff --git a/pyfpdb/regression-test-files/cash/Stars/Flop/PLO8-6max-USD-0.01-0.02-200911.txt b/pyfpdb/regression-test-files/cash/Stars/Flop/PLO8-6max-USD-0.01-0.02-200911.txt
index fb96f3f9..dbe2a5bf 100644
--- a/pyfpdb/regression-test-files/cash/Stars/Flop/PLO8-6max-USD-0.01-0.02-200911.txt
+++ b/pyfpdb/regression-test-files/cash/Stars/Flop/PLO8-6max-USD-0.01-0.02-200911.txt
@@ -1,602 +1,602 @@
-PokerStars Game #35874998500:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:36:51 ET
-Table 'Gaby II' 6-max Seat #3 is the button
-Seat 1: EricSteph261 ($11.27 in chips) 
-Seat 2: UnderMeSensi ($3.33 in chips) 
-Seat 3: supermeXXX ($1.19 in chips) 
-Seat 4: xgz520 ($1.81 in chips) 
-Seat 5: s0rrow ($3 in chips) 
-Seat 6: tiger48475 ($5 in chips) 
-xgz520: posts small blind $0.01
-s0rrow: posts big blind $0.02
-*** HOLE CARDS ***
-Dealt to s0rrow [2h 2c 3s 9h]
-tiger48475: folds 
-EricSteph261: folds 
-UnderMeSensi: raises $0.05 to $0.07
-supermeXXX: folds 
-xgz520: folds 
-s0rrow: calls $0.05
-*** FLOP *** [Jd 5c Kc]
-s0rrow: checks 
-UnderMeSensi: checks 
-*** TURN *** [Jd 5c Kc] [4c]
-s0rrow: checks 
-UnderMeSensi: bets $0.08
-s0rrow: calls $0.08
-*** RIVER *** [Jd 5c Kc 4c] [Th]
-s0rrow: checks 
-UnderMeSensi: bets $0.31
-EricSteph261 is sitting out
-s0rrow: folds 
-Uncalled bet ($0.31) returned to UnderMeSensi
-UnderMeSensi collected $0.31 from pot
-UnderMeSensi: doesn't show hand 
-*** SUMMARY ***
-Total pot $0.31 | Rake $0 
-Board [Jd 5c Kc 4c Th]
-Seat 1: EricSteph261 folded before Flop (didn't bet)
-Seat 2: UnderMeSensi collected ($0.31)
-Seat 3: supermeXXX (button) folded before Flop (didn't bet)
-Seat 4: xgz520 (small blind) folded before Flop
-Seat 5: s0rrow (big blind) folded on the River
-Seat 6: tiger48475 folded before Flop (didn't bet)
-
-
-
-PokerStars Game #35875026976:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:37:39 ET
-Table 'Gaby II' 6-max Seat #4 is the button
-Seat 2: UnderMeSensi ($3.49 in chips) 
-Seat 3: supermeXXX ($1.19 in chips) 
-Seat 4: xgz520 ($1.80 in chips) 
-Seat 5: s0rrow ($2.85 in chips) 
-Seat 6: tiger48475 ($5 in chips) 
-s0rrow: posts small blind $0.01
-tiger48475: posts big blind $0.02
-*** HOLE CARDS ***
-Dealt to s0rrow [4d 3s 8d Jd]
-UnderMeSensi: raises $0.05 to $0.07
-supermeXXX: folds 
-xgz520: folds 
-s0rrow: folds 
-tiger48475: folds 
-Uncalled bet ($0.05) returned to UnderMeSensi
-xgz520 leaves the table
-UnderMeSensi collected $0.05 from pot
-UnderMeSensi: doesn't show hand 
-*** SUMMARY ***
-Total pot $0.05 | Rake $0 
-Seat 2: UnderMeSensi collected ($0.05)
-Seat 3: supermeXXX folded before Flop (didn't bet)
-Seat 4: xgz520 (button) folded before Flop (didn't bet)
-Seat 5: s0rrow (small blind) folded before Flop
-Seat 6: tiger48475 (big blind) folded before Flop
-
-
-
-PokerStars Game #35875034981:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:37:53 ET
-Table 'Gaby II' 6-max Seat #5 is the button
-Seat 2: UnderMeSensi ($3.52 in chips) 
-Seat 3: supermeXXX ($1.19 in chips) 
-Seat 5: s0rrow ($2.84 in chips) 
-Seat 6: tiger48475 ($5 in chips) 
-tiger48475: posts small blind $0.01
-UnderMeSensi: posts big blind $0.02
-*** HOLE CARDS ***
-Dealt to s0rrow [Qh 6c Th 9c]
-supermeXXX: raises $0.04 to $0.06
-s0rrow: calls $0.06
-tiger48475: folds 
-UnderMeSensi: calls $0.04
-*** FLOP *** [5h 4d 2d]
-UnderMeSensi: checks 
-supermeXXX: bets $0.10
-s0rrow: folds 
-UnderMeSensi: calls $0.10
-*** TURN *** [5h 4d 2d] [Jd]
-UnderMeSensi: checks 
-supermeXXX: checks 
-*** RIVER *** [5h 4d 2d Jd] [6h]
-UnderMeSensi: checks 
-supermeXXX: checks 
-*** SHOW DOWN ***
-UnderMeSensi: shows [7c 6s 7h As] (HI: a pair of Sevens; LO: 6,5,4,2,A)
-supermeXXX: shows [Ah 2h Kh 2s] (HI: three of a kind, Deuces; LO: 6,5,4,2,A)
-supermeXXX collected $0.20 from pot
-UnderMeSensi collected $0.10 from pot
-supermeXXX collected $0.09 from pot
-*** SUMMARY ***
-Total pot $0.39 | Rake $0 
-Board [5h 4d 2d Jd 6h]
-Seat 2: UnderMeSensi (big blind) showed [7c 6s 7h As] and won ($0.10) with HI: a pair of Sevens; LO: 6,5,4,2,A
-Seat 3: supermeXXX showed [Ah 2h Kh 2s] and won ($0.29) with HI: three of a kind, Deuces; LO: 6,5,4,2,A
-Seat 5: s0rrow (button) folded on the Flop
-Seat 6: tiger48475 (small blind) folded before Flop
-
-
-
-PokerStars Game #35875059163:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:38:34 ET
-Table 'Gaby II' 6-max Seat #6 is the button
-Seat 2: UnderMeSensi ($3.46 in chips) 
-Seat 3: supermeXXX ($1.32 in chips) 
-Seat 5: s0rrow ($2.78 in chips) 
-Seat 6: tiger48475 ($5 in chips) 
-UnderMeSensi: posts small blind $0.01
-supermeXXX: posts big blind $0.02
-*** HOLE CARDS ***
-Dealt to s0rrow [Ts Qs 9d 7c]
-s0rrow: raises $0.04 to $0.06
-tiger48475: folds 
-UnderMeSensi: calls $0.05
-diyi69 joins the table at seat #4 
-supermeXXX: folds 
-*** FLOP *** [3h Ah 5d]
-UnderMeSensi: checks 
-s0rrow: checks 
-*** TURN *** [3h Ah 5d] [Kc]
-UnderMeSensi: checks 
-s0rrow: bets $0.14
-UnderMeSensi: folds 
-Uncalled bet ($0.14) returned to s0rrow
-s0rrow collected $0.14 from pot
-*** SUMMARY ***
-Total pot $0.14 | Rake $0 
-Board [3h Ah 5d Kc]
-Seat 2: UnderMeSensi (small blind) folded on the Turn
-Seat 3: supermeXXX (big blind) folded before Flop
-Seat 5: s0rrow collected ($0.14)
-Seat 6: tiger48475 (button) folded before Flop (didn't bet)
-
-
-
-PokerStars Game #35875079294:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:39:09 ET
-Table 'Gaby II' 6-max Seat #2 is the button
-Seat 2: UnderMeSensi ($3.40 in chips) 
-Seat 3: supermeXXX ($1.30 in chips) 
-Seat 4: diyi69 ($1 in chips) 
-Seat 5: s0rrow ($2.86 in chips) 
-Seat 6: tiger48475 ($5 in chips) 
-supermeXXX: posts small blind $0.01
-diyi69: posts big blind $0.02
-*** HOLE CARDS ***
-Dealt to s0rrow [8s 6d 7s 2s]
-s0rrow: folds 
-tiger48475: folds 
-UnderMeSensi: folds 
-supermeXXX: calls $0.01
-diyi69 has timed out
-diyi69: checks 
-*** FLOP *** [As Js 5h]
-supermeXXX: bets $0.04
-diyi69 has timed out
-diyi69: folds 
-Uncalled bet ($0.04) returned to supermeXXX
-diyi69 is sitting out
-supermeXXX collected $0.04 from pot
-*** SUMMARY ***
-Total pot $0.04 | Rake $0 
-Board [As Js 5h]
-Seat 2: UnderMeSensi (button) folded before Flop (didn't bet)
-Seat 3: supermeXXX (small blind) collected ($0.04)
-Seat 4: diyi69 (big blind) folded on the Flop
-Seat 5: s0rrow folded before Flop (didn't bet)
-Seat 6: tiger48475 folded before Flop (didn't bet)
-
-
-
-PokerStars Game #35875131707:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:40:40 ET
-Table 'Gaby II' 6-max Seat #3 is the button
-Seat 2: UnderMeSensi ($3.40 in chips) 
-Seat 3: supermeXXX ($1.32 in chips) 
-Seat 5: s0rrow ($2.86 in chips) 
-Seat 6: tiger48475 ($5 in chips) 
-s0rrow: posts small blind $0.01
-tiger48475: posts big blind $0.02
-*** HOLE CARDS ***
-Dealt to s0rrow [7c As 4d 4h]
-UnderMeSensi: calls $0.02
-supermeXXX: folds 
-s0rrow: calls $0.01
-tiger48475: checks 
-*** FLOP *** [Ks 9d Ts]
-s0rrow: checks 
-tiger48475: bets $0.06
-UnderMeSensi: calls $0.06
-s0rrow: folds 
-*** TURN *** [Ks 9d Ts] [7h]
-tiger48475: checks 
-EricSteph261 has returned
-UnderMeSensi: checks 
-*** RIVER *** [Ks 9d Ts 7h] [4s]
-tiger48475: checks 
-UnderMeSensi: bets $0.10
-tiger48475: folds 
-Uncalled bet ($0.10) returned to UnderMeSensi
-UnderMeSensi collected $0.18 from pot
-UnderMeSensi: doesn't show hand 
-*** SUMMARY ***
-Total pot $0.18 | Rake $0 
-Board [Ks 9d Ts 7h 4s]
-Seat 2: UnderMeSensi collected ($0.18)
-Seat 3: supermeXXX (button) folded before Flop (didn't bet)
-Seat 5: s0rrow (small blind) folded on the Flop
-Seat 6: tiger48475 (big blind) folded on the River
-
-
-
-PokerStars Game #35875159084:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:41:27 ET
-Table 'Gaby II' 6-max Seat #5 is the button
-Seat 1: EricSteph261 ($11.27 in chips) 
-Seat 2: UnderMeSensi ($3.50 in chips) 
-Seat 3: supermeXXX ($1.32 in chips) 
-Seat 5: s0rrow ($2.84 in chips) 
-Seat 6: tiger48475 ($5 in chips) 
-tiger48475: posts small blind $0.01
-EricSteph261: posts big blind $0.02
-*** HOLE CARDS ***
-Dealt to s0rrow [Jc 3h 2s Qc]
-UnderMeSensi: calls $0.02
-supermeXXX: calls $0.02
-s0rrow: raises $0.08 to $0.10
-tiger48475: folds 
-EricSteph261: folds 
-UnderMeSensi: calls $0.08
-supermeXXX: folds 
-*** FLOP *** [Ac 5s Js]
-UnderMeSensi: checks 
-s0rrow: bets $0.20
-UnderMeSensi: calls $0.20
-*** TURN *** [Ac 5s Js] [8c]
-UnderMeSensi: checks 
-s0rrow: bets $0.50
-UnderMeSensi: calls $0.50
-*** RIVER *** [Ac 5s Js 8c] [Jd]
-UnderMeSensi: bets $1.60
-s0rrow: calls $1.60
-*** SHOW DOWN ***
-UnderMeSensi: shows [7s 9s Jh 3c] (HI: three of a kind, Jacks; LO: 8,7,5,3,A)
-s0rrow: shows [Jc 3h 2s Qc] (HI: three of a kind, Jacks - Ace+Queen kicker; LO: 8,5,3,2,A)
-s0rrow collected $2.33 from pot
-s0rrow collected $2.32 from pot
-*** SUMMARY ***
-Total pot $4.85 | Rake $0.20 
-Board [Ac 5s Js 8c Jd]
-Seat 1: EricSteph261 (big blind) folded before Flop
-Seat 2: UnderMeSensi showed [7s 9s Jh 3c] and lost with HI: three of a kind, Jacks; LO: 8,7,5,3,A
-Seat 3: supermeXXX folded before Flop
-Seat 5: s0rrow (button) showed [Jc 3h 2s Qc] and won ($4.65) with HI: three of a kind, Jacks; LO: 8,5,3,2,A
-Seat 6: tiger48475 (small blind) folded before Flop
-
-
-
-PokerStars Game #35875194885:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:42:28 ET
-Table 'Gaby II' 6-max Seat #6 is the button
-Seat 1: EricSteph261 ($11.25 in chips) 
-Seat 2: UnderMeSensi ($1.10 in chips) 
-Seat 3: supermeXXX ($1.30 in chips) 
-Seat 5: s0rrow ($5.09 in chips) 
-Seat 6: tiger48475 ($5 in chips) 
-EricSteph261: posts small blind $0.01
-UnderMeSensi: posts big blind $0.02
-*** HOLE CARDS ***
-Dealt to s0rrow [7s 3c 3h 8d]
-supermeXXX: folds 
-s0rrow: raises $0.02 to $0.04
-tiger48475: calls $0.04
-EricSteph261: calls $0.03
-UnderMeSensi: calls $0.02
-*** FLOP *** [8c 3s 4s]
-EricSteph261: checks 
-UnderMeSensi: checks 
-s0rrow: bets $0.14
-tiger48475: folds 
-EricSteph261: folds 
-UnderMeSensi: folds 
-Uncalled bet ($0.14) returned to s0rrow
-s0rrow collected $0.16 from pot
-*** SUMMARY ***
-Total pot $0.16 | Rake $0 
-Board [8c 3s 4s]
-Seat 1: EricSteph261 (small blind) folded on the Flop
-Seat 2: UnderMeSensi (big blind) folded on the Flop
-Seat 3: supermeXXX folded before Flop (didn't bet)
-Seat 5: s0rrow collected ($0.16)
-Seat 6: tiger48475 (button) folded on the Flop
-
-
-
-PokerStars Game #35875219121:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:43:08 ET
-Table 'Gaby II' 6-max Seat #1 is the button
-Seat 1: EricSteph261 ($11.21 in chips) 
-Seat 2: UnderMeSensi ($1.06 in chips) 
-Seat 3: supermeXXX ($1.30 in chips) 
-Seat 5: s0rrow ($5.21 in chips) 
-Seat 6: tiger48475 ($5 in chips) 
-UnderMeSensi: posts small blind $0.01
-supermeXXX: posts big blind $0.02
-*** HOLE CARDS ***
-Dealt to s0rrow [Ks Qd Kd Kc]
-s0rrow: raises $0.04 to $0.06
-tiger48475: folds 
-EricSteph261: calls $0.06
-UnderMeSensi: calls $0.05
-supermeXXX: calls $0.04
-*** FLOP *** [2d Jh 5h]
-UnderMeSensi: checks 
-supermeXXX: checks 
-s0rrow: checks 
-EricSteph261: checks 
-*** TURN *** [2d Jh 5h] [Js]
-UnderMeSensi: checks 
-supermeXXX: checks 
-s0rrow: checks 
-EricSteph261: checks 
-*** RIVER *** [2d Jh 5h Js] [7s]
-UnderMeSensi: checks 
-supermeXXX: checks 
-s0rrow: checks 
-EricSteph261: checks 
-*** SHOW DOWN ***
-UnderMeSensi: shows [5d 6c As 9d] (HI: two pair, Jacks and Fives; LO: 7,6,5,2,A)
-supermeXXX: shows [6s Th 7c Ac] (HI: two pair, Jacks and Sevens; LO: 7,6,5,2,A)
-s0rrow: shows [Ks Qd Kd Kc] (HI: two pair, Kings and Jacks)
-EricSteph261: shows [4s 9c 3d 2c] (HI: two pair, Jacks and Deuces; LO: 7,5,4,3,2)
-s0rrow collected $0.12 from pot
-EricSteph261 collected $0.12 from pot
-*** SUMMARY ***
-Total pot $0.24 | Rake $0 
-Board [2d Jh 5h Js 7s]
-Seat 1: EricSteph261 (button) showed [4s 9c 3d 2c] and won ($0.12) with HI: two pair, Jacks and Deuces; LO: 7,5,4,3,2
-Seat 2: UnderMeSensi (small blind) showed [5d 6c As 9d] and lost with HI: two pair, Jacks and Fives; LO: 7,6,5,2,A
-Seat 3: supermeXXX (big blind) showed [6s Th 7c Ac] and lost with HI: two pair, Jacks and Sevens; LO: 7,6,5,2,A
-Seat 5: s0rrow showed [Ks Qd Kd Kc] and won ($0.12) with HI: two pair, Kings and Jacks
-Seat 6: tiger48475 folded before Flop (didn't bet)
-
-
-
-PokerStars Game #35875246335:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:43:54 ET
-Table 'Gaby II' 6-max Seat #2 is the button
-Seat 1: EricSteph261 ($11.27 in chips) 
-Seat 2: UnderMeSensi ($1 in chips) 
-Seat 3: supermeXXX ($1.24 in chips) 
-Seat 5: s0rrow ($5.27 in chips) 
-Seat 6: tiger48475 ($5 in chips) 
-supermeXXX: posts small blind $0.01
-s0rrow: posts big blind $0.02
-*** HOLE CARDS ***
-Dealt to s0rrow [Jd Kc 6h Jc]
-tiger48475: folds 
-EricSteph261: calls $0.02
-UnderMeSensi is disconnected 
-UnderMeSensi has timed out while disconnected
-UnderMeSensi: folds 
-UnderMeSensi is sitting out
-supermeXXX: calls $0.01
-s0rrow: checks 
-*** FLOP *** [8d 7s Qh]
-supermeXXX: bets $0.02
-s0rrow: folds 
-EricSteph261: calls $0.02
-*** TURN *** [8d 7s Qh] [As]
-supermeXXX: bets $0.04
-EricSteph261: calls $0.04
-*** RIVER *** [8d 7s Qh As] [5d]
-supermeXXX: checks 
-EricSteph261: checks 
-*** SHOW DOWN ***
-supermeXXX: shows [Kh Qd 9s Th] (HI: a pair of Queens)
-EricSteph261: shows [Jh 2d 5s 6c] (HI: a pair of Fives; LO: 7,6,5,2,A)
-supermeXXX collected $0.09 from pot
-EricSteph261 collected $0.09 from pot
-*** SUMMARY ***
-Total pot $0.18 | Rake $0 
-Board [8d 7s Qh As 5d]
-Seat 1: EricSteph261 showed [Jh 2d 5s 6c] and won ($0.09) with HI: a pair of Fives; LO: 7,6,5,2,A
-Seat 2: UnderMeSensi (button) folded before Flop (didn't bet)
-Seat 3: supermeXXX (small blind) showed [Kh Qd 9s Th] and won ($0.09) with HI: a pair of Queens
-Seat 5: s0rrow (big blind) folded on the Flop
-Seat 6: tiger48475 folded before Flop (didn't bet)
-
-
-
-PokerStars Game #35875293439:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:45:14 ET
-Table 'Gaby II' 6-max Seat #3 is the button
-Seat 1: EricSteph261 ($11.28 in chips) 
-Seat 3: supermeXXX ($1.25 in chips) 
-Seat 5: s0rrow ($5.25 in chips) 
-Seat 6: tiger48475 ($5 in chips) 
-s0rrow: posts small blind $0.01
-tiger48475: posts big blind $0.02
-*** HOLE CARDS ***
-Dealt to s0rrow [9c 8h 8s 3c]
-EricSteph261: calls $0.02
-supermeXXX: calls $0.02
-s0rrow: calls $0.01
-tiger48475: checks 
-*** FLOP *** [Ah 2d Qc]
-s0rrow: checks 
-tiger48475: checks 
-EricSteph261: checks 
-supermeXXX: checks 
-*** TURN *** [Ah 2d Qc] [3d]
-s0rrow: checks 
-tiger48475: checks 
-EricSteph261: checks 
-supermeXXX: checks 
-*** RIVER *** [Ah 2d Qc 3d] [6s]
-s0rrow: checks 
-tiger48475: checks 
-EricSteph261: checks 
-supermeXXX: checks 
-*** SHOW DOWN ***
-s0rrow: shows [9c 8h 8s 3c] (HI: a pair of Eights; LO: 8,6,3,2,A)
-tiger48475: shows [3s 5s Ts Th] (HI: a pair of Tens; LO: 6,5,3,2,A)
-EricSteph261: shows [As Ks Jh 7h] (HI: a pair of Aces; LO: 7,6,3,2,A)
-supermeXXX: mucks hand 
-EricSteph261 collected $0.04 from pot
-tiger48475 collected $0.04 from pot
-*** SUMMARY ***
-Total pot $0.08 | Rake $0 
-Board [Ah 2d Qc 3d 6s]
-Seat 1: EricSteph261 showed [As Ks Jh 7h] and won ($0.04) with HI: a pair of Aces; LO: 7,6,3,2,A
-Seat 3: supermeXXX (button) mucked [9h 9s 4c Kc]
-Seat 5: s0rrow (small blind) showed [9c 8h 8s 3c] and lost with HI: a pair of Eights; LO: 8,6,3,2,A
-Seat 6: tiger48475 (big blind) showed [3s 5s Ts Th] and won ($0.04) with HI: a pair of Tens; LO: 6,5,3,2,A
-
-
-
-PokerStars Game #35875328026:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:46:13 ET
-Table 'Gaby II' 6-max Seat #5 is the button
-Seat 1: EricSteph261 ($11.30 in chips) 
-Seat 3: supermeXXX ($1.23 in chips) 
-Seat 5: s0rrow ($5.23 in chips) 
-Seat 6: tiger48475 ($5.02 in chips) 
-tiger48475: posts small blind $0.01
-EricSteph261: posts big blind $0.02
-*** HOLE CARDS ***
-Dealt to s0rrow [Qd 6h 8s 6c]
-supermeXXX: calls $0.02
-s0rrow: folds 
-tiger48475: calls $0.01
-EricSteph261: checks 
-*** FLOP *** [Kc Ac 5s]
-tiger48475: checks 
-EricSteph261: checks 
-supermeXXX: checks 
-*** TURN *** [Kc Ac 5s] [3h]
-tiger48475: checks 
-EricSteph261: checks 
-supermeXXX: checks 
-*** RIVER *** [Kc Ac 5s 3h] [Qh]
-tiger48475: bets $0.06
-EricSteph261: folds 
-EricSteph261 is sitting out
-supermeXXX: folds 
-Uncalled bet ($0.06) returned to tiger48475
-tiger48475 collected $0.06 from pot
-*** SUMMARY ***
-Total pot $0.06 | Rake $0 
-Board [Kc Ac 5s 3h Qh]
-Seat 1: EricSteph261 (big blind) folded on the River
-Seat 3: supermeXXX folded on the River
-Seat 5: s0rrow (button) folded before Flop (didn't bet)
-Seat 6: tiger48475 (small blind) collected ($0.06)
-
-
-
-PokerStars Game #35875356253:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:47:00 ET
-Table 'Gaby II' 6-max Seat #6 is the button
-Seat 3: supermeXXX ($1.21 in chips) 
-Seat 5: s0rrow ($5.23 in chips) 
-Seat 6: tiger48475 ($5.06 in chips) 
-supermeXXX: posts small blind $0.01
-s0rrow: posts big blind $0.02
-*** HOLE CARDS ***
-Dealt to s0rrow [8h Jd 5d 8d]
-tiger48475: folds 
-supermeXXX: calls $0.01
-s0rrow: checks 
-*** FLOP *** [Ks 9s 6c]
-supermeXXX: bets $0.02
-s0rrow: calls $0.02
-*** TURN *** [Ks 9s 6c] [Qc]
-supermeXXX: bets $0.02
-s0rrow: calls $0.02
-*** RIVER *** [Ks 9s 6c Qc] [Ad]
-supermeXXX: checks 
-s0rrow: checks 
-*** SHOW DOWN ***
-supermeXXX: shows [Tc 7d 8c 3s] (HI: high card Ace)
-s0rrow: shows [8h Jd 5d 8d] (HI: a pair of Eights)
-s0rrow collected $0.12 from pot
-No low hand qualified
-*** SUMMARY ***
-Total pot $0.12 | Rake $0 
-Board [Ks 9s 6c Qc Ad]
-Seat 3: supermeXXX (small blind) showed [Tc 7d 8c 3s] and lost with HI: high card Ace
-Seat 5: s0rrow (big blind) showed [8h Jd 5d 8d] and won ($0.12) with HI: a pair of Eights
-Seat 6: tiger48475 (button) folded before Flop (didn't bet)
-
-
-
-PokerStars Game #35875379792:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:47:39 ET
-Table 'Gaby II' 6-max Seat #3 is the button
-Seat 3: supermeXXX ($1.15 in chips) 
-Seat 5: s0rrow ($5.29 in chips) 
-Seat 6: tiger48475 ($5.06 in chips) 
-s0rrow: posts small blind $0.01
-tiger48475: posts big blind $0.02
-*** HOLE CARDS ***
-Dealt to s0rrow [9c 5h 3s Th]
-supermeXXX: calls $0.02
-s0rrow: calls $0.01
-tiger48475: checks 
-*** FLOP *** [Jc 3h Jd]
-s0rrow: checks 
-tiger48475: checks 
-supermeXXX: checks 
-*** TURN *** [Jc 3h Jd] [6d]
-s0rrow: checks 
-tiger48475: bets $0.06
-supermeXXX: folds 
-EricSteph261 has returned
-s0rrow: calls $0.06
-*** RIVER *** [Jc 3h Jd 6d] [5c]
-s0rrow: checks 
-tiger48475: bets $0.14
-s0rrow: folds 
-Uncalled bet ($0.14) returned to tiger48475
-tiger48475 collected $0.18 from pot
-*** SUMMARY ***
-Total pot $0.18 | Rake $0 
-Board [Jc 3h Jd 6d 5c]
-Seat 3: supermeXXX (button) folded on the Turn
-Seat 5: s0rrow (small blind) folded on the River
-Seat 6: tiger48475 (big blind) collected ($0.18)
-
-
-
-PokerStars Game #35875409365:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:48:29 ET
-Table 'Gaby II' 6-max Seat #5 is the button
-Seat 1: EricSteph261 ($11.28 in chips) 
-Seat 3: supermeXXX ($1.13 in chips) 
-Seat 5: s0rrow ($5.21 in chips) 
-Seat 6: tiger48475 ($5.16 in chips) 
-tiger48475: posts small blind $0.01
-EricSteph261: posts big blind $0.02
-*** HOLE CARDS ***
-Dealt to s0rrow [6h 3c Th 2s]
-supermeXXX: calls $0.02
-s0rrow: calls $0.02
-tiger48475: calls $0.01
-EricSteph261 has timed out
-EricSteph261: checks 
-*** FLOP *** [9d 5s Jh]
-tiger48475: bets $0.06
-EricSteph261 has timed out
-EricSteph261: folds 
-EricSteph261 is sitting out
-supermeXXX: calls $0.06
-s0rrow: calls $0.06
-*** TURN *** [9d 5s Jh] [Ks]
-tiger48475: checks 
-supermeXXX: bets $0.10
-s0rrow: folds 
-tiger48475: calls $0.10
-*** RIVER *** [9d 5s Jh Ks] [9s]
-tiger48475: checks 
-supermeXXX: checks 
-*** SHOW DOWN ***
-tiger48475: shows [6s 9h 9c Ad] (HI: four of a kind, Nines)
-supermeXXX: mucks hand 
-tiger48475 collected $0.46 from pot
-No low hand qualified
-*** SUMMARY ***
-Total pot $0.46 | Rake $0 
-Board [9d 5s Jh Ks 9s]
-Seat 1: EricSteph261 (big blind) folded on the Flop
-Seat 3: supermeXXX mucked [Qd Tc 5h Ts]
-Seat 5: s0rrow (button) folded on the Turn
-Seat 6: tiger48475 (small blind) showed [6s 9h 9c Ad] and won ($0.46) with HI: four of a kind, Nines
-
-
-
+PokerStars Game #35874998500:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:36:51 ET
+Table 'Gaby II' 6-max Seat #3 is the button
+Seat 1: EricSteph261 ($11.27 in chips) 
+Seat 2: UnderMeSensi ($3.33 in chips) 
+Seat 3: supermeXXX ($1.19 in chips) 
+Seat 4: xgz520 ($1.81 in chips) 
+Seat 5: s0rrow ($3 in chips) 
+Seat 6: tiger48475 ($5 in chips) 
+xgz520: posts small blind $0.01
+s0rrow: posts big blind $0.02
+*** HOLE CARDS ***
+Dealt to s0rrow [2h 2c 3s 9h]
+tiger48475: folds 
+EricSteph261: folds 
+UnderMeSensi: raises $0.05 to $0.07
+supermeXXX: folds 
+xgz520: folds 
+s0rrow: calls $0.05
+*** FLOP *** [Jd 5c Kc]
+s0rrow: checks 
+UnderMeSensi: checks 
+*** TURN *** [Jd 5c Kc] [4c]
+s0rrow: checks 
+UnderMeSensi: bets $0.08
+s0rrow: calls $0.08
+*** RIVER *** [Jd 5c Kc 4c] [Th]
+s0rrow: checks 
+UnderMeSensi: bets $0.31
+EricSteph261 is sitting out
+s0rrow: folds 
+Uncalled bet ($0.31) returned to UnderMeSensi
+UnderMeSensi collected $0.31 from pot
+UnderMeSensi: doesn't show hand 
+*** SUMMARY ***
+Total pot $0.31 | Rake $0 
+Board [Jd 5c Kc 4c Th]
+Seat 1: EricSteph261 folded before Flop (didn't bet)
+Seat 2: UnderMeSensi collected ($0.31)
+Seat 3: supermeXXX (button) folded before Flop (didn't bet)
+Seat 4: xgz520 (small blind) folded before Flop
+Seat 5: s0rrow (big blind) folded on the River
+Seat 6: tiger48475 folded before Flop (didn't bet)
+
+
+
+PokerStars Game #35875026976:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:37:39 ET
+Table 'Gaby II' 6-max Seat #4 is the button
+Seat 2: UnderMeSensi ($3.49 in chips) 
+Seat 3: supermeXXX ($1.19 in chips) 
+Seat 4: xgz520 ($1.80 in chips) 
+Seat 5: s0rrow ($2.85 in chips) 
+Seat 6: tiger48475 ($5 in chips) 
+s0rrow: posts small blind $0.01
+tiger48475: posts big blind $0.02
+*** HOLE CARDS ***
+Dealt to s0rrow [4d 3s 8d Jd]
+UnderMeSensi: raises $0.05 to $0.07
+supermeXXX: folds 
+xgz520: folds 
+s0rrow: folds 
+tiger48475: folds 
+Uncalled bet ($0.05) returned to UnderMeSensi
+xgz520 leaves the table
+UnderMeSensi collected $0.05 from pot
+UnderMeSensi: doesn't show hand 
+*** SUMMARY ***
+Total pot $0.05 | Rake $0 
+Seat 2: UnderMeSensi collected ($0.05)
+Seat 3: supermeXXX folded before Flop (didn't bet)
+Seat 4: xgz520 (button) folded before Flop (didn't bet)
+Seat 5: s0rrow (small blind) folded before Flop
+Seat 6: tiger48475 (big blind) folded before Flop
+
+
+
+PokerStars Game #35875034981:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:37:53 ET
+Table 'Gaby II' 6-max Seat #5 is the button
+Seat 2: UnderMeSensi ($3.52 in chips) 
+Seat 3: supermeXXX ($1.19 in chips) 
+Seat 5: s0rrow ($2.84 in chips) 
+Seat 6: tiger48475 ($5 in chips) 
+tiger48475: posts small blind $0.01
+UnderMeSensi: posts big blind $0.02
+*** HOLE CARDS ***
+Dealt to s0rrow [Qh 6c Th 9c]
+supermeXXX: raises $0.04 to $0.06
+s0rrow: calls $0.06
+tiger48475: folds 
+UnderMeSensi: calls $0.04
+*** FLOP *** [5h 4d 2d]
+UnderMeSensi: checks 
+supermeXXX: bets $0.10
+s0rrow: folds 
+UnderMeSensi: calls $0.10
+*** TURN *** [5h 4d 2d] [Jd]
+UnderMeSensi: checks 
+supermeXXX: checks 
+*** RIVER *** [5h 4d 2d Jd] [6h]
+UnderMeSensi: checks 
+supermeXXX: checks 
+*** SHOW DOWN ***
+UnderMeSensi: shows [7c 6s 7h As] (HI: a pair of Sevens; LO: 6,5,4,2,A)
+supermeXXX: shows [Ah 2h Kh 2s] (HI: three of a kind, Deuces; LO: 6,5,4,2,A)
+supermeXXX collected $0.20 from pot
+UnderMeSensi collected $0.10 from pot
+supermeXXX collected $0.09 from pot
+*** SUMMARY ***
+Total pot $0.39 | Rake $0 
+Board [5h 4d 2d Jd 6h]
+Seat 2: UnderMeSensi (big blind) showed [7c 6s 7h As] and won ($0.10) with HI: a pair of Sevens; LO: 6,5,4,2,A
+Seat 3: supermeXXX showed [Ah 2h Kh 2s] and won ($0.29) with HI: three of a kind, Deuces; LO: 6,5,4,2,A
+Seat 5: s0rrow (button) folded on the Flop
+Seat 6: tiger48475 (small blind) folded before Flop
+
+
+
+PokerStars Game #35875059163:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:38:34 ET
+Table 'Gaby II' 6-max Seat #6 is the button
+Seat 2: UnderMeSensi ($3.46 in chips) 
+Seat 3: supermeXXX ($1.32 in chips) 
+Seat 5: s0rrow ($2.78 in chips) 
+Seat 6: tiger48475 ($5 in chips) 
+UnderMeSensi: posts small blind $0.01
+supermeXXX: posts big blind $0.02
+*** HOLE CARDS ***
+Dealt to s0rrow [Ts Qs 9d 7c]
+s0rrow: raises $0.04 to $0.06
+tiger48475: folds 
+UnderMeSensi: calls $0.05
+diyi69 joins the table at seat #4 
+supermeXXX: folds 
+*** FLOP *** [3h Ah 5d]
+UnderMeSensi: checks 
+s0rrow: checks 
+*** TURN *** [3h Ah 5d] [Kc]
+UnderMeSensi: checks 
+s0rrow: bets $0.14
+UnderMeSensi: folds 
+Uncalled bet ($0.14) returned to s0rrow
+s0rrow collected $0.14 from pot
+*** SUMMARY ***
+Total pot $0.14 | Rake $0 
+Board [3h Ah 5d Kc]
+Seat 2: UnderMeSensi (small blind) folded on the Turn
+Seat 3: supermeXXX (big blind) folded before Flop
+Seat 5: s0rrow collected ($0.14)
+Seat 6: tiger48475 (button) folded before Flop (didn't bet)
+
+
+
+PokerStars Game #35875079294:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:39:09 ET
+Table 'Gaby II' 6-max Seat #2 is the button
+Seat 2: UnderMeSensi ($3.40 in chips) 
+Seat 3: supermeXXX ($1.30 in chips) 
+Seat 4: diyi69 ($1 in chips) 
+Seat 5: s0rrow ($2.86 in chips) 
+Seat 6: tiger48475 ($5 in chips) 
+supermeXXX: posts small blind $0.01
+diyi69: posts big blind $0.02
+*** HOLE CARDS ***
+Dealt to s0rrow [8s 6d 7s 2s]
+s0rrow: folds 
+tiger48475: folds 
+UnderMeSensi: folds 
+supermeXXX: calls $0.01
+diyi69 has timed out
+diyi69: checks 
+*** FLOP *** [As Js 5h]
+supermeXXX: bets $0.04
+diyi69 has timed out
+diyi69: folds 
+Uncalled bet ($0.04) returned to supermeXXX
+diyi69 is sitting out
+supermeXXX collected $0.04 from pot
+*** SUMMARY ***
+Total pot $0.04 | Rake $0 
+Board [As Js 5h]
+Seat 2: UnderMeSensi (button) folded before Flop (didn't bet)
+Seat 3: supermeXXX (small blind) collected ($0.04)
+Seat 4: diyi69 (big blind) folded on the Flop
+Seat 5: s0rrow folded before Flop (didn't bet)
+Seat 6: tiger48475 folded before Flop (didn't bet)
+
+
+
+PokerStars Game #35875131707:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:40:40 ET
+Table 'Gaby II' 6-max Seat #3 is the button
+Seat 2: UnderMeSensi ($3.40 in chips) 
+Seat 3: supermeXXX ($1.32 in chips) 
+Seat 5: s0rrow ($2.86 in chips) 
+Seat 6: tiger48475 ($5 in chips) 
+s0rrow: posts small blind $0.01
+tiger48475: posts big blind $0.02
+*** HOLE CARDS ***
+Dealt to s0rrow [7c As 4d 4h]
+UnderMeSensi: calls $0.02
+supermeXXX: folds 
+s0rrow: calls $0.01
+tiger48475: checks 
+*** FLOP *** [Ks 9d Ts]
+s0rrow: checks 
+tiger48475: bets $0.06
+UnderMeSensi: calls $0.06
+s0rrow: folds 
+*** TURN *** [Ks 9d Ts] [7h]
+tiger48475: checks 
+EricSteph261 has returned
+UnderMeSensi: checks 
+*** RIVER *** [Ks 9d Ts 7h] [4s]
+tiger48475: checks 
+UnderMeSensi: bets $0.10
+tiger48475: folds 
+Uncalled bet ($0.10) returned to UnderMeSensi
+UnderMeSensi collected $0.18 from pot
+UnderMeSensi: doesn't show hand 
+*** SUMMARY ***
+Total pot $0.18 | Rake $0 
+Board [Ks 9d Ts 7h 4s]
+Seat 2: UnderMeSensi collected ($0.18)
+Seat 3: supermeXXX (button) folded before Flop (didn't bet)
+Seat 5: s0rrow (small blind) folded on the Flop
+Seat 6: tiger48475 (big blind) folded on the River
+
+
+
+PokerStars Game #35875159084:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:41:27 ET
+Table 'Gaby II' 6-max Seat #5 is the button
+Seat 1: EricSteph261 ($11.27 in chips) 
+Seat 2: UnderMeSensi ($3.50 in chips) 
+Seat 3: supermeXXX ($1.32 in chips) 
+Seat 5: s0rrow ($2.84 in chips) 
+Seat 6: tiger48475 ($5 in chips) 
+tiger48475: posts small blind $0.01
+EricSteph261: posts big blind $0.02
+*** HOLE CARDS ***
+Dealt to s0rrow [Jc 3h 2s Qc]
+UnderMeSensi: calls $0.02
+supermeXXX: calls $0.02
+s0rrow: raises $0.08 to $0.10
+tiger48475: folds 
+EricSteph261: folds 
+UnderMeSensi: calls $0.08
+supermeXXX: folds 
+*** FLOP *** [Ac 5s Js]
+UnderMeSensi: checks 
+s0rrow: bets $0.20
+UnderMeSensi: calls $0.20
+*** TURN *** [Ac 5s Js] [8c]
+UnderMeSensi: checks 
+s0rrow: bets $0.50
+UnderMeSensi: calls $0.50
+*** RIVER *** [Ac 5s Js 8c] [Jd]
+UnderMeSensi: bets $1.60
+s0rrow: calls $1.60
+*** SHOW DOWN ***
+UnderMeSensi: shows [7s 9s Jh 3c] (HI: three of a kind, Jacks; LO: 8,7,5,3,A)
+s0rrow: shows [Jc 3h 2s Qc] (HI: three of a kind, Jacks - Ace+Queen kicker; LO: 8,5,3,2,A)
+s0rrow collected $2.33 from pot
+s0rrow collected $2.32 from pot
+*** SUMMARY ***
+Total pot $4.85 | Rake $0.20 
+Board [Ac 5s Js 8c Jd]
+Seat 1: EricSteph261 (big blind) folded before Flop
+Seat 2: UnderMeSensi showed [7s 9s Jh 3c] and lost with HI: three of a kind, Jacks; LO: 8,7,5,3,A
+Seat 3: supermeXXX folded before Flop
+Seat 5: s0rrow (button) showed [Jc 3h 2s Qc] and won ($4.65) with HI: three of a kind, Jacks; LO: 8,5,3,2,A
+Seat 6: tiger48475 (small blind) folded before Flop
+
+
+
+PokerStars Game #35875194885:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:42:28 ET
+Table 'Gaby II' 6-max Seat #6 is the button
+Seat 1: EricSteph261 ($11.25 in chips) 
+Seat 2: UnderMeSensi ($1.10 in chips) 
+Seat 3: supermeXXX ($1.30 in chips) 
+Seat 5: s0rrow ($5.09 in chips) 
+Seat 6: tiger48475 ($5 in chips) 
+EricSteph261: posts small blind $0.01
+UnderMeSensi: posts big blind $0.02
+*** HOLE CARDS ***
+Dealt to s0rrow [7s 3c 3h 8d]
+supermeXXX: folds 
+s0rrow: raises $0.02 to $0.04
+tiger48475: calls $0.04
+EricSteph261: calls $0.03
+UnderMeSensi: calls $0.02
+*** FLOP *** [8c 3s 4s]
+EricSteph261: checks 
+UnderMeSensi: checks 
+s0rrow: bets $0.14
+tiger48475: folds 
+EricSteph261: folds 
+UnderMeSensi: folds 
+Uncalled bet ($0.14) returned to s0rrow
+s0rrow collected $0.16 from pot
+*** SUMMARY ***
+Total pot $0.16 | Rake $0 
+Board [8c 3s 4s]
+Seat 1: EricSteph261 (small blind) folded on the Flop
+Seat 2: UnderMeSensi (big blind) folded on the Flop
+Seat 3: supermeXXX folded before Flop (didn't bet)
+Seat 5: s0rrow collected ($0.16)
+Seat 6: tiger48475 (button) folded on the Flop
+
+
+
+PokerStars Game #35875219121:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:43:08 ET
+Table 'Gaby II' 6-max Seat #1 is the button
+Seat 1: EricSteph261 ($11.21 in chips) 
+Seat 2: UnderMeSensi ($1.06 in chips) 
+Seat 3: supermeXXX ($1.30 in chips) 
+Seat 5: s0rrow ($5.21 in chips) 
+Seat 6: tiger48475 ($5 in chips) 
+UnderMeSensi: posts small blind $0.01
+supermeXXX: posts big blind $0.02
+*** HOLE CARDS ***
+Dealt to s0rrow [Ks Qd Kd Kc]
+s0rrow: raises $0.04 to $0.06
+tiger48475: folds 
+EricSteph261: calls $0.06
+UnderMeSensi: calls $0.05
+supermeXXX: calls $0.04
+*** FLOP *** [2d Jh 5h]
+UnderMeSensi: checks 
+supermeXXX: checks 
+s0rrow: checks 
+EricSteph261: checks 
+*** TURN *** [2d Jh 5h] [Js]
+UnderMeSensi: checks 
+supermeXXX: checks 
+s0rrow: checks 
+EricSteph261: checks 
+*** RIVER *** [2d Jh 5h Js] [7s]
+UnderMeSensi: checks 
+supermeXXX: checks 
+s0rrow: checks 
+EricSteph261: checks 
+*** SHOW DOWN ***
+UnderMeSensi: shows [5d 6c As 9d] (HI: two pair, Jacks and Fives; LO: 7,6,5,2,A)
+supermeXXX: shows [6s Th 7c Ac] (HI: two pair, Jacks and Sevens; LO: 7,6,5,2,A)
+s0rrow: shows [Ks Qd Kd Kc] (HI: two pair, Kings and Jacks)
+EricSteph261: shows [4s 9c 3d 2c] (HI: two pair, Jacks and Deuces; LO: 7,5,4,3,2)
+s0rrow collected $0.12 from pot
+EricSteph261 collected $0.12 from pot
+*** SUMMARY ***
+Total pot $0.24 | Rake $0 
+Board [2d Jh 5h Js 7s]
+Seat 1: EricSteph261 (button) showed [4s 9c 3d 2c] and won ($0.12) with HI: two pair, Jacks and Deuces; LO: 7,5,4,3,2
+Seat 2: UnderMeSensi (small blind) showed [5d 6c As 9d] and lost with HI: two pair, Jacks and Fives; LO: 7,6,5,2,A
+Seat 3: supermeXXX (big blind) showed [6s Th 7c Ac] and lost with HI: two pair, Jacks and Sevens; LO: 7,6,5,2,A
+Seat 5: s0rrow showed [Ks Qd Kd Kc] and won ($0.12) with HI: two pair, Kings and Jacks
+Seat 6: tiger48475 folded before Flop (didn't bet)
+
+
+
+PokerStars Game #35875246335:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:43:54 ET
+Table 'Gaby II' 6-max Seat #2 is the button
+Seat 1: EricSteph261 ($11.27 in chips) 
+Seat 2: UnderMeSensi ($1 in chips) 
+Seat 3: supermeXXX ($1.24 in chips) 
+Seat 5: s0rrow ($5.27 in chips) 
+Seat 6: tiger48475 ($5 in chips) 
+supermeXXX: posts small blind $0.01
+s0rrow: posts big blind $0.02
+*** HOLE CARDS ***
+Dealt to s0rrow [Jd Kc 6h Jc]
+tiger48475: folds 
+EricSteph261: calls $0.02
+UnderMeSensi is disconnected 
+UnderMeSensi has timed out while disconnected
+UnderMeSensi: folds 
+UnderMeSensi is sitting out
+supermeXXX: calls $0.01
+s0rrow: checks 
+*** FLOP *** [8d 7s Qh]
+supermeXXX: bets $0.02
+s0rrow: folds 
+EricSteph261: calls $0.02
+*** TURN *** [8d 7s Qh] [As]
+supermeXXX: bets $0.04
+EricSteph261: calls $0.04
+*** RIVER *** [8d 7s Qh As] [5d]
+supermeXXX: checks 
+EricSteph261: checks 
+*** SHOW DOWN ***
+supermeXXX: shows [Kh Qd 9s Th] (HI: a pair of Queens)
+EricSteph261: shows [Jh 2d 5s 6c] (HI: a pair of Fives; LO: 7,6,5,2,A)
+supermeXXX collected $0.09 from pot
+EricSteph261 collected $0.09 from pot
+*** SUMMARY ***
+Total pot $0.18 | Rake $0 
+Board [8d 7s Qh As 5d]
+Seat 1: EricSteph261 showed [Jh 2d 5s 6c] and won ($0.09) with HI: a pair of Fives; LO: 7,6,5,2,A
+Seat 2: UnderMeSensi (button) folded before Flop (didn't bet)
+Seat 3: supermeXXX (small blind) showed [Kh Qd 9s Th] and won ($0.09) with HI: a pair of Queens
+Seat 5: s0rrow (big blind) folded on the Flop
+Seat 6: tiger48475 folded before Flop (didn't bet)
+
+
+
+PokerStars Game #35875293439:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:45:14 ET
+Table 'Gaby II' 6-max Seat #3 is the button
+Seat 1: EricSteph261 ($11.28 in chips) 
+Seat 3: supermeXXX ($1.25 in chips) 
+Seat 5: s0rrow ($5.25 in chips) 
+Seat 6: tiger48475 ($5 in chips) 
+s0rrow: posts small blind $0.01
+tiger48475: posts big blind $0.02
+*** HOLE CARDS ***
+Dealt to s0rrow [9c 8h 8s 3c]
+EricSteph261: calls $0.02
+supermeXXX: calls $0.02
+s0rrow: calls $0.01
+tiger48475: checks 
+*** FLOP *** [Ah 2d Qc]
+s0rrow: checks 
+tiger48475: checks 
+EricSteph261: checks 
+supermeXXX: checks 
+*** TURN *** [Ah 2d Qc] [3d]
+s0rrow: checks 
+tiger48475: checks 
+EricSteph261: checks 
+supermeXXX: checks 
+*** RIVER *** [Ah 2d Qc 3d] [6s]
+s0rrow: checks 
+tiger48475: checks 
+EricSteph261: checks 
+supermeXXX: checks 
+*** SHOW DOWN ***
+s0rrow: shows [9c 8h 8s 3c] (HI: a pair of Eights; LO: 8,6,3,2,A)
+tiger48475: shows [3s 5s Ts Th] (HI: a pair of Tens; LO: 6,5,3,2,A)
+EricSteph261: shows [As Ks Jh 7h] (HI: a pair of Aces; LO: 7,6,3,2,A)
+supermeXXX: mucks hand 
+EricSteph261 collected $0.04 from pot
+tiger48475 collected $0.04 from pot
+*** SUMMARY ***
+Total pot $0.08 | Rake $0 
+Board [Ah 2d Qc 3d 6s]
+Seat 1: EricSteph261 showed [As Ks Jh 7h] and won ($0.04) with HI: a pair of Aces; LO: 7,6,3,2,A
+Seat 3: supermeXXX (button) mucked [9h 9s 4c Kc]
+Seat 5: s0rrow (small blind) showed [9c 8h 8s 3c] and lost with HI: a pair of Eights; LO: 8,6,3,2,A
+Seat 6: tiger48475 (big blind) showed [3s 5s Ts Th] and won ($0.04) with HI: a pair of Tens; LO: 6,5,3,2,A
+
+
+
+PokerStars Game #35875328026:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:46:13 ET
+Table 'Gaby II' 6-max Seat #5 is the button
+Seat 1: EricSteph261 ($11.30 in chips) 
+Seat 3: supermeXXX ($1.23 in chips) 
+Seat 5: s0rrow ($5.23 in chips) 
+Seat 6: tiger48475 ($5.02 in chips) 
+tiger48475: posts small blind $0.01
+EricSteph261: posts big blind $0.02
+*** HOLE CARDS ***
+Dealt to s0rrow [Qd 6h 8s 6c]
+supermeXXX: calls $0.02
+s0rrow: folds 
+tiger48475: calls $0.01
+EricSteph261: checks 
+*** FLOP *** [Kc Ac 5s]
+tiger48475: checks 
+EricSteph261: checks 
+supermeXXX: checks 
+*** TURN *** [Kc Ac 5s] [3h]
+tiger48475: checks 
+EricSteph261: checks 
+supermeXXX: checks 
+*** RIVER *** [Kc Ac 5s 3h] [Qh]
+tiger48475: bets $0.06
+EricSteph261: folds 
+EricSteph261 is sitting out
+supermeXXX: folds 
+Uncalled bet ($0.06) returned to tiger48475
+tiger48475 collected $0.06 from pot
+*** SUMMARY ***
+Total pot $0.06 | Rake $0 
+Board [Kc Ac 5s 3h Qh]
+Seat 1: EricSteph261 (big blind) folded on the River
+Seat 3: supermeXXX folded on the River
+Seat 5: s0rrow (button) folded before Flop (didn't bet)
+Seat 6: tiger48475 (small blind) collected ($0.06)
+
+
+
+PokerStars Game #35875356253:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:47:00 ET
+Table 'Gaby II' 6-max Seat #6 is the button
+Seat 3: supermeXXX ($1.21 in chips) 
+Seat 5: s0rrow ($5.23 in chips) 
+Seat 6: tiger48475 ($5.06 in chips) 
+supermeXXX: posts small blind $0.01
+s0rrow: posts big blind $0.02
+*** HOLE CARDS ***
+Dealt to s0rrow [8h Jd 5d 8d]
+tiger48475: folds 
+supermeXXX: calls $0.01
+s0rrow: checks 
+*** FLOP *** [Ks 9s 6c]
+supermeXXX: bets $0.02
+s0rrow: calls $0.02
+*** TURN *** [Ks 9s 6c] [Qc]
+supermeXXX: bets $0.02
+s0rrow: calls $0.02
+*** RIVER *** [Ks 9s 6c Qc] [Ad]
+supermeXXX: checks 
+s0rrow: checks 
+*** SHOW DOWN ***
+supermeXXX: shows [Tc 7d 8c 3s] (HI: high card Ace)
+s0rrow: shows [8h Jd 5d 8d] (HI: a pair of Eights)
+s0rrow collected $0.12 from pot
+No low hand qualified
+*** SUMMARY ***
+Total pot $0.12 | Rake $0 
+Board [Ks 9s 6c Qc Ad]
+Seat 3: supermeXXX (small blind) showed [Tc 7d 8c 3s] and lost with HI: high card Ace
+Seat 5: s0rrow (big blind) showed [8h Jd 5d 8d] and won ($0.12) with HI: a pair of Eights
+Seat 6: tiger48475 (button) folded before Flop (didn't bet)
+
+
+
+PokerStars Game #35875379792:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:47:39 ET
+Table 'Gaby II' 6-max Seat #3 is the button
+Seat 3: supermeXXX ($1.15 in chips) 
+Seat 5: s0rrow ($5.29 in chips) 
+Seat 6: tiger48475 ($5.06 in chips) 
+s0rrow: posts small blind $0.01
+tiger48475: posts big blind $0.02
+*** HOLE CARDS ***
+Dealt to s0rrow [9c 5h 3s Th]
+supermeXXX: calls $0.02
+s0rrow: calls $0.01
+tiger48475: checks 
+*** FLOP *** [Jc 3h Jd]
+s0rrow: checks 
+tiger48475: checks 
+supermeXXX: checks 
+*** TURN *** [Jc 3h Jd] [6d]
+s0rrow: checks 
+tiger48475: bets $0.06
+supermeXXX: folds 
+EricSteph261 has returned
+s0rrow: calls $0.06
+*** RIVER *** [Jc 3h Jd 6d] [5c]
+s0rrow: checks 
+tiger48475: bets $0.14
+s0rrow: folds 
+Uncalled bet ($0.14) returned to tiger48475
+tiger48475 collected $0.18 from pot
+*** SUMMARY ***
+Total pot $0.18 | Rake $0 
+Board [Jc 3h Jd 6d 5c]
+Seat 3: supermeXXX (button) folded on the Turn
+Seat 5: s0rrow (small blind) folded on the River
+Seat 6: tiger48475 (big blind) collected ($0.18)
+
+
+
+PokerStars Game #35875409365:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:48:29 ET
+Table 'Gaby II' 6-max Seat #5 is the button
+Seat 1: EricSteph261 ($11.28 in chips) 
+Seat 3: supermeXXX ($1.13 in chips) 
+Seat 5: s0rrow ($5.21 in chips) 
+Seat 6: tiger48475 ($5.16 in chips) 
+tiger48475: posts small blind $0.01
+EricSteph261: posts big blind $0.02
+*** HOLE CARDS ***
+Dealt to s0rrow [6h 3c Th 2s]
+supermeXXX: calls $0.02
+s0rrow: calls $0.02
+tiger48475: calls $0.01
+EricSteph261 has timed out
+EricSteph261: checks 
+*** FLOP *** [9d 5s Jh]
+tiger48475: bets $0.06
+EricSteph261 has timed out
+EricSteph261: folds 
+EricSteph261 is sitting out
+supermeXXX: calls $0.06
+s0rrow: calls $0.06
+*** TURN *** [9d 5s Jh] [Ks]
+tiger48475: checks 
+supermeXXX: bets $0.10
+s0rrow: folds 
+tiger48475: calls $0.10
+*** RIVER *** [9d 5s Jh Ks] [9s]
+tiger48475: checks 
+supermeXXX: checks 
+*** SHOW DOWN ***
+tiger48475: shows [6s 9h 9c Ad] (HI: four of a kind, Nines)
+supermeXXX: mucks hand 
+tiger48475 collected $0.46 from pot
+No low hand qualified
+*** SUMMARY ***
+Total pot $0.46 | Rake $0 
+Board [9d 5s Jh Ks 9s]
+Seat 1: EricSteph261 (big blind) folded on the Flop
+Seat 3: supermeXXX mucked [Qd Tc 5h Ts]
+Seat 5: s0rrow (button) folded on the Turn
+Seat 6: tiger48475 (small blind) showed [6s 9h 9c Ad] and won ($0.46) with HI: four of a kind, Nines
+
+
+
diff --git a/pyfpdb/regression-test-files/cash/Stars/Stud/7-StudHL-USD-0.04-0.08-200911.Cardtest.txt b/pyfpdb/regression-test-files/cash/Stars/Stud/7-StudHL-USD-0.04-0.08-200911.Cardtest.txt
index 0ffdcc3d..7b1e2f44 100644
--- a/pyfpdb/regression-test-files/cash/Stars/Stud/7-StudHL-USD-0.04-0.08-200911.Cardtest.txt
+++ b/pyfpdb/regression-test-files/cash/Stars/Stud/7-StudHL-USD-0.04-0.08-200911.Cardtest.txt
@@ -1,96 +1,96 @@
-PokerStars Game #35874676388:  7 Card Stud Hi/Lo Limit ($0.04/$0.08 USD) - 2009/11/26 10:27:46 ET
-Table 'Dawn II' 8-max
-Seat 1: u.pressure ($11.17 in chips) 
-Seat 2: 123smoothie ($0.99 in chips) 
-Seat 3: gashpor ($1.40 in chips) 
-Seat 4: denny501 ($0.71 in chips) 
-Seat 5: s0rrow ($1.52 in chips) 
-Seat 6: TomSludge ($1.58 in chips) 
-Seat 7: Soroka69 ($0.83 in chips) 
-Seat 8: rdiezchang ($2.05 in chips) 
-u.pressure: posts the ante $0.01
-123smoothie: posts the ante $0.01
-gashpor: posts the ante $0.01
-denny501: posts the ante $0.01
-s0rrow: posts the ante $0.01
-TomSludge: posts the ante $0.01
-Soroka69: posts the ante $0.01
-rdiezchang: posts the ante $0.01
-*** 3rd STREET ***
-Dealt to u.pressure [Td]
-Dealt to 123smoothie [4c]
-Dealt to gashpor [5d]
-Dealt to denny501 [2c]
-Dealt to s0rrow [7c 3s 5h]
-Dealt to TomSludge [8s]
-Dealt to Soroka69 [7d]
-Dealt to rdiezchang [Ad]
-denny501: brings in for $0.02
-s0rrow: calls $0.02
-TomSludge: folds 
-Soroka69: calls $0.02
-rdiezchang: calls $0.02
-u.pressure: folds 
-123smoothie: calls $0.02
-gashpor: calls $0.02
-*** 4th STREET ***
-Dealt to 123smoothie [4c] [3c]
-Dealt to gashpor [5d] [Qd]
-Dealt to denny501 [2c] [7s]
-Dealt to s0rrow [7c 3s 5h] [Qc]
-Dealt to Soroka69 [7d] [5s]
-Dealt to rdiezchang [Ad] [Js]
-rdiezchang: checks 
-123smoothie: checks 
-gashpor: checks 
-denny501: folds 
-denny501 leaves the table
-s0rrow: checks 
-Soroka69: checks 
-*** 5th STREET ***
-Dealt to 123smoothie [4c 3c] [9s]
-Dealt to gashpor [5d Qd] [Jd]
-Dealt to s0rrow [7c 3s 5h Qc] [Kc]
-Dealt to Soroka69 [7d 5s] [5c]
-Dealt to rdiezchang [Ad Js] [Ts]
-LainaRahat joins the table at seat #4 
-Soroka69: checks 
-rdiezchang: checks 
-123smoothie: checks 
-gashpor: bets $0.08
-s0rrow: calls $0.08
-Soroka69: calls $0.08
-rdiezchang: folds 
-123smoothie: folds 
-*** 6th STREET ***
-Dealt to gashpor [5d Qd Jd] [9d]
-Dealt to s0rrow [7c 3s 5h Qc Kc] [6d]
-Dealt to Soroka69 [7d 5s 5c] [2s]
-Soroka69: checks 
-gashpor: bets $0.08
-s0rrow: calls $0.08
-Soroka69: calls $0.08
-*** RIVER ***
-Dealt to s0rrow [7c 3s 5h Qc Kc 6d] [4d]
-Soroka69: checks 
-gashpor: bets $0.08
-s0rrow: calls $0.08
-Soroka69: folds 
-*** SHOW DOWN ***
-gashpor: shows [4h 3d 5d Qd Jd 9d 6h] (HI: a flush, Queen high)
-s0rrow: shows [7c 3s 5h Qc Kc 6d 4d] (HI: a straight, Three to Seven; LO: 7,6,5,4,3)
-gashpor collected $0.40 from pot
-s0rrow collected $0.40 from pot
-*** SUMMARY ***
-Total pot $0.84 | Rake $0.04 
-Seat 1: u.pressure folded on the 3rd Street (didn't bet)
-Seat 2: 123smoothie folded on the 5th Street
-Seat 3: gashpor showed [4h 3d 5d Qd Jd 9d 6h] and won ($0.40) with HI: a flush, Queen high
-Seat 4: denny501 folded on the 4th Street
-Seat 5: s0rrow showed [7c 3s 5h Qc Kc 6d 4d] and won ($0.40) with HI: a straight, Three to Seven; LO: 7,6,5,4,3
-Seat 6: TomSludge folded on the 3rd Street (didn't bet)
-Seat 7: Soroka69 folded on the River
-Seat 8: rdiezchang folded on the 5th Street
-
-
-
+PokerStars Game #35874676388:  7 Card Stud Hi/Lo Limit ($0.04/$0.08 USD) - 2009/11/26 10:27:46 ET
+Table 'Dawn II' 8-max
+Seat 1: u.pressure ($11.17 in chips) 
+Seat 2: 123smoothie ($0.99 in chips) 
+Seat 3: gashpor ($1.40 in chips) 
+Seat 4: denny501 ($0.71 in chips) 
+Seat 5: s0rrow ($1.52 in chips) 
+Seat 6: TomSludge ($1.58 in chips) 
+Seat 7: Soroka69 ($0.83 in chips) 
+Seat 8: rdiezchang ($2.05 in chips) 
+u.pressure: posts the ante $0.01
+123smoothie: posts the ante $0.01
+gashpor: posts the ante $0.01
+denny501: posts the ante $0.01
+s0rrow: posts the ante $0.01
+TomSludge: posts the ante $0.01
+Soroka69: posts the ante $0.01
+rdiezchang: posts the ante $0.01
+*** 3rd STREET ***
+Dealt to u.pressure [Td]
+Dealt to 123smoothie [4c]
+Dealt to gashpor [5d]
+Dealt to denny501 [2c]
+Dealt to s0rrow [7c 3s 5h]
+Dealt to TomSludge [8s]
+Dealt to Soroka69 [7d]
+Dealt to rdiezchang [Ad]
+denny501: brings in for $0.02
+s0rrow: calls $0.02
+TomSludge: folds 
+Soroka69: calls $0.02
+rdiezchang: calls $0.02
+u.pressure: folds 
+123smoothie: calls $0.02
+gashpor: calls $0.02
+*** 4th STREET ***
+Dealt to 123smoothie [4c] [3c]
+Dealt to gashpor [5d] [Qd]
+Dealt to denny501 [2c] [7s]
+Dealt to s0rrow [7c 3s 5h] [Qc]
+Dealt to Soroka69 [7d] [5s]
+Dealt to rdiezchang [Ad] [Js]
+rdiezchang: checks 
+123smoothie: checks 
+gashpor: checks 
+denny501: folds 
+denny501 leaves the table
+s0rrow: checks 
+Soroka69: checks 
+*** 5th STREET ***
+Dealt to 123smoothie [4c 3c] [9s]
+Dealt to gashpor [5d Qd] [Jd]
+Dealt to s0rrow [7c 3s 5h Qc] [Kc]
+Dealt to Soroka69 [7d 5s] [5c]
+Dealt to rdiezchang [Ad Js] [Ts]
+LainaRahat joins the table at seat #4 
+Soroka69: checks 
+rdiezchang: checks 
+123smoothie: checks 
+gashpor: bets $0.08
+s0rrow: calls $0.08
+Soroka69: calls $0.08
+rdiezchang: folds 
+123smoothie: folds 
+*** 6th STREET ***
+Dealt to gashpor [5d Qd Jd] [9d]
+Dealt to s0rrow [7c 3s 5h Qc Kc] [6d]
+Dealt to Soroka69 [7d 5s 5c] [2s]
+Soroka69: checks 
+gashpor: bets $0.08
+s0rrow: calls $0.08
+Soroka69: calls $0.08
+*** RIVER ***
+Dealt to s0rrow [7c 3s 5h Qc Kc 6d] [4d]
+Soroka69: checks 
+gashpor: bets $0.08
+s0rrow: calls $0.08
+Soroka69: folds 
+*** SHOW DOWN ***
+gashpor: shows [4h 3d 5d Qd Jd 9d 6h] (HI: a flush, Queen high)
+s0rrow: shows [7c 3s 5h Qc Kc 6d 4d] (HI: a straight, Three to Seven; LO: 7,6,5,4,3)
+gashpor collected $0.40 from pot
+s0rrow collected $0.40 from pot
+*** SUMMARY ***
+Total pot $0.84 | Rake $0.04 
+Seat 1: u.pressure folded on the 3rd Street (didn't bet)
+Seat 2: 123smoothie folded on the 5th Street
+Seat 3: gashpor showed [4h 3d 5d Qd Jd 9d 6h] and won ($0.40) with HI: a flush, Queen high
+Seat 4: denny501 folded on the 4th Street
+Seat 5: s0rrow showed [7c 3s 5h Qc Kc 6d 4d] and won ($0.40) with HI: a straight, Three to Seven; LO: 7,6,5,4,3
+Seat 6: TomSludge folded on the 3rd Street (didn't bet)
+Seat 7: Soroka69 folded on the River
+Seat 8: rdiezchang folded on the 5th Street
+
+
+
diff --git a/pyfpdb/test1.py b/pyfpdb/test1.py
index 76bde20e..4f220935 100755
--- a/pyfpdb/test1.py
+++ b/pyfpdb/test1.py
@@ -1,29 +1,29 @@
-#!/usr/bin/env python
-"""test1.py
-
-Test if python is working.
-"""
-#    Copyright 2008, Ray E. Barker
-#    
-#    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 of the License, or
-#    (at your option) any later version.
-#    
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#    GNU General Public License for more details.
-#    
-#    You should have received a copy of the GNU General Public License
-#    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-########################################################################
-
-import sys
-
-print "\npython is working!"
-print "\npress return to finish"
-
-sys.stdin.readline()
+#!/usr/bin/env python
+"""test1.py
+
+Test if python is working.
+"""
+#    Copyright 2008, Ray E. Barker
+#    
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#    
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#    GNU General Public License for more details.
+#    
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+########################################################################
+
+import sys
+
+print "\npython is working!"
+print "\npress return to finish"
+
+sys.stdin.readline()
diff --git a/pyfpdb/test2.py b/pyfpdb/test2.py
index c52d0a6c..74ce1e72 100755
--- a/pyfpdb/test2.py
+++ b/pyfpdb/test2.py
@@ -1,57 +1,57 @@
-#!/usr/bin/env python
-"""test2.py
-
-Test if gtk is working.
-"""
-#    Copyright 2008, Ray E. Barker
-#    
-#    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 of the License, or
-#    (at your option) any later version.
-#    
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#    GNU General Public License for more details.
-#    
-#    You should have received a copy of the GNU General Public License
-#    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-########################################################################
-
-import sys
-
-try:
-    import pygtk
-    pygtk.require('2.0')
-    import gtk
-
-
-    win = gtk.Window(gtk.WINDOW_TOPLEVEL)
-    win.set_title("Test GTK")
-    win.set_border_width(1)
-    win.set_default_size(600, 500)
-    win.set_resizable(True)
-    #win.show()
-
-    dia = gtk.Dialog("Test GTK",
-                     win,
-                     gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
-                     (gtk.STOCK_CLOSE, gtk.RESPONSE_OK))
-    dia.set_default_size(500, 300)
-
-    l = gtk.Label("GTK is working!")
-    dia.vbox.add(l)
-    l.show()
-
-    response = dia.run()
-    if response == gtk.RESPONSE_ACCEPT:
-        pass
-    dia.destroy()
-
-except:
-    print "\nError:", sys.exc_info()
-    print "\npress return to finish"
-    sys.stdin.readline()
+#!/usr/bin/env python
+"""test2.py
+
+Test if gtk is working.
+"""
+#    Copyright 2008, Ray E. Barker
+#    
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#    
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#    GNU General Public License for more details.
+#    
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+########################################################################
+
+import sys
+
+try:
+    import pygtk
+    pygtk.require('2.0')
+    import gtk
+
+
+    win = gtk.Window(gtk.WINDOW_TOPLEVEL)
+    win.set_title("Test GTK")
+    win.set_border_width(1)
+    win.set_default_size(600, 500)
+    win.set_resizable(True)
+    #win.show()
+
+    dia = gtk.Dialog("Test GTK",
+                     win,
+                     gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
+                     (gtk.STOCK_CLOSE, gtk.RESPONSE_OK))
+    dia.set_default_size(500, 300)
+
+    l = gtk.Label("GTK is working!")
+    dia.vbox.add(l)
+    l.show()
+
+    response = dia.run()
+    if response == gtk.RESPONSE_ACCEPT:
+        pass
+    dia.destroy()
+
+except:
+    print "\nError:", sys.exc_info()
+    print "\npress return to finish"
+    sys.stdin.readline()

From cf6e818ae5ae784ee778cdc11b9c204337f70da1 Mon Sep 17 00:00:00 2001
From: Carl Gherardi <carlos@sorrow.(none)>
Date: Mon, 14 Dec 2009 16:45:08 +0800
Subject: [PATCH 011/320] [NEWIMPORT] Enable NEWIMPORT by defaul

---
 pyfpdb/Configuration.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py
index 996ef60c..bf8689a6 100755
--- a/pyfpdb/Configuration.py
+++ b/pyfpdb/Configuration.py
@@ -125,7 +125,7 @@ DATABASE_TYPES = (
         DATABASE_TYPE_MYSQL,
         )
 
-NEWIMPORT = False
+NEWIMPORT = True
 
 ########################################################################
 def string_to_bool(string, default=True):

From 97842c1be3daa75e687360dd697a3940ad1641b5 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Wed, 16 Dec 2009 18:15:07 +0000
Subject: [PATCH 012/320] remove merge comment

---
 pyfpdb/SQL.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py
index 5a0d1965..fa6d50cf 100644
--- a/pyfpdb/SQL.py
+++ b/pyfpdb/SQL.py
@@ -2789,8 +2789,6 @@ class Sql:
                         ,hp.tourneyTypeId
                         ,date_format(h.handStart, 'd%y%m%d')
 """
-#>>>>>>> 28ca49d592c8e706ad6ee58dd26655bcc33fc5fb:pyfpdb/SQL.py
-#"""
         elif db_server == 'postgresql':
             self.query['rebuildHudCache'] = """
                 INSERT INTO HudCache

From f03a9c287fba9398aba1eff20a17e5b398656d99 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 17 Dec 2009 15:53:12 +0800
Subject: [PATCH 013/320] Add some code to kinda detect hand cancellation

hhc.readHandInfo(self)
hhc.readPlayerStacks(self)
hhc.compilePlayerRegexs(self)
hhc.markStreets(self)

Is the order, the first correctly failing regex is markStreets
---
 pyfpdb/Hand.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 6901340e..32140256 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -54,6 +54,7 @@ class Hand(object):
         self.starttime = 0
         self.handText = handText
         self.handid = 0
+        self.cancelled = False
         self.dbid_hands = 0
         self.dbid_pids = None
         self.dbid_gt = 0
@@ -263,6 +264,8 @@ If a player has None chips he won't be added."""
             log.debug("markStreets:\n"+ str(self.streets))
         else:
             log.error("markstreets didn't match")
+            log.error("    - Assuming hand cancelled")
+            self.cancelled = True
 
     def checkPlayerExists(self,player):
         if player not in [p[1] for p in self.players]:
@@ -613,6 +616,8 @@ class HoldemOmahaHand(Hand):
             hhc.readPlayerStacks(self)
             hhc.compilePlayerRegexs(self)
             hhc.markStreets(self)
+            if self.cancelled:
+                return
             hhc.readBlinds(self)
             hhc.readAntes(self)
             hhc.readButton(self)

From 26fc0b592837765c515277fc1f0b373b9934667b Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 17 Dec 2009 18:42:50 +0800
Subject: [PATCH 014/320] Add ability to import Stars archive files.

PokerStars support can provide a HH archive. The format is similar but not the same as a a standard hh format as it contains an additional line "Hand #X" between each hand.

Patch adds an option -s to GuiBulkImport, which when specified will strip these lines out and continue parsing.
---
 pyfpdb/GuiBulkImport.py        |  4 ++++
 pyfpdb/Hand.py                 |  1 +
 pyfpdb/HandHistoryConverter.py |  8 +++++++-
 pyfpdb/fpdb_import.py          | 19 +++++++++++++------
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/pyfpdb/GuiBulkImport.py b/pyfpdb/GuiBulkImport.py
index 7db420c7..16131ab2 100755
--- a/pyfpdb/GuiBulkImport.py
+++ b/pyfpdb/GuiBulkImport.py
@@ -326,6 +326,8 @@ def main(argv=None):
                     help="How often to print a one-line status report (0 (default) means never)")
     parser.add_option("-u", "--usage", action="store_true", dest="usage", default=False,
                     help="Print some useful one liners")
+    parser.add_option("-s", "--starsarchive", action="store_true", dest="starsArchive", default=False,
+                    help="Do the required conversion for Stars Archive format (ie. as provided by support")
     (options, argv) = parser.parse_args(args = argv)
 
     if options.usage == True:
@@ -369,6 +371,8 @@ def main(argv=None):
         importer.setThreads(-1)
         importer.addBulkImportImportFileOrDir(os.path.expanduser(options.filename), site=options.filtername)
         importer.setCallHud(False)
+        if options.starsArchive:
+            importer.setStarsArchive(True)
         (stored, dups, partial, errs, ttime) = importer.runImport()
         importer.clearFileList()
         print 'GuiBulkImport done: Stored: %d \tDuplicates: %d \tPartial: %d \tErrors: %d in %s seconds - %.0f/sec'\
diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 32140256..3467216a 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -266,6 +266,7 @@ If a player has None chips he won't be added."""
             log.error("markstreets didn't match")
             log.error("    - Assuming hand cancelled")
             self.cancelled = True
+            raise FpdbParseError
 
     def checkPlayerExists(self,player):
         if player not in [p[1] for p in self.players]:
diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index 27bb9b1a..a18797df 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -57,7 +57,7 @@ class HandHistoryConverter():
     codepage = "cp1252"
 
 
-    def __init__(self, in_path = '-', out_path = '-', follow=False, index=0, autostart=True):
+    def __init__(self, in_path = '-', out_path = '-', follow=False, index=0, autostart=True, starsArchive=False):
         """\
 in_path   (default '-' = sys.stdin)
 out_path  (default '-' = sys.stdout)
@@ -66,6 +66,7 @@ follow :  whether to tail -f the input"""
         log.info("HandHistory init - %s subclass, in_path '%s'; out_path '%s'" % (self.sitename, in_path, out_path) )
         
         self.index     = 0
+        self.starsArchive = starsArchive
 
         self.in_path = in_path
         self.out_path = out_path
@@ -254,6 +255,11 @@ which it expects to find at self.re_TailSplitHands -- see for e.g. Everleaf.py.
         self.readFile()
         self.obs = self.obs.strip()
         self.obs = self.obs.replace('\r\n', '\n')
+        if self.starsArchive == True:
+            log.debug("Converting starsArchive format to readable")
+            m = re.compile('^Hand #\d+', re.MULTILINE)
+            self.obs = m.sub('', self.obs)
+
         if self.obs is None or self.obs == "":
             log.info("Read no hands.")
             return []
diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index 7b3dd4f1..8921d9d8 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -91,6 +91,7 @@ class Importer:
         self.settings.setdefault("writeQMaxWait", 10)          # not used
         self.settings.setdefault("dropIndexes", "don't drop")
         self.settings.setdefault("dropHudCache", "don't drop")
+        self.settings.setdefault("starsArchive", False)
 
         self.writeq = None
         self.database = Database.Database(self.config, sql = self.sql)
@@ -134,6 +135,9 @@ class Importer:
     def setDropHudCache(self, value):
         self.settings['dropHudCache'] = value
 
+    def setStarsArchive(self, value):
+        self.settings['starsArchive'] = value
+
 #   def setWatchTime(self):
 #       self.updated = time()
 
@@ -425,7 +429,7 @@ class Importer:
         mod = __import__(filter)
         obj = getattr(mod, filter_name, None)
         if callable(obj):
-            hhc = obj(in_path = file, out_path = out_path, index = 0) # Index into file 0 until changeover
+            hhc = obj(in_path = file, out_path = out_path, index = 0, starsArchive = self.settings['starsArchive']) # Index into file 0 until changeover
             if hhc.getStatus() and self.NEWIMPORT == False:
                 (stored, duplicates, partial, errors, ttime) = self.import_fpdb_file(db, out_path, site, q)
             elif hhc.getStatus() and self.NEWIMPORT == True:
@@ -435,11 +439,14 @@ class Importer:
                 to_hud = []
 
                 for hand in handlist:
-                    #try, except duplicates here?
-                    hand.prepInsert(self.database)
-                    hand.insert(self.database)
-                    if self.callHud and hand.dbid_hands != 0:
-                        to_hud.append(hand.dbid_hands)
+                    if hand is not None:
+                        #try, except duplicates here?
+                        hand.prepInsert(self.database)
+                        hand.insert(self.database)
+                        if self.callHud and hand.dbid_hands != 0:
+                            to_hud.append(hand.dbid_hands)
+                    else:
+                        log.error("Hand processed but empty")
                 self.database.commit()
 
                 #pipe the Hands.id out to the HUD

From 1093b1e43c3a12af748e0768cd71513e70d6d060 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Fri, 18 Dec 2009 10:27:09 +0800
Subject: [PATCH 015/320] Remove dead code

---
 pyfpdb/fpdb_import.py | 160 +-----------------------------------------
 1 file changed, 1 insertion(+), 159 deletions(-)

diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index 8921d9d8..21aa5d5c 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -430,9 +430,7 @@ class Importer:
         obj = getattr(mod, filter_name, None)
         if callable(obj):
             hhc = obj(in_path = file, out_path = out_path, index = 0, starsArchive = self.settings['starsArchive']) # Index into file 0 until changeover
-            if hhc.getStatus() and self.NEWIMPORT == False:
-                (stored, duplicates, partial, errors, ttime) = self.import_fpdb_file(db, out_path, site, q)
-            elif hhc.getStatus() and self.NEWIMPORT == True:
+            if hhc.getStatus() and self.NEWIMPORT == True:
                 #This code doesn't do anything yet
                 handlist = hhc.getProcessedHands()
                 self.pos_in_file[file] = hhc.getLastCharacterRead()
@@ -468,162 +466,6 @@ class Importer:
         return (stored, duplicates, partial, errors, ttime)
 
 
-    def import_fpdb_file(self, db, file, site, q):
-        starttime = time()
-        last_read_hand = 0
-        loc = 0
-        (stored, duplicates, partial, errors, ttime) = (0, 0, 0, 0, 0)
-        # print "file =", file
-        if file == "stdin":
-            inputFile = sys.stdin
-        else:
-            if os.path.exists(file):
-                inputFile = open(file, "rU")
-            else:
-                self.removeFromFileList[file] = True
-                return (0, 0, 0, 1, 0)
-            try:
-                loc = self.pos_in_file[file]
-                #size = os.path.getsize(file)
-                #print "loc =", loc, 'size =', size
-            except KeyError:
-                pass
-        # Read input file into class and close file
-        inputFile.seek(loc)
-        #tmplines = inputFile.readlines()
-        #if tmplines == None or tmplines == []:
-        #    print "tmplines = ", tmplines
-        #else:
-        #    print "tmplines[0] =", tmplines[0]
-        self.lines = fpdb_simple.removeTrailingEOL(inputFile.readlines())
-        self.pos_in_file[file] = inputFile.tell()
-        inputFile.close()
-
-        x = clock()
-        (stored, duplicates, partial, errors, ttime, handsId) = self.import_fpdb_lines(db, self.lines, starttime, file, site, q)
-
-        db.commit()
-        y = clock()
-        ttime = y - x
-        #ttime = time() - starttime
-        if q is None:
-            log.info("Total stored: %(stored)d\tduplicates:%(duplicates)d\terrors:%(errors)d\ttime:%(ttime)s" % locals())
-
-        if not stored:
-            if duplicates:
-                for line_no in xrange(len(self.lines)):
-                    if self.lines[line_no].find("Game #") != -1:
-                        final_game_line = self.lines[line_no]
-                handsId=fpdb_simple.parseSiteHandNo(final_game_line)
-            else:
-                print "failed to read a single hand from file:", inputFile
-                handsId = 0
-            #todo: this will cause return of an unstored hand number if the last hand was error
-        self.handsId = handsId
-
-        return (stored, duplicates, partial, errors, ttime)
-    # end def import_fpdb_file
-
-
-    def import_fpdb_lines(self, db, lines, starttime, file, site, q = None):
-        """Import an fpdb hand history held in the list lines, could be one hand or many"""
-
-        #db.lock_for_insert() # should be ok when using one thread, but doesn't help??
-        while gtk.events_pending():
-            gtk.main_iteration(False)
-
-        try: # sometimes we seem to be getting an empty self.lines, in which case, we just want to return.
-            firstline = lines[0]
-        except:
-            # just skip the debug message and return silently:
-            #print "DEBUG: import_fpdb_file: failed on lines[0]: '%s' '%s' '%s' '%s' " %( file, site, lines, loc)
-            return (0,0,0,1,0,0)
-
-        if "Tournament Summary" in firstline:
-            print "TODO: implement importing tournament summaries"
-            #self.faobs = readfile(inputFile)
-            #self.parseTourneyHistory()
-            return (0,0,0,1,0,0)
-
-        category = fpdb_simple.recogniseCategory(firstline)
-
-        startpos = 0
-        stored = 0 #counter
-        duplicates = 0 #counter
-        partial = 0 #counter
-        errors = 0 #counter
-        ttime = 0
-        handsId = 0
-
-        for i in xrange(len(lines)):
-            if len(lines[i]) < 2: #Wierd way to detect for '\r\n' or '\n'
-                endpos = i
-                hand = lines[startpos:endpos]
-
-                if len(hand[0]) < 2:
-                    hand=hand[1:]
-
-                if len(hand) < 3:
-                    pass
-                    #TODO: This is ugly - we didn't actually find the start of the
-                    # hand with the outer loop so we test again...
-                else:
-                    isTourney = fpdb_simple.isTourney(hand[0])
-                    if not isTourney:
-                        hand = fpdb_simple.filterAnteBlindFold(hand)
-                    self.hand = hand
-
-                    try:
-                        handsId = fpdb_parse_logic.mainParser( self.settings, self.siteIds[site]
-                                                             , category, hand, self.config
-                                                             , db, q )
-                        db.commit()
-
-                        stored += 1
-                        if self.callHud:
-                            #print "call to HUD here. handsId:",handsId
-                            #pipe the Hands.id out to the HUD
-                            # print "fpdb_import: sending hand to hud", handsId, "pipe =", self.caller.pipe_to_hud
-                            try:
-                                self.caller.pipe_to_hud.stdin.write("%s" % (handsId) + os.linesep)
-                            except IOError: # hud closed
-                                self.callHud = False
-                                pass # continue import without hud
-                    except Exceptions.DuplicateError:
-                        duplicates += 1
-                        db.rollback()
-                    except (ValueError), fe:
-                        errors += 1
-                        self.printEmailErrorMessage(errors, file, hand)
-
-                        if (self.settings['failOnError']):
-                            db.commit() #dont remove this, in case hand processing was cancelled.
-                            raise
-                        else:
-                            db.rollback()
-                    except (fpdb_simple.FpdbError), fe:
-                        errors += 1
-                        self.printEmailErrorMessage(errors, file, hand)
-                        db.rollback()
-
-                        if self.settings['failOnError']:
-                            db.commit() #dont remove this, in case hand processing was cancelled.
-                            raise
-
-                    if self.settings['minPrint']:
-                        if not ((stored+duplicates+errors) % self.settings['minPrint']):
-                            print "stored:", stored, "   duplicates:", duplicates, "errors:", errors
-
-                    if self.settings['handCount']:
-                        if ((stored+duplicates+errors) >= self.settings['handCount']):
-                            if not self.settings['quiet']:
-                                print "quitting due to reaching the amount of hands to be imported"
-                                print "Total stored:", stored, "duplicates:", duplicates, "errors:", errors, " time:", (time() - starttime)
-                            sys.exit(0)
-                startpos = endpos
-        return (stored, duplicates, partial, errors, ttime, handsId)
-    # end def import_fpdb_lines
-
     def printEmailErrorMessage(self, errors, filename, line):
         traceback.print_exc(file=sys.stderr)
         print "Error No.",errors,", please send the hand causing this to steffen@sycamoretest.info so I can fix it."

From 975eb360ef96d3f669269117c9fe78f151662379 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Fri, 18 Dec 2009 10:27:43 +0800
Subject: [PATCH 016/320] [NEWIMPORT] Add stubbed variable to insert

---
 pyfpdb/Database.py | 3 ++-
 pyfpdb/SQL.py      | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index 9d1f3f85..72b41336 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -1651,7 +1651,8 @@ class Database:
                              pdata[p]['street2CheckCallRaiseDone'],
                              pdata[p]['street3CheckCallRaiseChance'],
                              pdata[p]['street3CheckCallRaiseDone'],
-                             pdata[p]['street4CheckCallRaiseChance']
+                             pdata[p]['street4CheckCallRaiseChance'],
+                             pdata[p]['street4CheckCallRaiseDone']
                             ) )
 
         q = self.sql.query['store_hands_players']
diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py
index c0319dfe..56c1f388 100644
--- a/pyfpdb/SQL.py
+++ b/pyfpdb/SQL.py
@@ -3404,10 +3404,11 @@ class Sql:
                 street2CheckCallRaiseDone,
                 street3CheckCallRaiseChance,
                 street3CheckCallRaiseDone,
-                street4CheckCallRaiseChance
+                street4CheckCallRaiseChance,
+                street4CheckCallRaiseDone
                )
                VALUES (
-                    %s, %s, %s, %s,
+                    %s, %s, %s, %s, %s,
                     %s, %s, %s, %s, %s,
                     %s, %s, %s, %s, %s,
                     %s, %s, %s, %s, %s,

From 2b7d34c4842e40b9d8fdb950eefd23c99068e95d Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Fri, 18 Dec 2009 13:32:09 +0800
Subject: [PATCH 017/320] [NEWIMPORT] Fix syntax to be 2.5 compatible.

Python 2.6 enumerate() function contains a useful 'start' paramater,
apparently this did not exist in 2.5.

Patch frim Mika Bostrom
---
 pyfpdb/DerivedStats.py | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py
index 1a34db1e..5943a10f 100644
--- a/pyfpdb/DerivedStats.py
+++ b/pyfpdb/DerivedStats.py
@@ -168,8 +168,10 @@ class DerivedStats():
         for player in hand.players:
             hcs = hand.join_holecards(player[1], asList=True)
             hcs = hcs + [u'0x', u'0x', u'0x', u'0x', u'0x']
-            for i, card in enumerate(hcs[:7], 1):
-                self.handsplayers[player[1]]['card%s' % i] = Card.encodeCard(card)
+            #for i, card in enumerate(hcs[:7], 1): #Python 2.6 syntax
+            #    self.handsplayers[player[1]]['card%s' % i] = Card.encodeCard(card)
+            for i, card in enumerate(hcs[:7]):
+                self.handsplayers[player[1]]['card%s' % (i+1)] = Card.encodeCard(card)
 
 
         # position,
@@ -266,13 +268,17 @@ class DerivedStats():
         #   Then no bets before the player with initiatives first action on current street
         # ie. if player on street-1 had initiative
         #                and no donkbets occurred
-        for i, street in enumerate(hand.actionStreets[2:], start=1):
-            name = self.lastBetOrRaiser(hand.actionStreets[i])
+
+        # XXX: enumerate(list, start=x) is python 2.6 syntax; 'start'
+        # came there
+        #for i, street in enumerate(hand.actionStreets[2:], start=1):
+        for i, street in enumerate(hand.actionStreets[2:]:
+            name = self.lastBetOrRaiser(hand.actionStreets[i+1])
             if name:
-                chance = self.noBetsBefore(hand.actionStreets[i+1], name)
-                self.handsplayers[name]['street%dCBChance' %i] = True
+                chance = self.noBetsBefore(hand.actionStreets[i+2], name)
+                self.handsplayers[name]['street%dCBChance' % (i+1)] = True
                 if chance == True:
-                    self.handsplayers[name]['street%dCBDone' %i] = self.betStreet(hand.actionStreets[i+1], name)
+                    self.handsplayers[name]['street%dCBDone' % (i+1)] = self.betStreet(hand.actionStreets[i+2], name)
 
     def seen(self, hand, i):
         pas = set()

From babf0a039aa3332547e50b1f9e61f223ff9f6237 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Mon, 21 Dec 2009 09:21:41 +0800
Subject: [PATCH 018/320] PartyPoker - No Disconnect fix

Fix from Neko on 2+2

http://forumserver.twoplustwo.com/showpost.php?p=15495528&postcount=2374

"Finally got around to checking this out. Seems great so far. I had issues with some of my party hands that were on No Disconnect protect tables but adding the No DP regex in the PartyToFpdb hand converter seems to have fixed it for me."
---
 pyfpdb/PartyPokerToFpdb.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyfpdb/PartyPokerToFpdb.py b/pyfpdb/PartyPokerToFpdb.py
index 4ed0c965..4cf64547 100755
--- a/pyfpdb/PartyPokerToFpdb.py
+++ b/pyfpdb/PartyPokerToFpdb.py
@@ -89,6 +89,7 @@ class PartyPoker(HandHistoryConverter):
             (?P<TTYPE>[a-zA-Z0-9 ]+)\s+
             (?: \#|\(|)(?P<TABLE>\d+)\)?\s+
             (?:[^ ]+\s+\#(?P<MTTTABLE>\d+).+)? # table number for mtt
+            (\(No\sDP\)\s)?
             \((?P<PLAY>Real|Play)\s+Money\)\s+ # FIXME: check if play money is correct
             Seat\s+(?P<BUTTON>\d+)\sis\sthe\sbutton
             """,

From b71e4852525e8dc637679464555bbbf61af28d43 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Mon, 21 Dec 2009 16:10:44 +0800
Subject: [PATCH 019/320] PokerStarsToFpdb - Add comment on parsing tourney
 buy-in

---
 pyfpdb/PokerStarsToFpdb.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
index b3463da9..5e2f9c21 100755
--- a/pyfpdb/PokerStarsToFpdb.py
+++ b/pyfpdb/PokerStarsToFpdb.py
@@ -203,6 +203,8 @@ class PokerStars(HandHistoryConverter):
             if key == 'TOURNO':
                 hand.tourNo = info[key]
             if key == 'BUYIN':
+                #FIXME: The key looks like: '€0.82+€0.18 EUR'
+                #       This should be parsed properly and used
                 hand.buyin = info[key]
             if key == 'LEVEL':
                 hand.level = info[key]

From 02453ce3c09096b50405265b433e29702b0859ec Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Tue, 22 Dec 2009 13:47:33 +0800
Subject: [PATCH 020/320] Move locale variable to Configuration

---
 pyfpdb/fpdb_import.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index 21aa5d5c..577562b8 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -409,7 +409,7 @@ class Importer:
         conv = None
         (stored, duplicates, partial, errors, ttime) = (0, 0, 0, 0, 0)
 
-        file =  file.decode(fpdb_simple.LOCALE_ENCODING)
+        file =  file.decode(Configuration.LOCALE_ENCODING)
 
         # Load filter, process file, pass returned filename to import_fpdb_file
         if self.settings['threads'] > 0 and self.writeq is not None:

From 262eb5200d85cdc13691a09dab0885a8df11922d Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Tue, 22 Dec 2009 13:49:22 +0800
Subject: [PATCH 021/320] Add LOCALE static to Configuration

---
 pyfpdb/Configuration.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py
index bf8689a6..174d0673 100755
--- a/pyfpdb/Configuration.py
+++ b/pyfpdb/Configuration.py
@@ -31,6 +31,7 @@ import inspect
 import string
 import traceback
 import shutil
+import locale
 import xml.dom.minidom
 from xml.dom.minidom import Node
 
@@ -126,6 +127,7 @@ DATABASE_TYPES = (
         )
 
 NEWIMPORT = True
+LOCALE_ENCODING = locale.getdefaultlocale()[1]
 
 ########################################################################
 def string_to_bool(string, default=True):

From 1b82f20411f02dfcaf3cc57aceebca514ecb5c45 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Tue, 22 Dec 2009 14:44:35 +0800
Subject: [PATCH 022/320] [NEWIMPORT] Remove legacy code.

---
 pyfpdb/CliFpdb.py          |   66 --
 pyfpdb/Database.py         |  350 --------
 pyfpdb/GuiBulkImport.py    |    1 -
 pyfpdb/GuiTableViewer.py   |    1 -
 pyfpdb/fpdb_db.py          |    1 -
 pyfpdb/fpdb_import.py      |    2 -
 pyfpdb/fpdb_parse_logic.py |  235 -----
 pyfpdb/fpdb_simple.py      | 1728 ------------------------------------
 8 files changed, 2384 deletions(-)
 delete mode 100755 pyfpdb/CliFpdb.py
 delete mode 100644 pyfpdb/fpdb_parse_logic.py
 delete mode 100644 pyfpdb/fpdb_simple.py

diff --git a/pyfpdb/CliFpdb.py b/pyfpdb/CliFpdb.py
deleted file mode 100755
index abdddb45..00000000
--- a/pyfpdb/CliFpdb.py
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/python
-
-#Copyright 2008 Steffen Jobbagy-Felso
-#This program is free software: you can redistribute it and/or modify
-#it under the terms of the GNU Affero General Public License as published by
-#the Free Software Foundation, version 3 of the License.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU Affero General Public License
-#along with this program. If not, see <http://www.gnu.org/licenses/>.
-#In the "official" distribution you can find the license in
-#agpl-3.0.txt in the docs folder of the package.
-
-import os
-import sys
-import fpdb_simple
-from optparse import OptionParser
-
-try:
-	import MySQLdb
-except:
-	diaSQLLibMissing = gtk.Dialog(title="Fatal Error - SQL interface library missing", parent=None, flags=0, buttons=(gtk.STOCK_QUIT,gtk.RESPONSE_OK))
-
-	print "Please note that the CLI importer only works with MySQL, if you use PostgreSQL this error is expected."
-
-import fpdb_import
-import fpdb_db
-
-if __name__ == "__main__":
-	#process CLI parameters
-	parser = OptionParser()
-	parser.add_option("-c", "--handCount", default="0", type="int",
-					help="Number of hands to import (default 0 means unlimited)")
-	parser.add_option("-d", "--database", default="fpdb", help="The MySQL database to use (default fpdb)")
-	parser.add_option("-e", "--errorFile", default="failed.txt",
-					help="File to store failed hands into. (default: failed.txt) Not implemented.")
-	parser.add_option("-f", "--inputFile", "--file", "--inputfile", default="stdin",
-					help="The file you want to import (remember to use quotes if necessary)")
-	parser.add_option("-m", "--minPrint", "--status", default="50", type="int",
-					help="How often to print a one-line status report (0 means never, default is 50)")
-	parser.add_option("-p", "--password", help="The password for the MySQL user")
-	parser.add_option("-q", "--quiet", action="store_true",
-					help="If this is passed it doesn't print a total at the end nor the opening line. Note that this purposely does NOT change --minPrint")
-	parser.add_option("-s", "--server", default="localhost",
-					help="Hostname/IP of the MySQL server (default localhost)")
-	parser.add_option("-u", "--user", default="fpdb", help="The MySQL username (default fpdb)")
-	parser.add_option("-x", "--failOnError", action="store_true",
-					help="If this option is passed it quits when it encounters any error")
-
-	(options, argv) = parser.parse_args()
-
-	settings={'callFpdbHud':False, 'db-backend':2}
-	settings['db-host']=options.server
-	settings['db-user']=options.user
-	settings['db-password']=options.password
-	settings['db-databaseName']=options.database
-	settings['handCount']=options.handCount
-	settings['failOnError']=options.failOnError
-
-	importer = fpdb_import.Importer(options, settings)
-	importer.addImportFile(options.inputFile)
-	importer.runImport()
diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index 72b41336..412036ab 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -43,7 +43,6 @@ import Queue
 
 #    FreePokerTools modules
 import fpdb_db
-import fpdb_simple
 import Configuration
 import SQL
 import Card
@@ -724,120 +723,6 @@ class Database:
         return ret
 
 
-    #stores a stud/razz hand into the database
-    def ring_stud(self, config, settings, base, category, site_hand_no, gametype_id, hand_start_time
-                 ,names, player_ids, start_cashes, antes, card_values, card_suits, winnings, rakes
-                 ,action_types, allIns, action_amounts, actionNos, hudImportData, maxSeats, tableName
-                 ,seatNos):
-
-        fpdb_simple.fillCardArrays(len(names), base, category, card_values, card_suits)
-
-        hands_id = self.storeHands(self.backend, site_hand_no, gametype_id
-                                  ,hand_start_time, names, tableName, maxSeats, hudImportData
-                                  ,(None, None, None, None, None), (None, None, None, None, None))
-
-        #print "before calling store_hands_players_stud, antes:", antes
-        hands_players_ids = self.store_hands_players_stud(self.backend, hands_id, player_ids
-                                                         ,start_cashes, antes, card_values
-                                                         ,card_suits, winnings, rakes, seatNos)
-
-        if 'dropHudCache' not in settings or settings['dropHudCache'] != 'drop':
-            self.storeHudCache(self.backend, base, category, gametype_id, hand_start_time, player_ids, hudImportData)
-
-        return hands_id
-    #end def ring_stud
-
-    def ring_holdem_omaha(self, config, settings, base, category, site_hand_no, gametype_id
-                         ,hand_start_time, names, player_ids, start_cashes, positions, card_values
-                         ,card_suits, board_values, board_suits, winnings, rakes, action_types, allIns
-                         ,action_amounts, actionNos, hudImportData, maxSeats, tableName, seatNos):
-        """stores a holdem/omaha hand into the database"""
-
-        t0 = time()
-        #print "in ring_holdem_omaha"
-        fpdb_simple.fillCardArrays(len(names), base, category, card_values, card_suits)
-        t1 = time()
-        fpdb_simple.fill_board_cards(board_values, board_suits)
-        t2 = time()
-
-        hands_id = self.storeHands(self.backend, site_hand_no, gametype_id
-                                  ,hand_start_time, names, tableName, maxSeats
-                                  ,hudImportData, board_values, board_suits)
-        #TEMPORARY CALL! - Just until all functions are migrated
-        t3 = time()
-        hands_players_ids = self.store_hands_players_holdem_omaha(
-                                   self.backend, category, hands_id, player_ids, start_cashes
-                                 , positions, card_values, card_suits, winnings, rakes, seatNos, hudImportData)
-        t4 = time()
-        if 'dropHudCache' not in settings or settings['dropHudCache'] != 'drop':
-            self.storeHudCache(self.backend, base, category, gametype_id, hand_start_time, player_ids, hudImportData)
-        t5 = time()
-        #print "fills=(%4.3f) saves=(%4.3f,%4.3f,%4.3f)" % (t2-t0, t3-t2, t4-t3, t5-t4)
-        return hands_id
-    #end def ring_holdem_omaha
-
-    def tourney_holdem_omaha(self, config, settings, base, category, siteTourneyNo, buyin, fee, knockout
-                            ,entries, prizepool, tourney_start, payin_amounts, ranks, tourneyTypeId
-                            ,siteId #end of tourney specific params
-                            ,site_hand_no, gametype_id, hand_start_time, names, player_ids
-                            ,start_cashes, positions, card_values, card_suits, board_values
-                            ,board_suits, winnings, rakes, action_types, allIns, action_amounts
-                            ,actionNos, hudImportData, maxSeats, tableName, seatNos):
-        """stores a tourney holdem/omaha hand into the database"""
-
-        fpdb_simple.fillCardArrays(len(names), base, category, card_values, card_suits)
-        fpdb_simple.fill_board_cards(board_values, board_suits)
-
-        tourney_id = self.store_tourneys(tourneyTypeId, siteTourneyNo, entries, prizepool, tourney_start)
-        tourneys_players_ids = self.store_tourneys_players(tourney_id, player_ids, payin_amounts, ranks, winnings)
-
-        hands_id = self.storeHands(self.backend, site_hand_no, gametype_id
-                                  ,hand_start_time, names, tableName, maxSeats
-                                  ,hudImportData, board_values, board_suits)
-
-        hands_players_ids = self.store_hands_players_holdem_omaha_tourney(
-                          self.backend, category, hands_id, player_ids, start_cashes, positions
-                        , card_values, card_suits, winnings, rakes, seatNos, tourneys_players_ids
-                        , hudImportData, tourneyTypeId)
-
-        #print "tourney holdem, backend=%d" % backend
-        if 'dropHudCache' not in settings or settings['dropHudCache'] != 'drop':
-            self.storeHudCache(self.backend, base, category, gametype_id, hand_start_time, player_ids, hudImportData)
-
-        return hands_id
-    #end def tourney_holdem_omaha
-
-    def tourney_stud(self, config, settings, base, category, siteTourneyNo, buyin, fee, knockout, entries
-                    ,prizepool, tourneyStartTime, payin_amounts, ranks, tourneyTypeId, siteId
-                    ,siteHandNo, gametypeId, handStartTime, names, playerIds, startCashes, antes
-                    ,cardValues, cardSuits, winnings, rakes, actionTypes, allIns, actionAmounts
-                    ,actionNos, hudImportData, maxSeats, tableName, seatNos):
-        #stores a tourney stud/razz hand into the database
-
-        fpdb_simple.fillCardArrays(len(names), base, category, cardValues, cardSuits)
-
-        tourney_id = self.store_tourneys(tourneyTypeId, siteTourneyNo, entries, prizepool, tourneyStartTime)
-
-        tourneys_players_ids = self.store_tourneys_players(tourney_id, playerIds, payin_amounts, ranks, winnings)
-
-        hands_id = self.storeHands( self.backend, siteHandNo, gametypeId
-                                  , handStartTime, names, tableName, maxSeats
-                                  , hudImportData, (None, None, None, None, None), (None, None, None, None, None) )
-        # changed board_values and board_suits to arrays of None, just like the
-        # cash game version of this function does - i don't believe this to be
-        # the correct thing to do (tell me if i'm wrong) but it should keep the
-        # importer from crashing
-
-        hands_players_ids = self.store_hands_players_stud_tourney(self.backend, hands_id
-                                                 , playerIds, startCashes, antes, cardValues, cardSuits
-                                                 , winnings, rakes, seatNos, tourneys_players_ids, tourneyTypeId)
-
-        if 'dropHudCache' not in settings or settings['dropHudCache'] != 'drop':
-            self.storeHudCache(self.backend, base, category, gametypeId, handStartTime, playerIds, hudImportData)
-
-        return hands_id
-    #end def tourney_stud
-
     def prepareBulkImport(self):
         """Drop some indexes/foreign keys to prepare for bulk import. 
            Currently keeping the standalone indexes as needed to import quickly"""
@@ -1465,64 +1350,6 @@ class Database:
             print "Error during fdb.lock_for_insert:", str(sys.exc_value)
     #end def lock_for_insert
 
-    def store_the_hand(self, h):
-        """Take a HandToWrite object and store it in the db"""
-
-        # Following code writes hands to database and commits (or rolls back if there is an error)
-        try:
-            result = None
-            if h.isTourney:
-                ranks = map(lambda x: 0, h.names) # create an array of 0's equal to the length of names
-                payin_amounts = fpdb_simple.calcPayin(len(h.names), h.buyin, h.fee)
-                
-                if h.base == "hold":
-                    result = self.tourney_holdem_omaha(
-                                               h.config, h.settings, h.base, h.category, h.siteTourneyNo, h.buyin
-                                             , h.fee, h.knockout, h.entries, h.prizepool, h.tourneyStartTime
-                                             , payin_amounts, ranks, h.tourneyTypeId, h.siteID, h.siteHandNo
-                                             , h.gametypeID, h.handStartTime, h.names, h.playerIDs, h.startCashes
-                                             , h.positions, h.cardValues, h.cardSuits, h.boardValues, h.boardSuits
-                                             , h.winnings, h.rakes, h.actionTypes, h.allIns, h.actionAmounts
-                                             , h.actionNos, h.hudImportData, h.maxSeats, h.tableName, h.seatNos)
-                elif h.base == "stud":
-                    result = self.tourney_stud(
-                                               h.config, h.settings, h.base, h.category, h.siteTourneyNo
-                                             , h.buyin, h.fee, h.knockout, h.entries, h.prizepool, h.tourneyStartTime
-                                             , payin_amounts, ranks, h.tourneyTypeId, h.siteID, h.siteHandNo
-                                             , h.gametypeID, h.handStartTime, h.names, h.playerIDs, h.startCashes
-                                             , h.antes, h.cardValues, h.cardSuits, h.winnings, h.rakes, h.actionTypes
-                                             , h.allIns, h.actionAmounts, h.actionNos, h.hudImportData, h.maxSeats
-                                             , h.tableName, h.seatNos)
-                else:
-                    raise FpdbError("unrecognised category")
-            else:
-                if h.base == "hold":
-                    result = self.ring_holdem_omaha(
-                                               h.config, h.settings, h.base, h.category, h.siteHandNo
-                                             , h.gametypeID, h.handStartTime, h.names, h.playerIDs
-                                             , h.startCashes, h.positions, h.cardValues, h.cardSuits
-                                             , h.boardValues, h.boardSuits, h.winnings, h.rakes
-                                             , h.actionTypes, h.allIns, h.actionAmounts, h.actionNos
-                                             , h.hudImportData, h.maxSeats, h.tableName, h.seatNos)
-                elif h.base == "stud":
-                    result = self.ring_stud(
-                                               h.config, h.settings, h.base, h.category, h.siteHandNo, h.gametypeID
-                                             , h.handStartTime, h.names, h.playerIDs, h.startCashes, h.antes
-                                             , h.cardValues, h.cardSuits, h.winnings, h.rakes, h.actionTypes, h.allIns
-                                             , h.actionAmounts, h.actionNos, h.hudImportData, h.maxSeats, h.tableName
-                                             , h.seatNos)
-                else:
-                    raise FpdbError("unrecognised category")
-        except:
-            print "Error storing hand: " + str(sys.exc_value)
-            self.rollback()
-            # re-raise the exception so that the calling routine can decide what to do:
-            # (e.g. a write thread might try again)
-            raise
-
-        return result
-    #end def store_the_hand
-
 ###########################
 # NEWIMPORT CODE
 ###########################
@@ -2583,183 +2410,6 @@ class Database:
     #end def tRecogniseTourneyType
 
         
-    def tRecognizeTourney(self, tourney, dbTourneyTypeId):
-        logging.debug("Database.tRecognizeTourney")
-        tourneyID = 1
-        # Check if tourney exists in db (based on tourney.siteId and tourney.tourNo)
-        # If so retrieve all data to check for consistency
-        cursor = self.get_cursor()
-        cursor.execute (self.sql.query['getTourney'].replace('%s', self.sql.query['placeholder']),
-                        (tourney.tourNo, tourney.siteId)
-                        )
-        result=cursor.fetchone()
-
-        expectedValuesDecimal = { 2  : "entries", 3 : "prizepool", 6  : "buyInChips", 9  : "rebuyChips", 
-                                  10 : "addOnChips", 11 : "rebuyAmount", 12 : "addOnAmount", 13 : "totalRebuys", 
-                                  14 : "totalAddOns", 15 : "koBounty" }
-        expectedValues = { 7 : "tourneyName", 16 : "tourneyComment"  }
-
-        tourneyDataMatch = True
-        tCommentTs = None
-        starttime = None
-        endtime = None
-
-        try:
-            len(result)
-            tourneyID = result[0]
-            logging.debug("Tourney found in db with TourneyID = %d" % tourneyID)
-            if result[1] <> dbTourneyTypeId:
-                tourneyDataMatch = False
-                logging.debug("Tourney has wrong type ID (expected : %s - found : %s)" % (dbTourneyTypeId, result[1]))
-            if (tourney.starttime is None and result[4] is not None) or ( tourney.starttime is not None and fpdb_simple.parseHandStartTime("- %s" % tourney.starttime) <> result[4]) :
-                tourneyDataMatch = False
-                logging.debug("Tourney data mismatch : wrong starttime : Tourney=%s / db=%s" % (tourney.starttime, result[4]))
-            if (tourney.endtime is None and result[5] is not None) or ( tourney.endtime is not None and fpdb_simple.parseHandStartTime("- %s" % tourney.endtime) <> result[5]) :
-                tourneyDataMatch = False
-                logging.debug("Tourney data mismatch : wrong endtime : Tourney=%s / db=%s" % (tourney.endtime, result[5]))
-
-            for ev in expectedValues :
-                if ( getattr( tourney, expectedValues.get(ev) ) <> result[ev] ):
-                    logging.debug("Tourney data mismatch : wrong %s : Tourney=%s / db=%s" % (expectedValues.get(ev), getattr( tourney, expectedValues.get(ev)), result[ev]) )
-                    tourneyDataMatch = False
-                    #break
-            for evD in expectedValuesDecimal :
-                if ( Decimal(getattr( tourney, expectedValuesDecimal.get(evD)) ) <> result[evD] ):
-                    logging.debug("Tourney data mismatch : wrong %s : Tourney=%s / db=%s" % (expectedValuesDecimal.get(evD), getattr( tourney, expectedValuesDecimal.get(evD)), result[evD]) )
-                    tourneyDataMatch = False
-                    #break
-
-            # TO DO : Deal with matrix summary mutliple parsings
-            
-        except:
-            # Tourney not found : create
-            logging.debug("Tourney is not found : create")
-            if tourney.tourneyComment is not None :
-                tCommentTs = datetime.today()
-            if tourney.starttime is not None :
-                starttime = fpdb_simple.parseHandStartTime("- %s" % tourney.starttime)
-            if tourney.endtime is not None :
-                endtime = fpdb_simple.parseHandStartTime("- %s" % tourney.endtime)
-            # TODO : deal with matrix Id processed
-            cursor.execute (self.sql.query['insertTourney'].replace('%s', self.sql.query['placeholder']),
-                                (dbTourneyTypeId, tourney.tourNo, tourney.entries, tourney.prizepool, starttime,
-                                 endtime, tourney.buyInChips, tourney.tourneyName, 0, tourney.rebuyChips, tourney.addOnChips,
-                                 tourney.rebuyAmount, tourney.addOnAmount, tourney.totalRebuys, tourney.totalAddOns, tourney.koBounty,
-                                 tourney.tourneyComment, tCommentTs)
-                                )
-            tourneyID = self.get_last_insert_id(cursor)
-
-
-        # Deal with inconsistent tourney in db
-        if tourneyDataMatch == False :
-            # Update Tourney
-            if result[16] <> tourney.tourneyComment :
-                tCommentTs = datetime.today()
-            if tourney.starttime is not None :
-                starttime = fpdb_simple.parseHandStartTime("- %s" % tourney.starttime)
-            if tourney.endtime is not None :
-                endtime = fpdb_simple.parseHandStartTime("- %s" % tourney.endtime)
-
-            cursor.execute (self.sql.query['updateTourney'].replace('%s', self.sql.query['placeholder']),
-                                (dbTourneyTypeId, tourney.entries, tourney.prizepool, starttime,
-                                 endtime, tourney.buyInChips, tourney.tourneyName, 0, tourney.rebuyChips, tourney.addOnChips,
-                                 tourney.rebuyAmount, tourney.addOnAmount, tourney.totalRebuys, tourney.totalAddOns, tourney.koBounty,
-                                 tourney.tourneyComment, tCommentTs, tourneyID)
-                            )
-
-        return tourneyID
-    #end def tRecognizeTourney
-    
-    def tStoreTourneyPlayers(self, tourney, dbTourneyId):
-        logging.debug("Database.tStoreTourneyPlayers")
-        # First, get playerids for the players and specifically the one for hero : 
-        playersIds = self.recognisePlayerIDs(tourney.players, tourney.siteId)
-        # hero may be None for matrix tourneys summaries
-#        hero = [ tourney.hero ]
-#        heroId = self.recognisePlayerIDs(hero , tourney.siteId)
-#        logging.debug("hero Id = %s - playersId = %s" % (heroId , playersIds))
-
-        tourneyPlayersIds=[]
-        try:
-            cursor = self.get_cursor()
-    
-            for i in xrange(len(playersIds)):
-                cursor.execute(self.sql.query['getTourneysPlayers'].replace('%s', self.sql.query['placeholder'])
-                              ,(dbTourneyId, playersIds[i]))
-                result=cursor.fetchone()
-                #print "tried SELECTing tourneys_players.id:",tmp
-                
-                try:
-                    len(result)
-                    # checking data
-                    logging.debug("TourneysPlayers found : checking data")
-                    expectedValuesDecimal = { 1  : "payinAmounts", 2 : "finishPositions", 3  : "winnings", 4 : "countRebuys", 
-                                              5  : "countAddOns", 6 : "countKO" }
-    
-                    tourneyPlayersIds.append(result[0]);
-    
-                    tourneysPlayersDataMatch = True
-                    for evD in expectedValuesDecimal :
-                        if ( Decimal(getattr( tourney, expectedValuesDecimal.get(evD))[tourney.players[i]] ) <> result[evD] ):
-                            logging.debug("TourneysPlayers data mismatch for TourneysPlayer id=%d, name=%s : wrong %s : Tourney=%s / db=%s" % (result[0], tourney.players[i], expectedValuesDecimal.get(evD), getattr( tourney, expectedValuesDecimal.get(evD))[tourney.players[i]], result[evD]) )
-                            tourneysPlayersDataMatch = False
-                            #break
-
-                    if tourneysPlayersDataMatch == False:
-                        logging.debug("TourneysPlayers data update needed")
-                        cursor.execute (self.sql.query['updateTourneysPlayers'].replace('%s', self.sql.query['placeholder']),
-                                            (tourney.payinAmounts[tourney.players[i]], tourney.finishPositions[tourney.players[i]],
-                                             tourney.winnings[tourney.players[i]] , tourney.countRebuys[tourney.players[i]],
-                                             tourney.countAddOns[tourney.players[i]] , tourney.countKO[tourney.players[i]],
-                                             result[7], result[8], result[0])
-                                        )
-
-                except TypeError:
-                    logging.debug("TourneysPlayers not found : need insert")
-                    cursor.execute (self.sql.query['insertTourneysPlayers'].replace('%s', self.sql.query['placeholder']),
-                                        (dbTourneyId, playersIds[i],
-                                         tourney.payinAmounts[tourney.players[i]], tourney.finishPositions[tourney.players[i]],
-                                         tourney.winnings[tourney.players[i]] , tourney.countRebuys[tourney.players[i]],
-                                         tourney.countAddOns[tourney.players[i]] , tourney.countKO[tourney.players[i]],
-                                         None, None)
-                                        )
-                    tourneyPlayersIds.append(self.get_last_insert_id(cursor))
-                                        
-        except:
-            raise fpdb_simple.FpdbError( "tStoreTourneyPlayers error: " + str(sys.exc_value) )
-    
-        return tourneyPlayersIds
-    #end def tStoreTourneyPlayers
-
-    def tUpdateTourneysHandsPlayers(self, tourney, dbTourneysPlayersIds, dbTourneyTypeId):
-        logging.debug("Database.tCheckTourneysHandsPlayers")
-        try:
-            # Massive update seems to take quite some time ...
-#            query = self.sql.query['updateHandsPlayersForTTypeId2'] % (dbTourneyTypeId, self.sql.query['handsPlayersTTypeId_joiner'].join([self.sql.query['placeholder'] for id in dbTourneysPlayersIds]) )
-#            cursor = self.get_cursor()
-#            cursor.execute (query, dbTourneysPlayersIds)
-
-            query = self.sql.query['selectHandsPlayersWithWrongTTypeId'] % (dbTourneyTypeId, self.sql.query['handsPlayersTTypeId_joiner'].join([self.sql.query['placeholder'] for id in dbTourneysPlayersIds]) )
-            #print "query : %s" % query
-            cursor = self.get_cursor()
-            cursor.execute (query, dbTourneysPlayersIds)
-            result=cursor.fetchall()
-
-            if (len(result) > 0):
-                logging.debug("%d lines need update : %s" % (len(result), result) )
-                listIds = []
-                for i in result:
-                    listIds.append(i[0])
-
-                query2 = self.sql.query['updateHandsPlayersForTTypeId'] % (dbTourneyTypeId, self.sql.query['handsPlayersTTypeId_joiner_id'].join([self.sql.query['placeholder'] for id in listIds]) )
-                cursor.execute (query2, listIds)
-            else:
-                logging.debug("No need to update, HandsPlayers are correct")
-
-        except:
-            raise fpdb_simple.FpdbError( "tStoreTourneyPlayers error: " + str(sys.exc_value) )
-    #end def tUpdateTourneysHandsPlayers
-
 
 # Class used to hold all the data needed to write a hand to the db
 # mainParser() in fpdb_parse_logic.py creates one of these and then passes it to 
diff --git a/pyfpdb/GuiBulkImport.py b/pyfpdb/GuiBulkImport.py
index 16131ab2..a64a9425 100755
--- a/pyfpdb/GuiBulkImport.py
+++ b/pyfpdb/GuiBulkImport.py
@@ -30,7 +30,6 @@ import gtk
 import gobject
 
 #    fpdb/FreePokerTools modules
-import fpdb_simple
 import fpdb_import
 import Configuration
 import Exceptions
diff --git a/pyfpdb/GuiTableViewer.py b/pyfpdb/GuiTableViewer.py
index c730f962..57fc772d 100644
--- a/pyfpdb/GuiTableViewer.py
+++ b/pyfpdb/GuiTableViewer.py
@@ -20,7 +20,6 @@ import pygtk
 pygtk.require('2.0')
 import gtk
 import os
-import fpdb_simple
 
 import fpdb_import
 import fpdb_db
diff --git a/pyfpdb/fpdb_db.py b/pyfpdb/fpdb_db.py
index 2d7f2e0c..9f6993b9 100644
--- a/pyfpdb/fpdb_db.py
+++ b/pyfpdb/fpdb_db.py
@@ -38,7 +38,6 @@ except ImportError:
     logging.info("Not using numpy to define variance in sqlite.")
     use_numpy = False
 
-import fpdb_simple
 import FpdbSQLQueries
 import Configuration
 
diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index 577562b8..a7a21831 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -35,10 +35,8 @@ import gtk
 
 #    fpdb/FreePokerTools modules
 
-import fpdb_simple
 import fpdb_db
 import Database
-import fpdb_parse_logic
 import Configuration
 import Exceptions
 
diff --git a/pyfpdb/fpdb_parse_logic.py b/pyfpdb/fpdb_parse_logic.py
deleted file mode 100644
index 6fac3669..00000000
--- a/pyfpdb/fpdb_parse_logic.py
+++ /dev/null
@@ -1,235 +0,0 @@
-#!/usr/bin/python
-
-#Copyright 2008 Steffen Jobbagy-Felso
-#This program is free software: you can redistribute it and/or modify
-#it under the terms of the GNU Affero General Public License as published by
-#the Free Software Foundation, version 3 of the License.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU Affero General Public License
-#along with this program. If not, see <http://www.gnu.org/licenses/>.
-#In the "official" distribution you can find the license in
-#agpl-3.0.txt in the docs folder of the package.
-
-#parses an in-memory fpdb hand history and calls db routine to store it
-
-import sys
-from time import time, strftime
-from Exceptions import *
-
-import fpdb_simple
-import Database
-
-def mainParser(settings, siteID, category, hand, config, db = None, writeq = None):
-    """ mainParser for Holdem Hands """
-    t0 = time()
-    backend = settings['db-backend']
-    # Ideally db connection is passed in, if not use sql list if passed in,
-    # otherwise start from scratch
-    if db is None:
-        db = Database.Database(c = config, sql = None)
-    category = fpdb_simple.recogniseCategory(hand[0])
-
-    base = "hold" if (category == "holdem" or category == "omahahi" or
-                      category == "omahahilo") else "stud"
-
-    #part 0: create the empty arrays
-    # lineTypes valid values: header, name, cards, action, win, rake, ignore
-    # lineStreets valid values: predeal, preflop, flop, turn, river
-    lineTypes   = [] 
-    lineStreets = [] 
-    cardValues = []
-    cardSuits = []
-    boardValues = []
-    boardSuits = []
-    antes = []
-    allIns = []
-    actionAmounts = []
-    actionNos = []
-    actionTypes = []
-    actionTypeByNo = []
-    seatLines = []
-    winnings = []
-    rakes = []
-
-    #part 1: read hand no and check for duplicate
-    siteHandNo      = fpdb_simple.parseSiteHandNo(hand[0])
-    handStartTime   = fpdb_simple.parseHandStartTime(hand[0])    
-    isTourney       = fpdb_simple.isTourney(hand[0])
-    
-    smallBlindLine  = None
-    for i, line in enumerate(hand):
-        if 'posts small blind' in line or 'posts the small blind' in line:
-            if line[-2:] == "$0": continue
-            smallBlindLine = i
-            break
-    else:
-        smallBlindLine = 0
-        # If we did not find a small blind line, what happens?
-        # if we leave it at None, it errors two lines down.
-
-    gametypeID = fpdb_simple.recogniseGametypeID(backend, db, db.get_cursor(),
-                                                 hand[0], hand[smallBlindLine],
-                                                 siteID, category, isTourney)
-    if isTourney:
-        siteTourneyNo   = fpdb_simple.parseTourneyNo(hand[0])
-        buyin           = fpdb_simple.parseBuyin(hand[0])
-        fee             = fpdb_simple.parseFee(hand[0])
-        entries         = -1 #todo: parse this
-        prizepool       = -1 #todo: parse this
-        knockout        = False
-        tourneyStartTime= handStartTime #todo: read tourney start time
-        rebuyOrAddon    = fpdb_simple.isRebuyOrAddon(hand[0])
-
-        # The tourney site id has to be searched because it may already be in
-        # db with a TourneyTypeId which is different from the one automatically
-        # calculated (Summary import first) 
-        tourneyTypeId   = fpdb_simple.recogniseTourneyTypeId(db, siteID,
-                                                             siteTourneyNo,
-                                                             buyin, fee,
-                                                             knockout,
-                                                             rebuyOrAddon)
-    else:
-        siteTourneyNo   = -1
-        buyin           = -1
-        fee             = -1
-        entries         = -1
-        prizepool       = -1
-        knockout        = 0
-        tourneyStartTime= None
-        rebuyOrAddon    = -1
-
-        tourneyTypeId   = 1
-    fpdb_simple.isAlreadyInDB(db, gametypeID, siteHandNo)
-    
-    hand = fpdb_simple.filterCrap(hand, isTourney)
-    
-    #part 2: classify lines by type (e.g. cards, action, win, sectionchange) and street
-    fpdb_simple.classifyLines(hand, category, lineTypes, lineStreets)
-        
-    #part 3: read basic player info    
-    #3a read player names, startcashes
-    for i, line in enumerate(hand):
-        if lineTypes[i] == "name":
-            seatLines.append(line)
-
-    names       = fpdb_simple.parseNames(seatLines)
-    playerIDs   = db.recognisePlayerIDs(names, siteID)  # inserts players as needed
-    tmp         = fpdb_simple.parseCashesAndSeatNos(seatLines)
-    startCashes = tmp['startCashes']
-    seatNos     = tmp['seatNos']
-    
-    fpdb_simple.createArrays(category, len(names), cardValues, cardSuits, antes,
-                             winnings, rakes, actionTypes, allIns,
-                             actionAmounts, actionNos, actionTypeByNo)
-    
-    #3b read positions
-    if base == "hold":
-        positions = fpdb_simple.parsePositions(hand, names)
-    
-    #part 4: take appropriate action for each line based on linetype
-    for i, line in enumerate(hand):
-        if lineTypes[i] == "cards":
-            fpdb_simple.parseCardLine(category, lineStreets[i], line, names,
-                                      cardValues, cardSuits, boardValues,
-                                      boardSuits)
-            #if category=="studhilo":
-            #    print "hand[i]:", hand[i]
-            #    print "cardValues:", cardValues
-            #    print "cardSuits:", cardSuits
-        elif lineTypes[i] == "action":
-            fpdb_simple.parseActionLine(base, isTourney, line, lineStreets[i],
-                                        playerIDs, names, actionTypes, allIns,
-                                        actionAmounts, actionNos, actionTypeByNo)
-        elif lineTypes[i] == "win":
-            fpdb_simple.parseWinLine(line, names, winnings, isTourney)
-        elif lineTypes[i] == "rake":
-            totalRake = 0 if isTourney else fpdb_simple.parseRake(line)
-            fpdb_simple.splitRake(winnings, rakes, totalRake)
-        elif (lineTypes[i] == "header" or lineTypes[i] == "rake" or
-              lineTypes[i] == "name" or lineTypes[i] == "ignore"):
-            pass
-        elif lineTypes[i] == "ante":
-            fpdb_simple.parseAnteLine(line, isTourney, names, antes)
-        elif lineTypes[i] == "table":
-            tableResult=fpdb_simple.parseTableLine(base, line)
-        else:
-            raise FpdbError("unrecognised lineType:" + lineTypes[i])
-            
-    maxSeats    = tableResult['maxSeats']
-    tableName   = tableResult['tableName']
-    #print "before part5, antes:", antes
-    
-    #part 5: final preparations, then call Database.* with
-    #         the arrays as they are - that file will fill them.
-    fpdb_simple.convertCardValues(cardValues)
-    if base == "hold":
-        fpdb_simple.convertCardValuesBoard(boardValues)
-        fpdb_simple.convertBlindBet(actionTypes, actionAmounts)
-        fpdb_simple.checkPositions(positions)
-        
-    c = db.get_cursor()
-    c.execute("SELECT limitType FROM Gametypes WHERE id=%s" % (db.sql.query['placeholder'],), (gametypeID, ))
-    limit_type = c.fetchone()[0]
-    fpdb_simple.convert3B4B(category, limit_type, actionTypes, actionAmounts)
-    
-    totalWinnings = sum(winnings)
-    
-    # if hold'em, use positions and not antes, if stud do not use positions, use antes
-    # this is used for handsplayers inserts, so still needed even if hudcache update is being skipped
-    if base == "hold":
-        hudImportData = fpdb_simple.generateHudCacheData(playerIDs, base,
-                                                         category, actionTypes,
-                                                         allIns, actionTypeByNo,
-                                                         winnings,
-                                                         totalWinnings,
-                                                         positions, actionTypes,
-                                                         actionAmounts, None)
-    else:
-        hudImportData = fpdb_simple.generateHudCacheData(playerIDs, base,
-                                                         category, actionTypes,
-                                                         allIns, actionTypeByNo,
-                                                         winnings,
-                                                         totalWinnings, None,
-                                                         actionTypes,
-                                                         actionAmounts, antes)
-
-    try:
-        db.commit()  # need to commit new players as different db connection used 
-                         # for other writes. maybe this will change maybe not ...
-    except: # TODO: this really needs to be narrowed down
-        print "parse: error during commit: " + str(sys.exc_value)
-
-#    HERE's an ugly kludge to keep from failing when positions is undef
-#    We'll fix this by getting rid of the legacy importer.  REB
-    try:
-        if positions:
-            pass
-    except NameError:
-        positions = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
-    # save data structures in a HandToWrite instance and then insert into database: 
-    htw = Database.HandToWrite()
-    htw.set_all( config, settings, base, category, siteTourneyNo, buyin
-               , fee, knockout, entries, prizepool, tourneyStartTime
-               , isTourney, tourneyTypeId, siteID, siteHandNo
-               , gametypeID, handStartTime, names, playerIDs, startCashes
-               , positions, antes, cardValues, cardSuits, boardValues, boardSuits
-               , winnings, rakes, actionTypes, allIns, actionAmounts
-               , actionNos, hudImportData, maxSeats, tableName, seatNos)
-
-    # save hand in db via direct call or via q if in a thread
-    if writeq is None:
-        result = db.store_the_hand(htw)
-    else:
-        writeq.put(htw)
-        result = -999  # meaning unknown
-
-    t9 = time()
-    #print "parse and save=(%4.3f)" % (t9-t0)
-    return result
-#end def mainParser
-
diff --git a/pyfpdb/fpdb_simple.py b/pyfpdb/fpdb_simple.py
deleted file mode 100644
index 5f0c6507..00000000
--- a/pyfpdb/fpdb_simple.py
+++ /dev/null
@@ -1,1728 +0,0 @@
-#!/usr/bin/python
-# -*- coding: iso-8859-15 -*-
-
-#Copyright 2008 Steffen Jobbagy-Felso
-#This program is free software: you can redistribute it and/or modify
-#it under the terms of the GNU Affero General Public License as published by
-#the Free Software Foundation, version 3 of the License.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU Affero General Public License
-#along with this program. If not, see <http://www.gnu.org/licenses/>.
-#In the "official" distribution you can find the license in
-#agpl-3.0.txt in the docs folder of the package.
-
-#This file contains simple functions for fpdb
-
-#Aiming to eventually remove this module, functions will move to, eg:
-#fpdb_db      db create/re-create/management/etc
-#Hands        or related files for saving hands to db, etc
-
-import datetime
-import time
-import re
-import sys
-from Exceptions import *
-import locale
-
-import Card
-
-PS  = 1
-FTP = 2
-
-# TODO: these constants are also used in fpdb_save_to_db and others, is there a way to do like C #define, and #include ?
-# answer - yes. These are defined in fpdb_db so are accessible through that class.
-MYSQL_INNODB    = 2
-PGSQL           = 3
-SQLITE          = 4
-
-LOCALE_ENCODING = locale.getdefaultlocale()[1]
-
-#returns an array of the total money paid. intending to add rebuys/addons here
-def calcPayin(count, buyin, fee):
-    return [buyin + fee for i in xrange(count)]
-#end def calcPayin
-
-def checkPositions(positions):
-    """ verify positions are valid """
-    if any(not (p == "B" or p == "S" or (p >= 0 and p <= 9)) for p in positions):
-        raise FpdbError("invalid position '"+p+"' found in checkPositions")
-    ### RHH modified to allow for "position 9" here (pos==9 is when you're a dead hand before the BB
-    ### eric - position 8 could be valid - if only one blind is posted, but there's still 10 people, ie a sitout is present, and the small is dead...
-
-def classifyLines(hand, category, lineTypes, lineStreets):
-    """ makes a list of classifications for each line for further processing
-        manipulates passed arrays """
-    currentStreet = "predeal"
-    done = False #set this to true once we reach the last relevant line (the summary, except rake, is all repeats)
-    for i, line in enumerate(hand):
-        if done:
-            if "[" not in line or "mucked [" not in line:
-                lineTypes.append("ignore")
-            else:
-                lineTypes.append("cards")
-        elif line.startswith("Dealt to"):
-            lineTypes.append("cards")
-        elif i == 0:
-            lineTypes.append("header")
-        elif line.startswith("Table '"):
-            lineTypes.append("table")
-        elif line.startswith("Seat ") and ( ("in chips" in line) or "($" in line):
-            lineTypes.append("name")
-        elif isActionLine(line):
-            lineTypes.append("action")
-            if " posts " in line or " posts the " in line:
-                currentStreet="preflop"
-        elif " antes " in line or " posts the ante " in line:
-            lineTypes.append("ante")
-        elif line.startswith("*** FLOP *** ["):
-            lineTypes.append("cards")
-            currentStreet="flop"
-        elif line.startswith("*** TURN *** ["):
-            lineTypes.append("cards")
-            currentStreet="turn"
-        elif line.startswith("*** RIVER *** ["):
-            lineTypes.append("cards")
-            currentStreet="river"
-        elif line.startswith("*** 3"):
-            lineTypes.append("ignore")
-            currentStreet=0
-        elif line.startswith("*** 4"):
-            lineTypes.append("ignore")
-            currentStreet=1
-        elif line.startswith("*** 5"):
-            lineTypes.append("ignore")
-            currentStreet=2
-        elif line.startswith("*** 6"):
-            lineTypes.append("ignore")
-            currentStreet=3
-        elif line.startswith("*** 7") or line == "*** RIVER ***":
-            lineTypes.append("ignore")
-            currentStreet=4
-        elif isWinLine(line):
-            lineTypes.append("win")
-        elif line.startswith("Total pot ") and "Rake" in line:
-            lineTypes.append("rake")
-            done=True
-        elif "*** SHOW DOWN ***" in line or "*** SUMMARY ***" in line:
-            lineTypes.append("ignore")
-            #print "in classifyLine, showdown or summary"
-        elif " shows [" in line:
-            lineTypes.append("cards")
-        else:
-            raise FpdbError("unrecognised linetype in:"+hand[i])
-        lineStreets.append(currentStreet)
-
-def convert3B4B(category, limit_type, actionTypes, actionAmounts):
-    """calculates the actual bet amounts in the given amount array and changes it accordingly."""
-    for i in xrange(len(actionTypes)):
-        for j in xrange(len(actionTypes[i])):
-            bets = []
-            for k in xrange(len(actionTypes[i][j])):
-                if (actionTypes[i][j][k] == "bet"):
-                    bets.append((i,j,k))
-            if (len(bets)>=2):
-                #print "len(bets) 2 or higher, need to correct it. bets:",bets,"len:",len(bets)
-                for betNo in reversed(xrange (1,len(bets))):
-                    amount2 = actionAmounts[bets[betNo][0]][bets[betNo][1]][bets[betNo][2]]
-                    amount1 = actionAmounts[bets[betNo-1][0]][bets[betNo-1][1]][bets[betNo-1][2]]
-                    actionAmounts[bets[betNo][0]][bets[betNo][1]][bets[betNo][2]] = amount2 - amount1
-
-def convertBlindBet(actionTypes, actionAmounts):
-    """ Corrects the bet amount if the player had to pay blinds """
-    i = 0#setting street to pre-flop
-    for j in xrange(len(actionTypes[i])):#playerloop
-        blinds = []
-        bets = []
-        for k in xrange(len(actionTypes[i][j])):
-            if actionTypes[i][j][k] == "blind":
-                blinds.append((i,j,k))
-
-            if blinds and actionTypes[i][j][k] == "bet":
-                bets.append((i,j,k))
-                if len(bets) == 1:
-                    blind_amount=actionAmounts[blinds[0][0]][blinds[0][1]][blinds[0][2]]
-                    bet_amount=actionAmounts[bets[0][0]][bets[0][1]][bets[0][2]]
-                    actionAmounts[bets[0][0]][bets[0][1]][bets[0][2]] = bet_amount - blind_amount
-
-#converts the strings in the given array to ints (changes the passed array, no returning). see table design for conversion details
-#todo: make this use convertCardValuesBoard
-def convertCardValues(arr):
-    map(convertCardValuesBoard, arr)
-
-# a 0-card is one in a stud game that we did not see or was not shown
-card_map = { 0: 0, "2": 2, "3" : 3, "4" : 4, "5" : 5, "6" : 6, "7" : 7, "8" : 8,
-            "9" : 9, "T" : 10, "J" : 11, "Q" : 12, "K" : 13, "A" : 14}
-
-def convertCardValuesBoard(arr):
-    """ converts the strings in the given array to ints
-        (changes the passed array, no returning). see table design for
-        conversion details """
-    for i in xrange(len(arr)):
-        arr[i] = card_map[arr[i]]
-
-def createArrays(category, seats, card_values, card_suits, antes, winnings,
-                 rakes, action_types, allIns, action_amounts, actionNos,
-                 actionTypeByNo):
-    """ this creates the 2D/3D arrays. manipulates the passed arrays instead of returning.    """
-    for i in xrange(seats):#create second dimension arrays
-        card_values.append( [] )
-        card_suits.append( [] )
-        antes.append(0)
-        winnings.append(0)
-        rakes.append(0)
-
-    streetCount = 4 if (category == "holdem" or category == "omahahi" or
-                        category == "omahahilo") else 5
-
-    for i in xrange(streetCount): #build the first dimension array, for streets
-        action_types.append([])
-        allIns.append([])
-        action_amounts.append([])
-        actionNos.append([])
-        actionTypeByNo.append([])
-        for j in xrange(seats): # second dimension arrays: players
-            action_types[i].append([])
-            allIns[i].append([])
-            action_amounts[i].append([])
-            actionNos[i].append([])
-#    if (category=="holdem" or category=="omahahi" or category=="omahahilo"):
-#        pass
-    if category == "razz" or category == "studhi" or category == "studhilo": #need to fill card arrays.
-        for i in xrange(seats):
-            for j in xrange(7):
-                card_values[i].append(0)
-                card_suits[i].append("x")
-#    else:
-#        raise FpdbError("invalid category")
-#end def createArrays
-
-def fill_board_cards(board_values, board_suits):
-    """ fill up the two board card arrays """
-    while len(board_values) < 5:
-        board_values.append(0)
-        board_suits.append("x")
-
-def fillCardArrays(player_count, base, category, card_values, card_suits):
-    """fills up the two card arrays"""
-    if category == "holdem":
-        cardCount = 2
-    elif category == "omahahi" or category == "omahahilo":
-        cardCount = 4
-    elif base == "stud":
-        cardCount = 7
-    else:
-        raise FpdbError("invalid category:", category)
-
-    for i in xrange(player_count):
-        while len(card_values[i]) < cardCount:
-            card_values[i].append(0)
-            card_suits[i].append("x")
-#end def fillCardArrays
-
-#filters out a player that folded before paying ante or blinds. This should be called
-#before calling the actual hand parser. manipulates hand, no return.
-def filterAnteBlindFold(hand):
-    #todo: this'll only get rid of one ante folder, not multiple ones
-    #todo: in tourneys this should not be removed but
-    #print "start of filterAnteBlindFold"
-    pre3rd = []
-    for i, line in enumerate(hand):
-        if line.startswith("*** 3") or line.startswith("*** HOLE"):
-            pre3rd = hand[0:i]
-
-    foldeeName = None
-    for line in pre3rd:
-        if line.endswith("folds") or line.endswith("is sitting out") or line.endswith(" stands up"): #found ante fold or timeout
-            pos = line.find(" folds")
-            foldeeName = line[0:pos]
-            if pos == -1 and " in chips)" not in line:
-                pos = line.find(" is sitting out")
-                foldeeName = line[0:pos]
-            if pos == -1:
-                pos = line.find(" stands up")
-                foldeeName = line[0:pos]
-            if pos == -1:
-                pos1 = line.find(": ") + 2
-                pos2 = line.find(" (")
-                foldeeName = line[pos1:pos2]
-
-    if foldeeName is not None:
-        #print "filterAnteBlindFold, foldeeName:",foldeeName
-        for i, line in enumerate(hand):
-            if foldeeName in line:
-                hand[i] = None
-
-    return [line for line in hand if line]
-
-def stripEOLspaces(str):
-    return str.rstrip()
-
-def filterCrap(hand, isTourney):
-    """ removes useless lines as well as trailing spaces """
-
-    #remove trailing spaces at end of line
-    hand = [line.rstrip() for line in hand]
-
-    #general variable position word filter/string filter
-    for i in xrange(len(hand)):
-        if hand[i].startswith("Board ["):
-            hand[i] = False
-        elif hand[i].find(" out of hand ")!=-1:
-            hand[i]=hand[i][:-56]
-        elif "($0 in chips)" in hand[i]:
-            hand[i] = False
-        elif hand[i]=="*** HOLE CARDS ***":
-            hand[i] = False
-        elif hand[i].endswith("has been disconnected"):
-            hand[i] = False
-        elif hand[i].endswith("has requested TIME"):
-            hand[i] = False
-        elif hand[i].endswith("has returned"):
-            hand[i] = False
-        elif hand[i].endswith("will be allowed to play after the button"):
-            hand[i] = False
-        elif hand[i].endswith("has timed out"):
-            hand[i] = False
-        elif hand[i].endswith("has timed out while disconnected"):
-            hand[i] = False
-        elif hand[i].endswith("has timed out while being disconnected"):
-            hand[i] = False
-        elif hand[i].endswith("is connected"):
-            hand[i] = False
-        elif hand[i].endswith("is disconnected"):
-            hand[i] = False
-        elif hand[i].find(" is low with [")!=-1:
-            hand[i] = False
-        elif hand[i].endswith(" mucks"):
-            hand[i] = False
-        elif hand[i].endswith(": mucks hand"):
-            hand[i] = False
-        elif hand[i] == "No low hand qualified":
-            hand[i] = False
-        elif hand[i] == "Pair on board - a double bet is allowed":
-            hand[i] = False
-        elif " shows " in hand[i] and "[" not in hand[i]:
-            hand[i] = False
-        elif hand[i].startswith("The button is in seat #"):
-            hand[i] = False
-        #above is alphabetic, reorder below if bored
-        elif hand[i].startswith("Time has expired"):
-            hand[i] = False
-        elif hand[i].endswith("has reconnected"):
-            hand[i] = False
-        elif hand[i].endswith("seconds left to act"):
-            hand[i] = False
-        elif hand[i].endswith("seconds to reconnect"):
-            hand[i] = False
-        elif hand[i].endswith("was removed from the table for failing to post"):
-            hand[i] = False
-        elif "joins the table at seat " in hand[i]:
-            hand[i] = False
-        elif (hand[i].endswith("leaves the table")):
-            hand[i] = False
-        elif "is high with " in hand[i]:
-            hand[i] = False
-        elif hand[i].endswith("doesn't show hand"):
-            hand[i] = False
-        elif hand[i].endswith("is being treated as all-in"):
-            hand[i] = False
-        elif " adds $" in hand[i]:
-            hand[i] = False
-        elif hand[i] == "Betting is capped":
-            hand[i] = False
-        elif (hand[i].find(" said, \"")!=-1):
-            hand[i] = False
-
-        if isTourney and not hand[i] == False:
-            if (hand[i].endswith(" is sitting out") and (not hand[i].startswith("Seat "))):
-                hand[i] = False
-        elif hand[i]:
-            if (hand[i].endswith(": sits out")):
-                hand[i] = False
-            elif (hand[i].endswith(" is sitting out")):
-                hand[i] = False
-    # python docs say this is identical to filter(None, list)
-    # which removes all false items from the passed list (hand)
-    hand = [line for line in hand if line]
-
-    return hand
-
-def float2int(string):
-    """ takes a poker float (including , for thousand seperator) and
-        converts it to an int """
-    # Note that this automagically assumes US style currency formatters
-    pos = string.find(",")
-    if pos != -1: #remove , the thousand seperator
-        string = "%s%s" % (string[0:pos], string[pos+1:])
-
-    pos = string.find(".")
-    if pos != -1: #remove decimal point
-        string = "%s%s" % (string[0:pos], string[pos+1:])
-
-    result = int(string)
-    if pos == -1: #no decimal point - was in full dollars - need to multiply with 100
-        result *= 100
-    return result
-
-ActionLines = ( "calls $", ": calls ", "brings in for", "completes it to",
-               "posts small blind", "posts the small blind", "posts big blind",
-               "posts the big blind", "posts small & big blinds", "posts $",
-               "posts a dead", "bets $", ": bets ", " raises")
-
-def isActionLine(line):
-    if line.endswith("folds"):
-        return True
-    elif line.endswith("checks"):
-        return True
-    elif line.startswith("Uncalled bet"):
-        return True
-
-    # searches for each member of ActionLines being in line, returns true
-    # on first match .. neat func
-    return any(x for x in ActionLines if x in line)
-
-def isAlreadyInDB(db, gametypeID, siteHandNo):
-    c = db.get_cursor()
-    c.execute(db.sql.query['isAlreadyInDB'], (gametypeID, siteHandNo))
-    result = c.fetchall()
-    if len(result) >= 1:
-        raise DuplicateError ("dupl")
-
-def isRebuyOrAddon(topline):
-    """isRebuyOrAddon not implemented yet"""
-    return False
-
-#returns whether the passed topline indicates a tournament or not
-def isTourney(topline):
-    return "Tournament" in topline
-
-WinLines = ( "wins the pot", "ties for the ", "wins side pot", "wins the low main pot", "wins the high main pot",
-             "wins the low",
-             "wins the high pot", "wins the high side pot", "wins the main pot", "wins the side pot", "collected" )
-
-def isWinLine(line):
-    """ returns boolean whether the passed line is a win line """
-    return any(x for x in WinLines if x in line)
-
-#returns the amount of cash/chips put into the put in the given action line
-def parseActionAmount(line, atype, isTourney):
-    #if (line.endswith(" and is all-in")):
-    # line=line[:-14]
-    #elif (line.endswith(", and is all in")):
-    # line=line[:-15]
-
-    #ideally we should recognise this as an all-in if category is capXl
-    if line.endswith(", and is capped"):
-        line=line[:-15]
-    if line.endswith(" and is capped"):
-        line=line[:-14]
-
-    if atype == "fold" or atype == "check":
-        amount = 0
-    elif atype == "unbet":
-        pos1 = line.find("$") + 1
-        if pos1 == 0:
-            pos1 = line.find("(") + 1
-        pos2 = line.find(")")
-        amount = float2int(line[pos1:pos2])
-    elif atype == "bet" and ": raises $" in line and "to $" in line:
-        pos = line.find("to $")+4
-        amount = float2int(line[pos:])
-    else:
-        if not isTourney:
-            pos = line.rfind("$")+1
-            #print "parseActionAmount, line:", line, "line[pos:]:", line[pos:]
-            amount = float2int(line[pos:])
-        else:
-            #print "line:"+line+"EOL"
-            pos = line.rfind(" ")+1
-            #print "pos:",pos
-            #print "pos of 20:", line.find("20")
-            amount = int(line[pos:])
-
-    if atype == "unbet":
-        amount *= -1
-    return amount
-#end def parseActionAmount
-
-#doesnt return anything, simply changes the passed arrays action_types and
-# action_amounts. For stud this expects numeric streets (3-7), for
-# holdem/omaha it expects predeal, preflop, flop, turn or river
-def parseActionLine(base, isTourney, line, street, playerIDs, names, action_types, allIns, action_amounts, actionNos, actionTypeByNo):
-    if street == "predeal" or street == "preflop":
-        street = 0
-    elif street == "flop":
-        street = 1
-    elif street == "turn":
-        street = 2
-    elif street == "river":
-        street = 3
-
-    nextActionNo = 0
-    for player in xrange(len(actionNos[street])):
-        for count in xrange(len(actionNos[street][player])):
-            if actionNos[street][player][count]>=nextActionNo:
-                nextActionNo=actionNos[street][player][count]+1
-
-    (line, allIn) = goesAllInOnThisLine(line)
-    atype = parseActionType(line)
-    playerno = recognisePlayerNo(line, names, atype)
-    amount = parseActionAmount(line, atype, isTourney)
-
-    action_types[street][playerno].append(atype)
-    allIns[street][playerno].append(allIn)
-    action_amounts[street][playerno].append(amount)
-    actionNos[street][playerno].append(nextActionNo)
-    tmp=(playerIDs[playerno], atype)
-    actionTypeByNo[street].append(tmp)
-
-def goesAllInOnThisLine(line):
-    """returns whether the player went all-in on this line and removes the all-in text from the line."""
-    isAllIn = False
-    if (line.endswith(" and is all-in")):
-        line = line[:-14]
-        isAllIn = True
-    elif (line.endswith(", and is all in")):
-        line = line[:-15]
-        isAllIn = True
-    return (line, isAllIn)
-
-#returns the action type code (see table design) of the given action line
-ActionTypes = { 'brings in for'                :"blind",
-                ' posts $'                     :"blind",
-                ' posts a dead '               :"blind",
-                ' posts the small blind of $'  :"blind",
-                ': posts big blind '           :"blind",
-                ': posts small blind '         :"blind",
-                ' posts the big blind of $'    :"blind",
-                ': posts small & big blinds $' :"blind",
-                ': posts small blind $'        :"blind",
-                'calls'                        :"call",
-                'completes it to'              :"bet",
-                ' bets'                        :"bet",
-                ' raises'                      :"bet"
-               }
-def parseActionType(line):
-    if (line.startswith("Uncalled bet")):
-        return "unbet"
-    elif (line.endswith(" folds")):
-        return "fold"
-    elif (line.endswith(" checks")):
-        return "check"
-    else:
-        for x in ActionTypes:
-            if x in line:
-                return ActionTypes[x]
-    raise FpdbError ("failed to recognise actiontype in parseActionLine in: "+line)
-
-#parses the ante out of the given line and checks which player paid it, updates antes accordingly.
-def parseAnteLine(line, isTourney, names, antes):
-    for i, name in enumerate(names):
-        if line.startswith(name.encode(LOCALE_ENCODING)):
-            pos = line.rfind("$") + 1
-            if not isTourney:
-                antes[i] += float2int(line[pos:])
-            else:
-                if "all-in" not in line:
-                    pos = line.rfind(" ") + 1
-                    antes[i] += int(line[pos:])
-                else:
-                    pos1 = line.rfind("ante") + 5
-                    pos2 = line.find(" ", pos1)
-                    antes[i] += int(line[pos1:pos2])
-
-#returns the buyin of a tourney in cents
-def parseBuyin(topline):
-    pos1 = topline.find("$")+1
-    if pos1 != 0:
-        pos2 = topline.find("+")
-    else:
-        pos1 = topline.find("€")+3
-        pos2 = topline.find("+")
-    return float2int(topline[pos1:pos2])
-
-#parses a card line and changes the passed arrays accordingly
-#todo: reorganise this messy method
-def parseCardLine(category, street, line, names, cardValues, cardSuits, boardValues, boardSuits):
-    if line.startswith("Dealt to") or " shows [" in line or "mucked [" in line:
-        playerNo = recognisePlayerNo(line, names, "card") #anything but unbet will be ok for that string
-
-        pos = line.rfind("[")+1
-        if category == "holdem":
-            for i in (pos, pos+3):
-                cardValues[playerNo].append(line[i:i+1])
-                cardSuits[playerNo].append(line[i+1:i+2])
-            if len(cardValues[playerNo]) != 2:
-                if (cardValues[playerNo][0] == cardValues[playerNo][2] and
-                    cardSuits[playerNo][1] == cardSuits[playerNo][3]):
-                    cardValues[playerNo]=cardValues[playerNo][0:2]
-                    cardSuits[playerNo]=cardSuits[playerNo][0:2]
-                else:
-                    print "line:",line,"cardValues[playerNo]:",cardValues[playerNo]
-                    raise FpdbError("read too many/too few holecards in parseCardLine")
-        elif category == "omahahi" or category == "omahahilo":
-            for i in (pos, pos+3, pos+6, pos+9):
-                cardValues[playerNo].append(line[i:i+1])
-                cardSuits[playerNo].append(line[i+1:i+2])
-            if (len(cardValues[playerNo])!=4):
-                if (cardValues[playerNo][0] == cardValues[playerNo][4] and
-                    cardSuits[playerNo][3] == cardSuits[playerNo][7]): #two tests will do
-                    cardValues[playerNo] = cardValues[playerNo][0:4]
-                    cardSuits[playerNo] = cardSuits[playerNo][0:4]
-                else:
-                    print "line:",line,"cardValues[playerNo]:",cardValues[playerNo]
-                    raise FpdbError("read too many/too few holecards in parseCardLine")
-        elif category == "razz" or category == "studhi" or category == "studhilo":
-            if "shows" not in line and "mucked" not in line:
-                #print "parseCardLine(in stud if), street:", street
-                if line[pos+2]=="]": #-> not (hero and 3rd street)
-                    cardValues[playerNo][street+2]=line[pos:pos+1]
-                    cardSuits[playerNo][street+2]=line[pos+1:pos+2]
-                else:
-                    #print "hero card1:", line[pos:pos+2], "hero card2:", line[pos+3:pos+5], "hero card3:", line[pos+6:pos+8],
-                    cardValues[playerNo][street]=line[pos:pos+1]
-                    cardSuits[playerNo][street]=line[pos+1:pos+2]
-                    cardValues[playerNo][street+1]=line[pos+3:pos+4]
-                    cardSuits[playerNo][street+1]=line[pos+4:pos+5]
-                    cardValues[playerNo][street+2]=line[pos+6:pos+7]
-                    cardSuits[playerNo][street+2]=line[pos+7:pos+8]
-            else:
-                #print "parseCardLine(in stud else), street:", street
-                cardValues[playerNo][0]=line[pos:pos+1]
-                cardSuits[playerNo][0]=line[pos+1:pos+2]
-                pos+=3
-                cardValues[playerNo][1]=line[pos:pos+1]
-                cardSuits[playerNo][1]=line[pos+1:pos+2]
-                if street==4:
-                    pos=pos=line.rfind("]")-2
-                    cardValues[playerNo][6]=line[pos:pos+1]
-                    cardSuits[playerNo][6]=line[pos+1:pos+2]
-                    #print "cardValues:", cardValues
-                    #print "cardSuits:", cardSuits
-        else:
-            print "line:",line,"street:",street
-            raise FpdbError("invalid category")
-        #print "end of parseCardLine/playercards, cardValues:",cardValues
-    elif (line.startswith("*** FLOP ***")):
-        pos=line.find("[")+1
-        for i in (pos, pos+3, pos+6):
-            boardValues.append(line[i:i+1])
-            boardSuits.append(line[i+1:i+2])
-        #print boardValues
-    elif (line.startswith("*** TURN ***") or line.startswith("*** RIVER ***")):
-        pos=line.find("[")+1
-        pos=line.find("[", pos+1)+1
-        boardValues.append(line[pos:pos+1])
-        boardSuits.append(line[pos+1:pos+2])
-        #print boardValues
-    else:
-        raise FpdbError ("unrecognised line:"+line)
-
-def parseCashesAndSeatNos(lines):
-    """parses the startCashes and seatNos of each player out of the given lines and returns them as a dictionary of two arrays"""
-    cashes = []
-    seatNos = []
-    for i in xrange (len(lines)):
-        pos2=lines[i].find(":")
-        seatNos.append(int(lines[i][5:pos2]))
-
-        pos1=lines[i].rfind("($")+2
-        if pos1==1: #for tourneys - it's 1 instead of -1 due to adding 2 above
-            pos1=lines[i].rfind("(")+1
-        pos2=lines[i].find(" in chips")
-        cashes.append(float2int(lines[i][pos1:pos2]))
-    return {'startCashes':cashes, 'seatNos':seatNos}
-
-#returns the buyin of a tourney in cents
-def parseFee(topline):
-    pos1 = topline.find("$")+1
-    if pos1 != 0:
-        pos1 = topline.find("$", pos1)+1
-        pos2 = topline.find(" ", pos1)
-    else:
-        pos1 = topline.find("€")+3
-        pos1 = topline.find("€", pos1)+3
-        pos2 = topline.find(" ", pos1)
-    return float2int(topline[pos1:pos2])
-
-#returns a datetime object with the starttime indicated in the given topline
-def parseHandStartTime(topline):
-    #convert x:13:35 to 0x:13:35
-    counter=0
-    while counter < 10:
-        pos = topline.find(" %d:" % counter)
-        if pos != -1:
-            topline = "%s0%s" % (topline[0:pos+1], topline[pos+1:])
-            break
-        counter += 1
-
-    isUTC=False
-    if topline.find("UTC")!=-1:
-        pos1 = topline.find("-")+2
-        pos2 = topline.find("UTC")
-        tmp=topline[pos1:pos2]
-        isUTC=True
-    else:
-        tmp=topline
-        #print "parsehandStartTime, tmp:", tmp
-        pos = tmp.find("-")+2
-        tmp = tmp[pos:]
-    #Need to match either
-    # 2008/09/07 06:23:14 ET or
-    # 2008/08/17 - 01:14:43 (ET) or
-    # 2008/11/12 9:33:31 CET [2008/11/12 3:33:31 ET]
-    rexx = '(?P<YEAR>[0-9]{4})\/(?P<MON>[0-9]{2})\/(?P<DAY>[0-9]{2})[\- ]+(?P<HR>[0-9]+):(?P<MIN>[0-9]+):(?P<SEC>[0-9]+)'
-    m = re.search(rexx,tmp)
-    result = datetime.datetime(int(m.group('YEAR')), int(m.group('MON')), int(m.group('DAY')), int(m.group('HR')), int(m.group('MIN')), int(m.group('SEC')))
-
-    if not isUTC: #these use US ET
-        result += datetime.timedelta(hours=5)
-
-    return result
-
-#parses the names out of the given lines and returns them as an array
-def findName(line):
-    pos1 = line.find(":") + 2
-    pos2 = line.rfind("(") - 1
-    return unicode(line[pos1:pos2], LOCALE_ENCODING)
-
-def parseNames(lines):
-    return [findName(line) for line in lines]
-
-def parsePositions(hand, names):
-    positions = [-1 for i in names]
-    sb, bb = -1, -1
-
-    for line in hand:
-        if sb == -1 and "small blind" in line and "dead small blind" not in line:
-            sb = line
-        if bb == -1 and "big blind" in line and "dead big blind" not in line:
-            bb = line
-
-#identify blinds
-#print "parsePositions before recognising sb/bb. names:",names
-    sbExists = True
-    if sb != -1:
-        sb = recognisePlayerNo(sb, names, "bet")
-    else:
-        sbExists = False
-    if bb != -1:
-        bb = recognisePlayerNo(bb, names, "bet")
-
-#	print "sb = ", sb, "bb = ", bb
-    if bb == sb: # if big and small are same, then don't duplicate the small
-        sbExists = False
-        sb = -1
-
-    #write blinds into array
-    if sbExists:
-        positions[sb]="S"
-    positions[bb]="B"
-
-    #fill up rest of array
-    arraypos = sb - 1 if sbExists else bb - 1
-
-    distFromBtn=0
-    while arraypos >= 0 and arraypos != bb:
-        #print "parsePositions first while, arraypos:",arraypos,"positions:",positions
-        positions[arraypos] = distFromBtn
-        arraypos -= 1
-        distFromBtn += 1
-
-    # eric - this takes into account dead seats between blinds
-    if sbExists:
-        i = bb - 1
-        while positions[i] < 0 and i != sb:
-            positions[i] = 9
-            i -= 1
-    ### RHH - Changed to set the null seats before BB to "9"
-    i = sb - 1 if sbExists else bb - 1
-
-    while positions[i] < 0:
-        positions[i]=9
-        i-=1
-
-    arraypos=len(names)-1
-    if (bb!=0 or (bb==0 and sbExists==False) or (bb == 1 and sb != arraypos) ):
-        while (arraypos > bb and arraypos > sb):
-            positions[arraypos] = distFromBtn
-            arraypos -= 1
-            distFromBtn += 1
-
-    if any(p == -1 for p in positions):
-        print "parsePositions names:",names
-        print "result:",positions
-        raise FpdbError ("failed to read positions")
-#	print str(positions), "\n"
-    return positions
-
-#simply parses the rake amount and returns it as an int
-def parseRake(line):
-    pos = line.find("Rake")+6
-    rake = float2int(line[pos:])
-    return rake
-
-def parseSiteHandNo(topline):
-    """returns the hand no assigned by the poker site"""
-    pos1 = topline.find("#")+1
-    pos2 = topline.find(":")
-    return topline[pos1:pos2]
-
-def parseTableLine(base, line):
-    """returns a dictionary with maxSeats and tableName"""
-    pos1=line.find('\'')+1
-    pos2=line.find('\'', pos1)
-    #print "table:",line[pos1:pos2]
-    pos3=pos2+2
-    pos4=line.find("-max")
-    #print "seats:",line[pos3:pos4]
-    return {'maxSeats':int(line[pos3:pos4]), 'tableName':line[pos1:pos2]}
-#end def parseTableLine
-
-#returns the hand no assigned by the poker site
-def parseTourneyNo(topline):
-    pos1 = topline.find("Tournament #")+12
-    pos2 = topline.find(",", pos1)
-    #print "parseTourneyNo pos1:",pos1," pos2:",pos2, " result:",topline[pos1:pos2]
-    return topline[pos1:pos2]
-
-#parses a win/collect line. manipulates the passed array winnings, no explicit return
-def parseWinLine(line, names, winnings, isTourney):
-    #print "parseWinLine: line:",line
-    for i,n in enumerate(names):
-        n = n.encode(LOCALE_ENCODING)
-        if line.startswith(n):
-            if isTourney:
-                pos1 = line.rfind("collected ") + 10
-                pos2 = line.find(" ", pos1)
-                winnings[i] += int(line[pos1:pos2])
-            else:
-                pos1 = line.rfind("$") + 1
-                pos2 = line.find(" ", pos1)
-                winnings[i] += float2int(line[pos1:pos2])
-
-#returns the category (as per database) string for the given line
-def recogniseCategory(line):
-    if "Razz" in line:
-        return "razz"
-    elif "Hold'em" in line:
-        return "holdem"
-    elif "Omaha" in line:
-        if "Hi/Lo" not in line and "H/L" not in line:
-            return "omahahi"
-        else:
-            return "omahahilo"
-    elif "Stud" in line:
-        if "Hi/Lo" not in line and "H/L" not in line:
-            return "studhi"
-        else:
-            return "studhilo"
-    else:
-        raise FpdbError("failed to recognise category, line:"+line)
-
-#returns the int for the gametype_id for the given line
-def recogniseGametypeID(backend, db, cursor, topline, smallBlindLine, site_id, category, isTourney):#todo: this method is messy
-    #if (topline.find("HORSE")!=-1):
-    # raise FpdbError("recogniseGametypeID: HORSE is not yet supported.")
-
-    #note: the below variable names small_bet and big_bet are misleading, in NL/PL they mean small/big blind
-    if isTourney:
-        type = "tour"
-        pos1 = topline.find("(")+1
-        if(topline[pos1] == "H" or topline[pos1] == "O" or
-           topline[pos1] == "R" or topline[pos1]=="S" or
-           topline[pos1+2] == "C"):
-            pos1 = topline.find("(", pos1)+1
-        pos2 = topline.find("/", pos1)
-        small_bet = int(topline[pos1:pos2])
-    else:
-        type = "ring"
-        pos1 = topline.find("$")+1
-        pos2 = topline.find("/$")
-        small_bet = float2int(topline[pos1:pos2])
-
-    pos1 = pos2+2
-    if isTourney:
-        pos1 -= 1
-    pos2 = topline.find(")")
-
-    if pos2 <= pos1:
-        pos2 = topline.find(")", pos1)
-
-    if isTourney:
-        big_bet = int(topline[pos1:pos2])
-    else:
-        big_bet = float2int(topline[pos1:pos2])
-
-    if 'No Limit' in topline:
-        limit_type = "nl" if 'Cap No' not in topline else "cn"
-    elif 'Pot Limit' in topline:
-        limit_type = "pl" if 'Cap Pot' not in topline else "cp"
-    else:
-        limit_type = "fl"
-
-    #print "recogniseGametypeID small_bet/blind:",small_bet,"big bet/blind:", big_bet,"limit type:",limit_type
-    if limit_type == "fl":
-        cursor.execute(db.sql.query['getGametypeFL'], (site_id, type, category,
-                                                       limit_type, small_bet,
-                                                       big_bet))
-    else:
-        cursor.execute(db.sql.query['getGametypeNL'], (site_id, type, category,
-                                                       limit_type, small_bet,
-                                                       big_bet))
-    result = cursor.fetchone()
-    #print "recgt1 result=",result
-    #ret=result[0]
-    #print "recgt1 ret=",ret
-    #print "tried SELECTing gametypes.id, result:",result
-
-    try:
-        len(result)
-    except TypeError:
-        if category=="holdem" or category=="omahahi" or category=="omahahilo":
-            base="hold"
-        else:
-            base="stud"
-
-        if category=="holdem" or category=="omahahi" or category=="studhi":
-            hiLo='h'
-        elif category=="razz":
-            hiLo='l'
-        else:
-            hiLo='s'
-
-        if (limit_type=="fl"):
-            big_blind=small_bet
-            if base=="hold":
-                if smallBlindLine==topline:
-                    raise FpdbError("invalid small blind line")
-                elif isTourney:
-                    pos=smallBlindLine.rfind(" ")+1
-                    small_blind=int(smallBlindLine[pos:])
-                else:
-                    pos=smallBlindLine.rfind("$")+1
-                    small_blind=float2int(smallBlindLine[pos:])
-            else:
-                small_blind=0
-            result = db.insertGameTypes( (site_id, type, base, category, limit_type, hiLo
-                                         ,small_blind, big_blind, small_bet, big_bet) )
-            #cursor.execute ("SELECT id FROM Gametypes WHERE siteId=%s AND type=%s AND category=%s
-            #AND limitType=%s AND smallBet=%s AND bigBet=%s", (site_id, type, category, limit_type, small_bet, big_bet))
-        else:
-            result = db.insertGameTypes( (site_id, type, base, category, limit_type, hiLo
-                                         ,small_bet, big_bet, 0, 0) )#remember, for these bet means blind
-            #cursor.execute ("SELECT id FROM Gametypes WHERE siteId=%s AND type=%s AND category=%s
-            #AND limitType=%s AND smallBlind=%s AND bigBlind=%s", (site_id, type, category, limit_type, small_bet, big_bet))
-
-    return result[0]
-#end def recogniseGametypeID
-
-def recogniseTourneyTypeId(db, siteId, tourneySiteId, buyin, fee, knockout, rebuyOrAddon):
-    ret = -1
-    cursor = db.get_cursor()
-    # First we try to find the tourney itself (by its tourneySiteId) in case it has already been inserted before (by a summary file for instance)
-    # The reason is that some tourneys may not be identified correctly in the HH toplines (especially Buy-In and Fee which are used to search/create the TourneyTypeId)
-    #TODO: When the summary file will be dumped to BD, if the tourney is already in, Buy-In/Fee may need an update (e.g. creation of a new type and link to the Tourney)
-    cursor.execute (db.sql.query['getTourneyTypeIdByTourneyNo'].replace('%s', db.sql.query['placeholder']), (tourneySiteId, siteId))
-    result = cursor.fetchone()
-
-    try:
-        len(result)
-        ret = result[0]
-    except:
-        cursor.execute( """SELECT id FROM TourneyTypes
-                           WHERE siteId=%s AND buyin=%s AND fee=%s
-                           AND knockout=%s AND rebuyOrAddon=%s""".replace('%s', db.sql.query['placeholder'])
-                      , (siteId, buyin, fee, knockout, rebuyOrAddon) )
-        result = cursor.fetchone()
-        #print "tried selecting tourneytypes.id, result:", result
-
-        try:
-            len(result)
-            ret = result[0]
-        except TypeError:#this means we need to create a new entry
-            #print "insert new tourneytype record ..."
-            try:
-                cursor.execute( """INSERT INTO TourneyTypes (siteId, buyin, fee, knockout, rebuyOrAddon)
-                                   VALUES (%s, %s, %s, %s, %s)""".replace('%s', db.sql.query['placeholder'])
-                              , (siteId, buyin, fee, knockout, rebuyOrAddon) )
-                ret = db.get_last_insert_id(cursor)
-            except:
-                #print "maybe tourneytype was created since select, try selecting again ..."
-                cursor.execute( """SELECT id FROM TourneyTypes
-                                   WHERE siteId=%s AND buyin=%s AND fee=%s
-                                   AND knockout=%s AND rebuyOrAddon=%s""".replace('%s', db.sql.query['placeholder'])
-                              , (siteId, buyin, fee, knockout, rebuyOrAddon) )
-                result = cursor.fetchone()
-                try:
-                    len(result)
-                    ret = result[0]
-                except:
-                    print "Failed to find or insert TourneyTypes record"
-                    ret = -1   # failed to find or insert record
-                #print "tried selecting tourneytypes.id again, result:", result
-
-    #print "recogniseTourneyTypeId: returning", ret
-    return ret
-#end def recogniseTourneyTypeId
-
-
-#recognises the name in the given line and returns its array position in the given array
-def recognisePlayerNo(line, names, atype):
-    #print "recogniseplayerno, names:",names
-    for i in xrange(len(names)):
-        encodedName = names[i].encode(LOCALE_ENCODING)
-        if (atype=="unbet"):
-            if (line.endswith(encodedName)):
-                return (i)
-        elif (line.startswith("Dealt to ")):
-            #print "recognisePlayerNo, card precut, line:",line
-            tmp=line[9:]
-            #print "recognisePlayerNo, card postcut, tmp:",tmp
-            if (tmp.startswith(encodedName)):
-                return (i)
-        elif (line.startswith("Seat ")):
-            if (line.startswith("Seat 10")):
-                tmp=line[9:]
-            else:
-                tmp=line[8:]
-
-            if (tmp.startswith(encodedName)):
-                return (i)
-        else:
-            if (line.startswith(encodedName)):
-                return (i)
-    #if we're here we mustve failed
-    raise FpdbError ("failed to recognise player in: "+line+" atype:"+atype)
-#end def recognisePlayerNo
-
-
-#removes trailing \n from the given array
-def removeTrailingEOL(arr):
-    for i in xrange(len(arr)):
-        if (arr[i].endswith("\n")):
-            #print "arr[i] before removetrailingEOL:", arr[i]
-            arr[i]=arr[i][:-1]
-            #print "arr[i] after removetrailingEOL:", arr[i]
-    return arr
-#end def removeTrailingEOL
-
-#splits the rake according to the proportion of pot won. manipulates the second passed array.
-def splitRake(winnings, rakes, totalRake):
-    winnercnt=0
-    totalWin=0
-    for i in xrange(len(winnings)):
-        if winnings[i]!=0:
-            winnercnt+=1
-            totalWin+=winnings[i]
-            firstWinner=i
-    if winnercnt==1:
-        rakes[firstWinner]=totalRake
-    else:
-        totalWin=float(totalWin)
-        for i in xrange(len(winnings)):
-            if winnings[i]!=0:
-                winPortion=winnings[i]/totalWin
-                rakes[i]=totalRake*winPortion
-#end def splitRake
-
-def generateHudCacheData(player_ids, base, category, action_types, allIns, actionTypeByNo
-                        ,winnings, totalWinnings, positions, actionTypes, actionAmounts, antes):
-    """calculates data for the HUD during import. IMPORTANT: if you change this method make
-sure to also change the following storage method and table_viewer.prepare_data if necessary
-"""
-    #print "generateHudCacheData, len(player_ids)=", len(player_ids)
-    #setup subarrays of the result dictionary.
-    street0VPI=[]
-    street0Aggr=[]
-    street0_3BChance=[]
-    street0_3BDone=[]
-    street1Seen=[]
-    street2Seen=[]
-    street3Seen=[]
-    street4Seen=[]
-    sawShowdown=[]
-    street1Aggr=[]
-    street2Aggr=[]
-    street3Aggr=[]
-    street4Aggr=[]
-    otherRaisedStreet1=[]
-    otherRaisedStreet2=[]
-    otherRaisedStreet3=[]
-    otherRaisedStreet4=[]
-    foldToOtherRaisedStreet1=[]
-    foldToOtherRaisedStreet2=[]
-    foldToOtherRaisedStreet3=[]
-    foldToOtherRaisedStreet4=[]
-    wonWhenSeenStreet1=[]
-
-    wonAtSD=[]
-    stealAttemptChance=[]
-    stealAttempted=[]
-    hudDataPositions=[]
-
-    street0Calls=[]
-    street1Calls=[]
-    street2Calls=[]
-    street3Calls=[]
-    street4Calls=[]
-    street0Bets=[]
-    street1Bets=[]
-    street2Bets=[]
-    street3Bets=[]
-    street4Bets=[]
-    #street0Raises=[]
-    #street1Raises=[]
-    #street2Raises=[]
-    #street3Raises=[]
-    #street4Raises=[]
-
-    # Summary figures for hand table:
-    result={}
-    result['playersVpi']=0
-    result['playersAtStreet1']=0
-    result['playersAtStreet2']=0
-    result['playersAtStreet3']=0
-    result['playersAtStreet4']=0
-    result['playersAtShowdown']=0
-    result['street0Raises']=0
-    result['street1Raises']=0
-    result['street2Raises']=0
-    result['street3Raises']=0
-    result['street4Raises']=0
-    result['street1Pot']=0
-    result['street2Pot']=0
-    result['street3Pot']=0
-    result['street4Pot']=0
-    result['showdownPot']=0
-
-    firstPfRaiseByNo=-1
-    firstPfRaiserId=-1
-    firstPfRaiserNo=-1
-    firstPfCallByNo=-1
-    firstPfCallerId=-1
-
-    for i, action in enumerate(actionTypeByNo[0]):
-        if action[1] == "bet":
-            firstPfRaiseByNo = i
-            firstPfRaiserId = action[0]
-            for j, pid in enumerate(player_ids):
-                if pid == firstPfRaiserId:
-                    firstPfRaiserNo = j
-                    break
-            break
-    for i, action in enumerate(actionTypeByNo[0]):
-        if action[1] == "call":
-            firstPfCallByNo = i
-            firstPfCallerId = action[0]
-            break
-    firstPlayId = firstPfCallerId
-    if firstPfRaiseByNo <> -1:
-        if firstPfRaiseByNo < firstPfCallByNo or firstPfCallByNo == -1:
-            firstPlayId = firstPfRaiserId
-
-
-    cutoffId=-1
-    buttonId=-1
-    sbId=-1
-    bbId=-1
-    if base=="hold":
-        for player, pos in enumerate(positions):
-            if pos == 1:
-                cutoffId = player_ids[player]
-            if pos == 0:
-                buttonId = player_ids[player]
-            if pos == 'S':
-                sbId = player_ids[player]
-            if pos == 'B':
-                bbId = player_ids[player]
-
-    someoneStole=False
-
-    #run a loop for each player preparing the actual values that will be commited to SQL
-    for player in xrange(len(player_ids)):
-        #set default values
-        myStreet0VPI=False
-        myStreet0Aggr=False
-        myStreet0_3BChance=False
-        myStreet0_3BDone=False
-        myStreet1Seen=False
-        myStreet2Seen=False
-        myStreet3Seen=False
-        myStreet4Seen=False
-        mySawShowdown=False
-        myStreet1Aggr=False
-        myStreet2Aggr=False
-        myStreet3Aggr=False
-        myStreet4Aggr=False
-        myOtherRaisedStreet1=False
-        myOtherRaisedStreet2=False
-        myOtherRaisedStreet3=False
-        myOtherRaisedStreet4=False
-        myFoldToOtherRaisedStreet1=False
-        myFoldToOtherRaisedStreet2=False
-        myFoldToOtherRaisedStreet3=False
-        myFoldToOtherRaisedStreet4=False
-        myWonWhenSeenStreet1=0.0
-        myWonAtSD=0.0
-        myStealAttemptChance=False
-        myStealAttempted=False
-        myStreet0Calls=0
-        myStreet1Calls=0
-        myStreet2Calls=0
-        myStreet3Calls=0
-        myStreet4Calls=0
-        myStreet0Bets=0
-        myStreet1Bets=0
-        myStreet2Bets=0
-        myStreet3Bets=0
-        myStreet4Bets=0
-        #myStreet0Raises=0
-        #myStreet1Raises=0
-        #myStreet2Raises=0
-        #myStreet3Raises=0
-        #myStreet4Raises=0
-
-        #calculate VPIP and PFR
-        street=0
-        heroPfRaiseCount=0
-        for currentAction in action_types[street][player]: # finally individual actions
-            if currentAction == "bet":
-                myStreet0Aggr = True
-            if currentAction == "bet" or currentAction == "call":
-                myStreet0VPI = True
-
-        if myStreet0VPI:
-            result['playersVpi'] += 1
-        myStreet0Calls = action_types[street][player].count('call')
-        myStreet0Bets = action_types[street][player].count('bet')
-        # street0Raises = action_types[street][player].count('raise')  bet count includes raises for now
-        result['street0Raises'] += myStreet0Bets
-
-        #PF3BChance and PF3B
-        pfFold=-1
-        pfRaise=-1
-        if firstPfRaiseByNo != -1:
-            for i, actionType in enumerate(actionTypeByNo[0]):
-                if actionType[0] == player_ids[player]:
-                    if actionType[1] == "bet" and pfRaise == -1 and i > firstPfRaiseByNo:
-                        pfRaise = i
-                    if actionType[1] == "fold" and pfFold == -1:
-                        pfFold = i
-            if pfFold == -1 or pfFold > firstPfRaiseByNo:
-                myStreet0_3BChance = True
-                if pfRaise > firstPfRaiseByNo:
-                    myStreet0_3BDone = True
-
-        #steal calculations
-        if base=="hold":
-            if len(player_ids)>=3: # no point otherwise  # was 5, use 3 to match pokertracker definition
-                if positions[player]==1:
-                    if      firstPfRaiserId==player_ids[player] \
-                       and (firstPfCallByNo==-1 or firstPfCallByNo>firstPfRaiseByNo):
-                        myStealAttempted=True
-                        myStealAttemptChance=True
-                    if firstPlayId==cutoffId or firstPlayId==buttonId or firstPlayId==sbId or firstPlayId==bbId or firstPlayId==-1:
-                        myStealAttemptChance=True
-                if positions[player]==0:
-                    if      firstPfRaiserId==player_ids[player] \
-                       and (firstPfCallByNo==-1 or firstPfCallByNo>firstPfRaiseByNo):
-                        myStealAttempted=True
-                        myStealAttemptChance=True
-                    if firstPlayId==buttonId or firstPlayId==sbId or firstPlayId==bbId or firstPlayId==-1:
-                        myStealAttemptChance=True
-                if positions[player]=='S':
-                    if      firstPfRaiserId==player_ids[player] \
-                       and (firstPfCallByNo==-1 or firstPfCallByNo>firstPfRaiseByNo):
-                        myStealAttempted=True
-                        myStealAttemptChance=True
-                    if firstPlayId==sbId or firstPlayId==bbId or firstPlayId==-1:
-                        myStealAttemptChance=True
-                if positions[player]=='B':
-                    pass
-
-                if myStealAttempted:
-                    someoneStole=True
-
-
-        #calculate saw* values
-        isAllIn = any(i for i in allIns[0][player])
-        if isAllIn or len(action_types[1][player]) > 0:
-            myStreet1Seen = True
-
-            if not isAllIn:
-                isAllIn = any(i for i in allIns[1][player])
-            if isAllIn or len(action_types[2][player]) > 0:
-                if all(actiontype != "fold" for actiontype in action_types[1][player]):
-                    myStreet2Seen = True
-
-                if not isAllIn:
-                    isAllAin = any(i for i in allIns[2][player])
-                if isAllIn or len(action_types[3][player]) > 0:
-                    if all(actiontype != "fold" for actiontype in action_types[2][player]):
-                        myStreet3Seen = True
-
-                    #print "base:", base
-                    if base == "hold":
-                        mySawShowdown = not any(actiontype == "fold" for actiontype in action_types[3][player])
-                    else:
-                        #print "in else"
-                        if not isAllIn:
-                            isAllIn = any(i for i in allIns[3][player])
-                        if isAllIn or len(action_types[4][player]) > 0:
-                            #print "in if"
-                            myStreet4Seen = True
-
-                            mySawShowdown = not any(actiontype == "fold" for actiontype in action_types[4][player])
-
-        if myStreet1Seen:
-            result['playersAtStreet1'] += 1
-        if myStreet2Seen:
-            result['playersAtStreet2'] += 1
-        if myStreet3Seen:
-            result['playersAtStreet3'] += 1
-        if myStreet4Seen:
-            result['playersAtStreet4'] += 1
-        if mySawShowdown:
-            result['playersAtShowdown'] += 1
-
-        #flop stuff
-        street = 1
-        if myStreet1Seen:
-            myStreet1Aggr = any(actiontype == "bet" for actiontype in action_types[street][player])
-            myStreet1Calls = action_types[street][player].count('call')
-            myStreet1Bets = action_types[street][player].count('bet')
-            # street1Raises = action_types[street][player].count('raise')  bet count includes raises for now
-            result['street1Raises'] += myStreet1Bets
-
-            for otherPlayer in xrange(len(player_ids)):
-                if player == otherPlayer:
-                    pass
-                else:
-                    for countOther in xrange(len(action_types[street][otherPlayer])):
-                        if action_types[street][otherPlayer][countOther] == "bet":
-                            myOtherRaisedStreet1 = True
-                            for countOtherFold in xrange(len(action_types[street][player])):
-                                if action_types[street][player][countOtherFold] == "fold":
-                                    myFoldToOtherRaisedStreet1 = True
-
-        #turn stuff - copy of flop with different vars
-        street = 2
-        if myStreet2Seen:
-            myStreet2Aggr = any(actiontype == "bet" for actiontype in action_types[street][player])
-            myStreet2Calls = action_types[street][player].count('call')
-            myStreet2Bets = action_types[street][player].count('bet')
-            # street2Raises = action_types[street][player].count('raise')  bet count includes raises for now
-            result['street2Raises'] += myStreet2Bets
-
-            for otherPlayer in xrange(len(player_ids)):
-                if player == otherPlayer:
-                    pass
-                else:
-                    for countOther in xrange(len(action_types[street][otherPlayer])):
-                        if action_types[street][otherPlayer][countOther] == "bet":
-                            myOtherRaisedStreet2 = True
-                            for countOtherFold in xrange(len(action_types[street][player])):
-                                if action_types[street][player][countOtherFold] == "fold":
-                                    myFoldToOtherRaisedStreet2 = True
-
-        #river stuff - copy of flop with different vars
-        street = 3
-        if myStreet3Seen:
-            myStreet3Aggr = any(actiontype == "bet" for actiontype in action_types[street][player])
-            myStreet3Calls = action_types[street][player].count('call')
-            myStreet3Bets = action_types[street][player].count('bet')
-            # street3Raises = action_types[street][player].count('raise')  bet count includes raises for now
-            result['street3Raises'] += myStreet3Bets
-
-            for otherPlayer in xrange(len(player_ids)):
-                if player == otherPlayer:
-                    pass
-                else:
-                    for countOther in xrange(len(action_types[street][otherPlayer])):
-                        if action_types[street][otherPlayer][countOther] == "bet":
-                            myOtherRaisedStreet3 = True
-                            for countOtherFold in xrange(len(action_types[street][player])):
-                                if action_types[street][player][countOtherFold] == "fold":
-                                    myFoldToOtherRaisedStreet3 = True
-
-        #stud river stuff - copy of flop with different vars
-        street = 4
-        if myStreet4Seen:
-            myStreet4Aggr = any(actiontype == "bet" for actiontype in action_types[street][player])
-            myStreet4Calls = action_types[street][player].count('call')
-            myStreet4Bets = action_types[street][player].count('bet')
-            # street4Raises = action_types[street][player].count('raise')  bet count includes raises for now
-            result['street4Raises'] += myStreet4Bets
-
-            for otherPlayer in xrange(len(player_ids)):
-                if player == otherPlayer:
-                    pass
-                else:
-                    for countOther in xrange(len(action_types[street][otherPlayer])):
-                        if action_types[street][otherPlayer][countOther] == "bet":
-                            myOtherRaisedStreet4 = True
-                            for countOtherFold in xrange(len(action_types[street][player])):
-                                if action_types[street][player][countOtherFold] == "fold":
-                                    myFoldToOtherRaisedStreet4 = True
-
-        if winnings[player] != 0:
-            if myStreet1Seen:
-                myWonWhenSeenStreet1 = winnings[player] / float(totalWinnings)
-                if mySawShowdown:
-                    myWonAtSD = myWonWhenSeenStreet1
-
-        #add each value to the appropriate array
-        street0VPI.append(myStreet0VPI)
-        street0Aggr.append(myStreet0Aggr)
-        street0_3BChance.append(myStreet0_3BChance)
-        street0_3BDone.append(myStreet0_3BDone)
-        street1Seen.append(myStreet1Seen)
-        street2Seen.append(myStreet2Seen)
-        street3Seen.append(myStreet3Seen)
-        street4Seen.append(myStreet4Seen)
-        sawShowdown.append(mySawShowdown)
-        street1Aggr.append(myStreet1Aggr)
-        street2Aggr.append(myStreet2Aggr)
-        street3Aggr.append(myStreet3Aggr)
-        street4Aggr.append(myStreet4Aggr)
-        otherRaisedStreet1.append(myOtherRaisedStreet1)
-        otherRaisedStreet2.append(myOtherRaisedStreet2)
-        otherRaisedStreet3.append(myOtherRaisedStreet3)
-        otherRaisedStreet4.append(myOtherRaisedStreet4)
-        foldToOtherRaisedStreet1.append(myFoldToOtherRaisedStreet1)
-        foldToOtherRaisedStreet2.append(myFoldToOtherRaisedStreet2)
-        foldToOtherRaisedStreet3.append(myFoldToOtherRaisedStreet3)
-        foldToOtherRaisedStreet4.append(myFoldToOtherRaisedStreet4)
-        wonWhenSeenStreet1.append(myWonWhenSeenStreet1)
-        wonAtSD.append(myWonAtSD)
-        stealAttemptChance.append(myStealAttemptChance)
-        stealAttempted.append(myStealAttempted)
-        if base=="hold":
-            pos=positions[player]
-            if pos=='B':
-                hudDataPositions.append('B')
-            elif pos=='S':
-                hudDataPositions.append('S')
-            elif pos==0:
-                hudDataPositions.append('D')
-            elif pos==1:
-                hudDataPositions.append('C')
-            elif pos>=2 and pos<=4:
-                hudDataPositions.append('M')
-            elif pos>=5 and pos<=8:
-                hudDataPositions.append('E')
-            ### RHH Added this elif to handle being a dead hand before the BB (pos==9)
-            elif pos==9:
-                hudDataPositions.append('X')
-            else:
-                raise FpdbError("invalid position")
-        elif base=="stud":
-            #todo: stud positions and steals
-            pass
-
-        street0Calls.append(myStreet0Calls)
-        street1Calls.append(myStreet1Calls)
-        street2Calls.append(myStreet2Calls)
-        street3Calls.append(myStreet3Calls)
-        street4Calls.append(myStreet4Calls)
-        street0Bets.append(myStreet0Bets)
-        street1Bets.append(myStreet1Bets)
-        street2Bets.append(myStreet2Bets)
-        street3Bets.append(myStreet3Bets)
-        street4Bets.append(myStreet4Bets)
-        #street0Raises.append(myStreet0Raises)
-        #street1Raises.append(myStreet1Raises)
-        #street2Raises.append(myStreet2Raises)
-        #street3Raises.append(myStreet3Raises)
-        #street4Raises.append(myStreet4Raises)
-
-    #add each array to the to-be-returned dictionary
-    result['street0VPI']=street0VPI
-    result['street0Aggr']=street0Aggr
-    result['street0_3BChance']=street0_3BChance
-    result['street0_3BDone']=street0_3BDone
-    result['street1Seen']=street1Seen
-    result['street2Seen']=street2Seen
-    result['street3Seen']=street3Seen
-    result['street4Seen']=street4Seen
-    result['sawShowdown']=sawShowdown
-
-    result['street1Aggr']=street1Aggr
-    result['otherRaisedStreet1']=otherRaisedStreet1
-    result['foldToOtherRaisedStreet1']=foldToOtherRaisedStreet1
-    result['street2Aggr']=street2Aggr
-    result['otherRaisedStreet2']=otherRaisedStreet2
-    result['foldToOtherRaisedStreet2']=foldToOtherRaisedStreet2
-    result['street3Aggr']=street3Aggr
-    result['otherRaisedStreet3']=otherRaisedStreet3
-    result['foldToOtherRaisedStreet3']=foldToOtherRaisedStreet3
-    result['street4Aggr']=street4Aggr
-    result['otherRaisedStreet4']=otherRaisedStreet4
-    result['foldToOtherRaisedStreet4']=foldToOtherRaisedStreet4
-    result['wonWhenSeenStreet1']=wonWhenSeenStreet1
-    result['wonAtSD']=wonAtSD
-    result['stealAttemptChance']=stealAttemptChance
-    result['stealAttempted']=stealAttempted
-    result['street0Calls']=street0Calls
-    result['street1Calls']=street1Calls
-    result['street2Calls']=street2Calls
-    result['street3Calls']=street3Calls
-    result['street4Calls']=street4Calls
-    result['street0Bets']=street0Bets
-    result['street1Bets']=street1Bets
-    result['street2Bets']=street2Bets
-    result['street3Bets']=street3Bets
-    result['street4Bets']=street4Bets
-    #result['street0Raises']=street0Raises
-    #result['street1Raises']=street1Raises
-    #result['street2Raises']=street2Raises
-    #result['street3Raises']=street3Raises
-    #result['street4Raises']=street4Raises
-
-    #now the various steal values
-    foldBbToStealChance=[]
-    foldedBbToSteal=[]
-    foldSbToStealChance=[]
-    foldedSbToSteal=[]
-    for player in xrange(len(player_ids)):
-        myFoldBbToStealChance=False
-        myFoldedBbToSteal=False
-        myFoldSbToStealChance=False
-        myFoldedSbToSteal=False
-
-        if base=="hold":
-            if someoneStole and (positions[player]=='B' or positions[player]=='S') and firstPfRaiserId!=player_ids[player]:
-                street=0
-                for count in xrange(len(action_types[street][player])):#individual actions
-                    if positions[player]=='B':
-                        myFoldBbToStealChance=True
-                        if action_types[street][player][count]=="fold":
-                            myFoldedBbToSteal=True
-                    if positions[player]=='S':
-                        myFoldSbToStealChance=True
-                        if action_types[street][player][count]=="fold":
-                            myFoldedSbToSteal=True
-
-
-        foldBbToStealChance.append(myFoldBbToStealChance)
-        foldedBbToSteal.append(myFoldedBbToSteal)
-        foldSbToStealChance.append(myFoldSbToStealChance)
-        foldedSbToSteal.append(myFoldedSbToSteal)
-    result['foldBbToStealChance']=foldBbToStealChance
-    result['foldedBbToSteal']=foldedBbToSteal
-    result['foldSbToStealChance']=foldSbToStealChance
-    result['foldedSbToSteal']=foldedSbToSteal
-
-    #now CB
-    street1CBChance=[]
-    street1CBDone=[]
-    didStreet1CB=[]
-    for player in xrange(len(player_ids)):
-        myStreet1CBChance=False
-        myStreet1CBDone=False
-
-        if street0VPI[player]:
-            myStreet1CBChance=True
-            if street1Aggr[player]:
-                myStreet1CBDone=True
-                didStreet1CB.append(player_ids[player])
-
-        street1CBChance.append(myStreet1CBChance)
-        street1CBDone.append(myStreet1CBDone)
-    result['street1CBChance']=street1CBChance
-    result['street1CBDone']=street1CBDone
-
-    #now 2B
-    street2CBChance=[]
-    street2CBDone=[]
-    didStreet2CB=[]
-    for player in xrange(len(player_ids)):
-        myStreet2CBChance=False
-        myStreet2CBDone=False
-
-        if street1CBDone[player]:
-            myStreet2CBChance=True
-            if street2Aggr[player]:
-                myStreet2CBDone=True
-                didStreet2CB.append(player_ids[player])
-
-        street2CBChance.append(myStreet2CBChance)
-        street2CBDone.append(myStreet2CBDone)
-    result['street2CBChance']=street2CBChance
-    result['street2CBDone']=street2CBDone
-
-    #now 3B
-    street3CBChance=[]
-    street3CBDone=[]
-    didStreet3CB=[]
-    for player in xrange(len(player_ids)):
-        myStreet3CBChance=False
-        myStreet3CBDone=False
-
-        if street2CBDone[player]:
-            myStreet3CBChance=True
-            if street3Aggr[player]:
-                myStreet3CBDone=True
-                didStreet3CB.append(player_ids[player])
-
-        street3CBChance.append(myStreet3CBChance)
-        street3CBDone.append(myStreet3CBDone)
-    result['street3CBChance']=street3CBChance
-    result['street3CBDone']=street3CBDone
-
-    #and 4B
-    street4CBChance=[]
-    street4CBDone=[]
-    didStreet4CB=[]
-    for player in xrange(len(player_ids)):
-        myStreet4CBChance=False
-        myStreet4CBDone=False
-
-        if street3CBDone[player]:
-            myStreet4CBChance=True
-            if street4Aggr[player]:
-                myStreet4CBDone=True
-                didStreet4CB.append(player_ids[player])
-
-        street4CBChance.append(myStreet4CBChance)
-        street4CBDone.append(myStreet4CBDone)
-    result['street4CBChance']=street4CBChance
-    result['street4CBDone']=street4CBDone
-
-
-    result['position']=hudDataPositions
-
-    foldToStreet1CBChance=[]
-    foldToStreet1CBDone=[]
-    foldToStreet2CBChance=[]
-    foldToStreet2CBDone=[]
-    foldToStreet3CBChance=[]
-    foldToStreet3CBDone=[]
-    foldToStreet4CBChance=[]
-    foldToStreet4CBDone=[]
-
-    for player in xrange(len(player_ids)):
-        myFoldToStreet1CBChance=False
-        myFoldToStreet1CBDone=False
-        foldToStreet1CBChance.append(myFoldToStreet1CBChance)
-        foldToStreet1CBDone.append(myFoldToStreet1CBDone)
-
-        myFoldToStreet2CBChance=False
-        myFoldToStreet2CBDone=False
-        foldToStreet2CBChance.append(myFoldToStreet2CBChance)
-        foldToStreet2CBDone.append(myFoldToStreet2CBDone)
-
-        myFoldToStreet3CBChance=False
-        myFoldToStreet3CBDone=False
-        foldToStreet3CBChance.append(myFoldToStreet3CBChance)
-        foldToStreet3CBDone.append(myFoldToStreet3CBDone)
-
-        myFoldToStreet4CBChance=False
-        myFoldToStreet4CBDone=False
-        foldToStreet4CBChance.append(myFoldToStreet4CBChance)
-        foldToStreet4CBDone.append(myFoldToStreet4CBDone)
-
-    if len(didStreet1CB)>=1:
-        generateFoldToCB(1, player_ids, didStreet1CB, street1CBDone, foldToStreet1CBChance, foldToStreet1CBDone, actionTypeByNo)
-
-        if len(didStreet2CB)>=1:
-            generateFoldToCB(2, player_ids, didStreet2CB, street2CBDone, foldToStreet2CBChance, foldToStreet2CBDone, actionTypeByNo)
-
-            if len(didStreet3CB)>=1:
-                generateFoldToCB(3, player_ids, didStreet3CB, street3CBDone, foldToStreet3CBChance, foldToStreet3CBDone, actionTypeByNo)
-
-                if len(didStreet4CB)>=1:
-                    generateFoldToCB(4, player_ids, didStreet4CB, street4CBDone, foldToStreet4CBChance, foldToStreet4CBDone, actionTypeByNo)
-
-    result['foldToStreet1CBChance']=foldToStreet1CBChance
-    result['foldToStreet1CBDone']=foldToStreet1CBDone
-    result['foldToStreet2CBChance']=foldToStreet2CBChance
-    result['foldToStreet2CBDone']=foldToStreet2CBDone
-    result['foldToStreet3CBChance']=foldToStreet3CBChance
-    result['foldToStreet3CBDone']=foldToStreet3CBDone
-    result['foldToStreet4CBChance']=foldToStreet4CBChance
-    result['foldToStreet4CBDone']=foldToStreet4CBDone
-
-
-    totalProfit=[]
-
-    street1CheckCallRaiseChance=[]
-    street1CheckCallRaiseDone=[]
-    street2CheckCallRaiseChance=[]
-    street2CheckCallRaiseDone=[]
-    street3CheckCallRaiseChance=[]
-    street3CheckCallRaiseDone=[]
-    street4CheckCallRaiseChance=[]
-    street4CheckCallRaiseDone=[]
-    #print "b4 totprof calc, len(playerIds)=", len(player_ids)
-    for pl in xrange(len(player_ids)):
-        #print "pl=", pl
-        myTotalProfit=winnings[pl]  # still need to deduct other costs
-        if antes:
-            myTotalProfit=winnings[pl] - antes[pl]
-        for i in xrange(len(actionTypes)): #iterate through streets
-            #for j in xrange(len(actionTypes[i])): #iterate through names (using pl loop above)
-                for k in xrange(len(actionTypes[i][pl])): #iterate through individual actions of that player on that street
-                    myTotalProfit -= actionAmounts[i][pl][k]
-
-        myStreet1CheckCallRaiseChance=False
-        myStreet1CheckCallRaiseDone=False
-        myStreet2CheckCallRaiseChance=False
-        myStreet2CheckCallRaiseDone=False
-        myStreet3CheckCallRaiseChance=False
-        myStreet3CheckCallRaiseDone=False
-        myStreet4CheckCallRaiseChance=False
-        myStreet4CheckCallRaiseDone=False
-
-        #print "myTotalProfit=", myTotalProfit
-        totalProfit.append(myTotalProfit)
-        #print "totalProfit[]=", totalProfit
-
-        street1CheckCallRaiseChance.append(myStreet1CheckCallRaiseChance)
-        street1CheckCallRaiseDone.append(myStreet1CheckCallRaiseDone)
-        street2CheckCallRaiseChance.append(myStreet2CheckCallRaiseChance)
-        street2CheckCallRaiseDone.append(myStreet2CheckCallRaiseDone)
-        street3CheckCallRaiseChance.append(myStreet3CheckCallRaiseChance)
-        street3CheckCallRaiseDone.append(myStreet3CheckCallRaiseDone)
-        street4CheckCallRaiseChance.append(myStreet4CheckCallRaiseChance)
-        street4CheckCallRaiseDone.append(myStreet4CheckCallRaiseDone)
-
-    result['totalProfit']=totalProfit
-    #print "res[totalProfit]=", result['totalProfit']
-
-    result['street1CheckCallRaiseChance']=street1CheckCallRaiseChance
-    result['street1CheckCallRaiseDone']=street1CheckCallRaiseDone
-    result['street2CheckCallRaiseChance']=street2CheckCallRaiseChance
-    result['street2CheckCallRaiseDone']=street2CheckCallRaiseDone
-    result['street3CheckCallRaiseChance']=street3CheckCallRaiseChance
-    result['street3CheckCallRaiseDone']=street3CheckCallRaiseDone
-    result['street4CheckCallRaiseChance']=street4CheckCallRaiseChance
-    result['street4CheckCallRaiseDone']=street4CheckCallRaiseDone
-    return result
-#end def generateHudCacheData
-
-def generateFoldToCB(street, playerIDs, didStreetCB, streetCBDone, foldToStreetCBChance, foldToStreetCBDone, actionTypeByNo):
-    """fills the passed foldToStreetCB* arrays appropriately depending on the given street"""
-    #print "beginning of generateFoldToCB, street:", street, "len(actionTypeByNo):", len(actionTypeByNo)
-    #print "len(actionTypeByNo[street]):",len(actionTypeByNo[street])
-    firstCBReaction=0
-    for action in xrange(len(actionTypeByNo[street])):
-        if actionTypeByNo[street][action][1]=="bet":
-            for player in didStreetCB:
-                if player==actionTypeByNo[street][action][0] and firstCBReaction==0:
-                    firstCBReaction=action+1
-                    break
-
-    for action in actionTypeByNo[street][firstCBReaction:]:
-        for player in xrange(len(playerIDs)):
-            if playerIDs[player]==action[0]:
-                foldToStreetCBChance[player]=True
-                if action[1]=="fold":
-                    foldToStreetCBDone[player]=True
-#end def generateFoldToCB

From a3be99bcf6eccd79afec2a6e0835ab1d54a953f8 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Tue, 22 Dec 2009 17:20:07 +0800
Subject: [PATCH 023/320] [NEWIMPORT] HandsPlayers.startCards

Dodgy function just to get things kinda working again.
---
 pyfpdb/Card.py         | 21 ++++++++++++++++++++-
 pyfpdb/DerivedStats.py |  4 ++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/pyfpdb/Card.py b/pyfpdb/Card.py
index 287a0f6a..8639fd35 100755
--- a/pyfpdb/Card.py
+++ b/pyfpdb/Card.py
@@ -16,6 +16,25 @@
 #agpl-3.0.txt in the docs folder of the package.
 
 
+# From fpdb_simple
+card_map = { "0": 0, "2": 2, "3" : 3, "4" : 4, "5" : 5, "6" : 6, "7" : 7, "8" : 8,
+            "9" : 9, "T" : 10, "J" : 11, "Q" : 12, "K" : 13, "A" : 14}
+
+# FIXME: the following is a workaround until switching to newimport.
+#        This should be moved into DerivedStats
+#        I'd also like to change HandsPlayers.startCards to a different datatype
+#        so we can 'trivially' add different start card classifications
+
+def calcStartCards(hand, player):
+    if hand.gametype['category'] == 'holdem':
+        hcs = hand.join_holecards(player, asList=True)
+        #print "DEBUG: hcs: %s" % hcs
+        value1 = card_map[hcs[0][0]]
+        value2 = card_map[hcs[1][0]]
+        return twoStartCards(value1, hcs[0][1], value2, hcs[1][1])
+    else:
+        # FIXME: Only do startCards value for holdem at the moment
+        return 0
 
 
 def twoStartCards(value1, suit1, value2, suit2):
@@ -127,4 +146,4 @@ if __name__ == '__main__':
             (i, valueSuitFromCard(i), i+13, valueSuitFromCard(i+13), i+26, valueSuitFromCard(i+26), i+39, valueSuitFromCard(i+39))
 
         print 
-    print encodeCard('7c')
\ No newline at end of file
+    print encodeCard('7c')
diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py
index dbd655a3..b65b0d05 100644
--- a/pyfpdb/DerivedStats.py
+++ b/pyfpdb/DerivedStats.py
@@ -47,6 +47,7 @@ class DerivedStats():
             self.handsplayers[player[1]]['wonWhenSeenStreet1'] = 0.0
             self.handsplayers[player[1]]['sawShowdown'] = False
             self.handsplayers[player[1]]['wonAtSD']     = 0.0
+            self.handsplayers[player[1]]['startCards']  = 0
             for i in range(5): 
                 self.handsplayers[player[1]]['street%dCalls' % i] = 0
                 self.handsplayers[player[1]]['street%dBets' % i] = 0
@@ -57,7 +58,6 @@ class DerivedStats():
             #FIXME - Everything below this point is incomplete.
             self.handsplayers[player[1]]['position']            = 2
             self.handsplayers[player[1]]['tourneyTypeId']       = 1
-            self.handsplayers[player[1]]['startCards']          = 0
             self.handsplayers[player[1]]['street0_3BChance']    = False
             self.handsplayers[player[1]]['street0_3BDone']      = False
             self.handsplayers[player[1]]['stealAttemptChance']  = False
@@ -172,7 +172,7 @@ class DerivedStats():
             #    self.handsplayers[player[1]]['card%s' % i] = Card.encodeCard(card)
             for i, card in enumerate(hcs[:7]):
                 self.handsplayers[player[1]]['card%s' % (i+1)] = Card.encodeCard(card)
-
+            self.handsplayers[player[1]]['startCards'] = Card.calcStartCards(hand, player[1])
 
         # position,
             #Stud 3rd street card test

From 0898ddf8a15700f01cdf43f3ac8d73207daeefcd Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Tue, 22 Dec 2009 17:20:07 +0800
Subject: [PATCH 024/320] [NEWIMPORT] HandsPlayers.startCards

Dodgy function just to get things kinda working again.
---
 pyfpdb/Card.py         | 21 ++++++++++++++++++++-
 pyfpdb/DerivedStats.py |  4 ++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/pyfpdb/Card.py b/pyfpdb/Card.py
index 287a0f6a..8639fd35 100755
--- a/pyfpdb/Card.py
+++ b/pyfpdb/Card.py
@@ -16,6 +16,25 @@
 #agpl-3.0.txt in the docs folder of the package.
 
 
+# From fpdb_simple
+card_map = { "0": 0, "2": 2, "3" : 3, "4" : 4, "5" : 5, "6" : 6, "7" : 7, "8" : 8,
+            "9" : 9, "T" : 10, "J" : 11, "Q" : 12, "K" : 13, "A" : 14}
+
+# FIXME: the following is a workaround until switching to newimport.
+#        This should be moved into DerivedStats
+#        I'd also like to change HandsPlayers.startCards to a different datatype
+#        so we can 'trivially' add different start card classifications
+
+def calcStartCards(hand, player):
+    if hand.gametype['category'] == 'holdem':
+        hcs = hand.join_holecards(player, asList=True)
+        #print "DEBUG: hcs: %s" % hcs
+        value1 = card_map[hcs[0][0]]
+        value2 = card_map[hcs[1][0]]
+        return twoStartCards(value1, hcs[0][1], value2, hcs[1][1])
+    else:
+        # FIXME: Only do startCards value for holdem at the moment
+        return 0
 
 
 def twoStartCards(value1, suit1, value2, suit2):
@@ -127,4 +146,4 @@ if __name__ == '__main__':
             (i, valueSuitFromCard(i), i+13, valueSuitFromCard(i+13), i+26, valueSuitFromCard(i+26), i+39, valueSuitFromCard(i+39))
 
         print 
-    print encodeCard('7c')
\ No newline at end of file
+    print encodeCard('7c')
diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py
index dbd655a3..b65b0d05 100644
--- a/pyfpdb/DerivedStats.py
+++ b/pyfpdb/DerivedStats.py
@@ -47,6 +47,7 @@ class DerivedStats():
             self.handsplayers[player[1]]['wonWhenSeenStreet1'] = 0.0
             self.handsplayers[player[1]]['sawShowdown'] = False
             self.handsplayers[player[1]]['wonAtSD']     = 0.0
+            self.handsplayers[player[1]]['startCards']  = 0
             for i in range(5): 
                 self.handsplayers[player[1]]['street%dCalls' % i] = 0
                 self.handsplayers[player[1]]['street%dBets' % i] = 0
@@ -57,7 +58,6 @@ class DerivedStats():
             #FIXME - Everything below this point is incomplete.
             self.handsplayers[player[1]]['position']            = 2
             self.handsplayers[player[1]]['tourneyTypeId']       = 1
-            self.handsplayers[player[1]]['startCards']          = 0
             self.handsplayers[player[1]]['street0_3BChance']    = False
             self.handsplayers[player[1]]['street0_3BDone']      = False
             self.handsplayers[player[1]]['stealAttemptChance']  = False
@@ -172,7 +172,7 @@ class DerivedStats():
             #    self.handsplayers[player[1]]['card%s' % i] = Card.encodeCard(card)
             for i, card in enumerate(hcs[:7]):
                 self.handsplayers[player[1]]['card%s' % (i+1)] = Card.encodeCard(card)
-
+            self.handsplayers[player[1]]['startCards'] = Card.calcStartCards(hand, player[1])
 
         # position,
             #Stud 3rd street card test

From ae55a89d7f16ee918c39372127ccb25de1ec31b7 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Tue, 22 Dec 2009 20:22:05 +0800
Subject: [PATCH 025/320] Remove reference to fpdb_simple

---
 pyfpdb/Tables.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pyfpdb/Tables.py b/pyfpdb/Tables.py
index ea5dfc4c..75bc574c 100755
--- a/pyfpdb/Tables.py
+++ b/pyfpdb/Tables.py
@@ -39,7 +39,6 @@ if os.name == 'nt':
 
 #    FreePokerTools modules
 import Configuration
-from fpdb_simple import LOCALE_ENCODING
 
 #    Each TableWindow object must have the following attributes correctly populated:
 #    tw.name = the table name from the title bar, which must to match the table name
@@ -238,7 +237,7 @@ def discover_nt_by_name(c, tablename):
         try:
             # maybe it's better to make global titles[hwnd] decoding?
             # this can blow up in XP on some windows, eg firefox displaying http://docs.python.org/tutorial/classes.html
-            if not tablename.lower() in titles[hwnd].decode(LOCALE_ENCODING).lower():
+            if not tablename.lower() in titles[hwnd].decode(Configuration.LOCALE_ENCODING).lower():
                 continue
         except:
             continue

From 4d8d678d644a1cf7b439c5d4dc2ae8986a6f4656 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Tue, 22 Dec 2009 21:40:37 +0800
Subject: [PATCH 026/320] [NEWIMPORT] Make seek into autoimport function

Now that the legacy import path is gone, enable the index for HHC
---
 pyfpdb/HandHistoryConverter.py | 2 +-
 pyfpdb/fpdb_import.py          | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index a18797df..9d4807a2 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -65,7 +65,7 @@ follow :  whether to tail -f the input"""
 
         log.info("HandHistory init - %s subclass, in_path '%s'; out_path '%s'" % (self.sitename, in_path, out_path) )
         
-        self.index     = 0
+        self.index     = index
         self.starsArchive = starsArchive
 
         self.in_path = in_path
diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index a7a21831..2decf6b6 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -427,7 +427,12 @@ class Importer:
         mod = __import__(filter)
         obj = getattr(mod, filter_name, None)
         if callable(obj):
-            hhc = obj(in_path = file, out_path = out_path, index = 0, starsArchive = self.settings['starsArchive']) # Index into file 0 until changeover
+            idx = 0
+            if file in self.pos_in_file:
+                idx = self.pos_in_file[file]
+            else:
+                self.pos_in_file[file] = 0
+            hhc = obj(in_path = file, out_path = out_path, index = idx, starsArchive = self.settings['starsArchive']) # Index into file 0 until changeover
             if hhc.getStatus() and self.NEWIMPORT == True:
                 #This code doesn't do anything yet
                 handlist = hhc.getProcessedHands()

From 284693e95e820e0e8e41428f82f6d93784ec23a7 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Tue, 22 Dec 2009 22:02:36 +0800
Subject: [PATCH 027/320] [NEWIMPORT] Rebuild hudcache after hand is committed

---
 pyfpdb/fpdb_import.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index 2decf6b6..a2a466de 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -449,6 +449,7 @@ class Importer:
                     else:
                         log.error("Hand processed but empty")
                 self.database.commit()
+                self.database.rebuild_hudcache()
 
                 #pipe the Hands.id out to the HUD
                 for hid in to_hud:

From d8a87b92d4101ca406ab0866964737e2d3baba30 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Tue, 22 Dec 2009 22:15:27 +0800
Subject: [PATCH 028/320] [NEWIMPORT] Make hudcache rebuild only happen no call
 to hud

---
 pyfpdb/fpdb_import.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index a2a466de..24f16000 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -449,7 +449,8 @@ class Importer:
                     else:
                         log.error("Hand processed but empty")
                 self.database.commit()
-                self.database.rebuild_hudcache()
+                if self.callHud:
+                    self.database.rebuild_hudcache()
 
                 #pipe the Hands.id out to the HUD
                 for hid in to_hud:

From 355225fc258e26b34e078e8baec5143267f9a0e5 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Tue, 22 Dec 2009 23:03:05 +0800
Subject: [PATCH 029/320] [NEWIMPORT] Remove test_fpdb_simple

---
 pyfpdb/test_fpdb_simple.py | 27 ---------------------------
 1 file changed, 27 deletions(-)
 delete mode 100755 pyfpdb/test_fpdb_simple.py

diff --git a/pyfpdb/test_fpdb_simple.py b/pyfpdb/test_fpdb_simple.py
deleted file mode 100755
index 3d9615cb..00000000
--- a/pyfpdb/test_fpdb_simple.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-import fpdb_simple
-import datetime
-import py
-
-def checkDateParse(header, site, result):
-    assert fpdb_simple.parseHandStartTime(header, site) == result
-
-def testPokerStarsHHDate():
-    tuples = (
-        ("PokerStars Game #21969660557:  Hold'em No Limit ($0.50/$1.00) - 2008/11/12 10:00:48 CET [2008/11/12 4:00:48 ET]", "ps",
-                    datetime.datetime(2008,11,12,15,00,48)),
-        ("PokerStars Game #21969660557:  Hold'em No Limit ($0.50/$1.00) - 2008/08/17 - 01:14:43 (ET)", "ps",
-                    datetime.datetime(2008,8,17,6,14,43)),
-        ("PokerStars Game #21969660557:  Hold'em No Limit ($0.50/$1.00) - 2008/09/07 06:23:14 ET", "ps",
-                    datetime.datetime(2008,9,7,11,23,14))
-    )
-
-#def testTableDetection():
-#    result = Tables.clean_title("French (deep)")
-#    assert  result == "French"
-#    result = Tables.clean_title("French (deep) - $0.25/$0.50 - No Limit Hold'em - Logged In As xxxx")
-#    assert  result == "French"
-#
-#    for (header, site, result) in tuples:
-#        yield checkDateParse, header, site, result
-

From 6e9153c25c529a608020732bd329376f5692348f Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Wed, 23 Dec 2009 13:30:12 +0800
Subject: [PATCH 030/320] [NEWIMPORT] Copy Grigorij's code from Alchemy

Copied some of Grigorij's code verbatim for calculating additional stats, still needs adapting.

Also reorder some functions so the corresponding files are more mergeable in future.
---
 pyfpdb/DerivedStats.py | 112 +++++++++++++++++++++++++++++++++++------
 1 file changed, 96 insertions(+), 16 deletions(-)

diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py
index b65b0d05..c87e714a 100644
--- a/pyfpdb/DerivedStats.py
+++ b/pyfpdb/DerivedStats.py
@@ -262,13 +262,58 @@ class DerivedStats():
         for (i, street) in enumerate(hand.actionStreets[1:]):
             self.hands['street%dRaises' % i] = len(filter( lambda action: action[1] in ('raises','bets'), hand.actions[street]))
 
-    def calcCBets(self, hand):
-        # Continuation Bet chance, action:
-        # Had the last bet (initiative) on previous street, got called, close street action
-        #   Then no bets before the player with initiatives first action on current street
-        # ie. if player on street-1 had initiative
-        #                and no donkbets occurred
+    def calcSteals(self, hand):
+        """Fills stealAttempt(Chance|ed, fold(Bb|Sb)ToSteal(Chance|)
 
+        Steal attemp - open raise on positions 2 1 0 S - i.e. MP3, CO, BU, SB
+        Fold to steal - folding blind after steal attemp wo any other callers or raisers
+        """
+        if self.gametype_dict['base'] != 'hold':
+            # FIXME: add support for other games //grindi
+            return
+        steal_attemp = False
+        for action in hand.actions[hand.actionStreets[1]]:
+            hp, act = self.handplayers_by_name[action[0]], action[1]
+            #print action[0], hp.position, steal_attemp, act
+            if hp.position == 'B':
+                hp.foldBbToStealChance = steal_attemp
+                hp.foldBbToSteal = hp.foldBbToStealChance and act == 'folds'
+                break
+            elif hp.position == 'S':
+                hp.foldSbToStealChance = steal_attemp
+                hp.foldSbToSteal = hp.foldSbToStealChance and act == 'folds'
+
+            if steal_attemp and act != 'folds':
+                break
+
+            if hp.position in ('2', '1', '0', 'S') and not steal_attemp:
+                hp.stealAttemptChance = True
+                if act in ('bets', 'raises'):
+                    hp.stealAttempted = True
+                    steal_attemp = True
+
+    def calc34BetStreet0(self, hand):
+        """Fills street0_(3|4)B(Chance|Done), other(3|4)BStreet0"""
+        bet_level = 1 # bet_level after 3-bet is equal to 3
+        for action in hand.actions[hand.actionStreets[1]]:
+            # FIXME: fill other(3|4)BStreet0 - i have no idea what does it mean
+            hp, aggr = self.handplayers_by_name[action[0]], action[1] in ('raises', 'bets')
+            hp.street0_3BChance = bet_level == 2
+            hp.street0_4BChance = bet_level == 3
+            hp.street0_3BDone =  aggr and (hp.street0_3BChance)
+            hp.street0_4BDone =  aggr and (hp.street0_4BChance)
+            if aggr:
+                bet_level += 1
+
+
+    def calcCBets(self, hand):
+        """Fill streetXCBChance, streetXCBDone, foldToStreetXCBDone, foldToStreetXCBChance
+
+        Continuation Bet chance, action:
+        Had the last bet (initiative) on previous street, got called, close street action
+        Then no bets before the player with initiatives first action on current street
+        ie. if player on street-1 had initiative and no donkbets occurred
+        """
         # XXX: enumerate(list, start=x) is python 2.6 syntax; 'start'
         # came there
         #for i, street in enumerate(hand.actionStreets[2:], start=1):
@@ -280,6 +325,29 @@ class DerivedStats():
                 if chance == True:
                     self.handsplayers[name]['street%dCBDone' % (i+1)] = self.betStreet(hand.actionStreets[i+2], name)
 
+    def calcCheckCallRaise(self, hand):
+        """Fill streetXCheckCallRaiseChance, streetXCheckCallRaiseDone
+
+        streetXCheckCallRaiseChance = got raise/bet after check
+        streetXCheckCallRaiseDone = checked. got raise/bet. didn't fold
+
+        CG: CheckCall would be a much better name for this.
+        """
+        for i, street in enumerate(hand.actionStreets[2:], start=1):
+            actions = hand.actions[hand.actionStreets[i]]
+            checkers = set()
+            initial_raiser = None
+            for action in actions:
+                pname, act = action[0], action[1]
+                if act in ('bets', 'raises') and initial_raiser is None:
+                    initial_raiser = pname
+                elif act == 'check' and initial_raiser is None:
+                    checkers.add(pname)
+                elif initial_raiser is not None and pname in checkers:
+                    hp = self.handplayers_by_name[pname]
+                    setattr(hp, 'street%dCheckCallRaiseChance' % i, True)
+                    setattr(hp, 'street%dCheckCallRaiseDone' % i, act!='folds')
+
     def seen(self, hand, i):
         pas = set()
         for act in hand.actions[hand.actionStreets[i+1]]:
@@ -333,6 +401,27 @@ class DerivedStats():
             players.add(action[0])
         return players
 
+
+    def firstsBetOrRaiser(self, actions):
+        """Returns player name that placed the first bet or raise.
+
+        None if there were no bets or raises on that street
+        """
+        for act in actions:
+            if act[1] in ('bets', 'raises'):
+                return act[0]
+        return None
+
+    def lastBetOrRaiser(self, street):
+        """Returns player name that placed the last bet or raise for that street.
+            None if there were no bets or raises on that street"""
+        lastbet = None
+        for act in self.hand.actions[street]:
+            if act[1] in ('bets', 'raises'):
+                lastbet = act[0]
+        return lastbet
+
+
     def noBetsBefore(self, street, player):
         """Returns true if there were no bets before the specified players turn, false otherwise"""
         betOrRaise = False
@@ -345,6 +434,7 @@ class DerivedStats():
                 break
         return betOrRaise
 
+
     def betStreet(self, street, player):
         """Returns true if player bet/raised the street as their first action"""
         betOrRaise = False
@@ -353,14 +443,4 @@ class DerivedStats():
                 betOrRaise = True
             else:
                 break
-        return betOrRaise
 
-
-    def lastBetOrRaiser(self, street):
-        """Returns player name that placed the last bet or raise for that street.
-            None if there were no bets or raises on that street"""
-        lastbet = None
-        for act in self.hand.actions[street]:
-            if act[1] in ('bets', 'raises'):
-                lastbet = act[0]
-        return lastbet

From a2d0657b3a2d3c2069a1f135d13a969f18852868 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Wed, 23 Dec 2009 13:56:18 +0800
Subject: [PATCH 031/320] [NEWIMPORT] Remove unused functions

Move old HudCache update over in preparation for fixing
---
 pyfpdb/Database.py | 679 ++++++++-------------------------------------
 1 file changed, 119 insertions(+), 560 deletions(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index 412036ab..9614084f 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -1490,532 +1490,11 @@ class Database:
         c = self.get_cursor()
         c.executemany(q, inserts)
 
-    def storeHudCacheNew(self, gid, pid, hc):
-        q = """INSERT INTO HudCache (
-            gametypeId,
-            playerId
-           )
-           VALUES (
-                %s, %s
-            )"""
-
-#            gametypeId,
-#            playerId,
-#            activeSeats,
-#            position,
-#            tourneyTypeId,
-#            styleKey,
-#            HDs,
-#            street0VPI,
-#            street0Aggr,
-#            street0_3BChance,
-#            street0_3BDone,
-#            street1Seen,
-#            street2Seen,
-#            street3Seen,
-#            street4Seen,
-#            sawShowdown,
-#            street1Aggr,
-#            street2Aggr,
-#            street3Aggr,
-#            street4Aggr,
-#            otherRaisedStreet1,
-#            otherRaisedStreet2,
-#            otherRaisedStreet3,
-#            otherRaisedStreet4,
-#            foldToOtherRaisedStreet1,
-#            foldToOtherRaisedStreet2,
-#            foldToOtherRaisedStreet3,
-#            foldToOtherRaisedStreet4,
-#            wonWhenSeenStreet1,
-#            wonAtSD,
-#            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)
-
-        q = q.replace('%s', self.sql.query['placeholder'])
-
-        self.cursor.execute(q, (
-            gid,
-            pid
-        ))
-
-#            gametypeId,
-#            playerId,
-#            activeSeats,
-#            position,
-#            tourneyTypeId,
-#            styleKey,
-#            HDs,
-#            street0VPI,
-#            street0Aggr,
-#            street0_3BChance,
-#            street0_3BDone,
-#            street1Seen,
-#            street2Seen,
-#            street3Seen,
-#            street4Seen,
-#            sawShowdown,
-#            street1Aggr,
-#            street2Aggr,
-#            street3Aggr,
-#            street4Aggr,
-#            otherRaisedStreet1,
-#            otherRaisedStreet2,
-#            otherRaisedStreet3,
-#            otherRaisedStreet4,
-#            foldToOtherRaisedStreet1,
-#            foldToOtherRaisedStreet2,
-#            foldToOtherRaisedStreet3,
-#            foldToOtherRaisedStreet4,
-#            wonWhenSeenStreet1,
-#            wonAtSD,
-#            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)
-
-    def isDuplicate(self, gametypeID, siteHandNo):
-        dup = False
-        c = self.get_cursor()
-        c.execute(self.sql.query['isAlreadyInDB'], (gametypeID, siteHandNo))
-        result = c.fetchall()
-        if len(result) > 0:
-            dup = True
-        return dup
-
-    def getGameTypeId(self, siteid, game):
-        c = self.get_cursor()
-        #FIXME: Fixed for NL at the moment
-        c.execute(self.sql.query['getGametypeNL'], (siteid, game['type'], game['category'], game['limitType'], 
-                        int(Decimal(game['sb'])*100), int(Decimal(game['bb'])*100)))
-        tmp = c.fetchone()
-        if (tmp == None):
-            hilo = "h"
-            if game['category'] in ['studhilo', 'omahahilo']:
-                hilo = "s"
-            elif game['category'] in ['razz','27_3draw','badugi']:
-                hilo = "l"
-            tmp  = self.insertGameTypes( (siteid, game['type'], game['base'], game['category'], game['limitType'], hilo,
-                                    int(Decimal(game['sb'])*100), int(Decimal(game['bb'])*100), 0, 0) )
-        return tmp[0]
-
-    def getSqlPlayerIDs(self, pnames, siteid):
-        result = {}
-        if(self.pcache == None):
-            self.pcache = LambdaDict(lambda  key:self.insertPlayer(key, siteid))
- 
-        for player in pnames:
-            result[player] = self.pcache[player]
-            # NOTE: Using the LambdaDict does the same thing as:
-            #if player in self.pcache:
-            #    #print "DEBUG: cachehit"
-            #    pass
-            #else:
-            #    self.pcache[player] = self.insertPlayer(player, siteid)
-            #result[player] = self.pcache[player]
-
-        return result
-
-    def insertPlayer(self, name, site_id):
-        result = None
-        c = self.get_cursor()
-        q = "SELECT name, id FROM Players WHERE siteid=%s and name=%s"
-        q = q.replace('%s', self.sql.query['placeholder'])
-
-        #NOTE/FIXME?: MySQL has ON DUPLICATE KEY UPDATE
-        #Usage:
-        #        INSERT INTO `tags` (`tag`, `count`)
-        #         VALUES ($tag, 1)
-        #           ON DUPLICATE KEY UPDATE `count`=`count`+1;
-
-
-        #print "DEBUG: name: %s site: %s" %(name, site_id)
-
-        c.execute (q, (site_id, name))
-
-        tmp = c.fetchone()
-        if (tmp == None): #new player
-            c.execute ("INSERT INTO Players (name, siteId) VALUES (%s, %s)".replace('%s',self.sql.query['placeholder'])
-                      ,(name, site_id))
-            #Get last id might be faster here.
-            #c.execute ("SELECT id FROM Players WHERE name=%s", (name,))
-            result = self.get_last_insert_id(c)
-        else:
-            result = tmp[1]
-        return result
-
-    def insertGameTypes(self, row):
-        c = self.get_cursor()
-        c.execute( self.sql.query['insertGameTypes'], row )
-        return [self.get_last_insert_id(c)]
-
-
-
-#################################
-# Finish of NEWIMPORT CODE
-#################################
-
-
-
-    def storeHands(self, backend, site_hand_no, gametype_id
-                  ,hand_start_time, names, tableName, maxSeats, hudCache
-                  ,board_values, board_suits):
-
-        cards = [Card.cardFromValueSuit(v,s) for v,s in zip(board_values,board_suits)]
-        #stores into table hands:
-        try:
-            c = self.get_cursor()
-            c.execute ("""INSERT INTO Hands 
-                          (siteHandNo, gametypeId, handStart, seats, tableName, importTime, maxSeats
-                          ,boardcard1,boardcard2,boardcard3,boardcard4,boardcard5
-                          ,playersVpi, playersAtStreet1, playersAtStreet2
-                          ,playersAtStreet3, playersAtStreet4, playersAtShowdown
-                          ,street0Raises, street1Raises, street2Raises
-                          ,street3Raises, street4Raises, street1Pot
-                          ,street2Pot, street3Pot, street4Pot
-                          ,showdownPot
-                          ) 
-                          VALUES 
-                          (%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)
-                       """.replace('%s', self.sql.query['placeholder'])
-                      ,   (site_hand_no, gametype_id, hand_start_time, len(names), tableName, datetime.today(), maxSeats
-                          ,cards[0], cards[1], cards[2], cards[3], cards[4]
-                          ,hudCache['playersVpi'], hudCache['playersAtStreet1'], hudCache['playersAtStreet2']
-                          ,hudCache['playersAtStreet3'], hudCache['playersAtStreet4'], hudCache['playersAtShowdown']
-                          ,hudCache['street0Raises'], hudCache['street1Raises'], hudCache['street2Raises']
-                          ,hudCache['street3Raises'], hudCache['street4Raises'], hudCache['street1Pot']
-                          ,hudCache['street2Pot'], hudCache['street3Pot'], hudCache['street4Pot']
-                          ,hudCache['showdownPot']
-                          ))
-            ret = self.get_last_insert_id(c)
-        except:
-            ret = -1
-            raise FpdbError( "storeHands error: " + str(sys.exc_value) )
-
-        return ret
-    #end def storeHands
-     
-    def store_hands_players_holdem_omaha(self, backend, category, hands_id, player_ids, start_cashes
-                                        ,positions, card_values, card_suits, winnings, rakes, seatNos, hudCache):
-        result=[]
-
-        # postgres (and others?) needs the booleans converted to ints before saving:
-        # (or we could just save them as boolean ... but then we can't sum them so easily in sql ???)
-        # NO - storing booleans for now so don't need this
-        #hudCacheInt = {}
-        #for k,v in hudCache.iteritems():
-        #    if k in ('wonWhenSeenStreet1', 'wonAtSD', 'totalProfit'):
-        #        hudCacheInt[k] = v
-        #    else:
-        #        hudCacheInt[k] = map(lambda x: 1 if x else 0, v)
-
-        try:
-            inserts = []
-            for i in xrange(len(player_ids)):
-                card1 = Card.cardFromValueSuit(card_values[i][0], card_suits[i][0])
-                card2 = Card.cardFromValueSuit(card_values[i][1], card_suits[i][1])
-
-                if (category=="holdem"):
-                    startCards = Card.twoStartCards(card_values[i][0], card_suits[i][0], card_values[i][1], card_suits[i][1])
-                    card3 = None
-                    card4 = None
-                elif (category=="omahahi" or category=="omahahilo"):
-                    startCards = Card.fourStartCards(card_values[i][0], card_suits[i][0], card_values[i][1], card_suits[i][1]
-                                                    ,card_values[i][2], card_suits[i][2], card_values[i][3], card_suits[i][3])
-                    card3 = Card.cardFromValueSuit(card_values[i][2], card_suits[i][2])
-                    card4 = Card.cardFromValueSuit(card_values[i][3], card_suits[i][3])
-                else:
-                    raise FpdbError("invalid category")
-
-                inserts.append( (
-                                 hands_id, player_ids[i], start_cashes[i], positions[i], 1, # tourneytypeid - needed for hudcache
-                                 card1, card2, card3, card4, startCards,
-                                 winnings[i], rakes[i], seatNos[i], hudCache['totalProfit'][i],
-                                 hudCache['street0VPI'][i], hudCache['street0Aggr'][i], 
-                                 hudCache['street0_3BChance'][i], hudCache['street0_3BDone'][i],
-                                 hudCache['street1Seen'][i], hudCache['street2Seen'][i], hudCache['street3Seen'][i], 
-                                 hudCache['street4Seen'][i], hudCache['sawShowdown'][i],
-                                 hudCache['street1Aggr'][i], hudCache['street2Aggr'][i], hudCache['street3Aggr'][i], hudCache['street4Aggr'][i],
-                                 hudCache['otherRaisedStreet1'][i], hudCache['otherRaisedStreet2'][i], 
-                                 hudCache['otherRaisedStreet3'][i], hudCache['otherRaisedStreet4'][i],
-                                 hudCache['foldToOtherRaisedStreet1'][i], hudCache['foldToOtherRaisedStreet2'][i], 
-                                 hudCache['foldToOtherRaisedStreet3'][i], hudCache['foldToOtherRaisedStreet4'][i],
-                                 hudCache['wonWhenSeenStreet1'][i], hudCache['wonAtSD'][i],
-                                 hudCache['stealAttemptChance'][i], hudCache['stealAttempted'][i], hudCache['foldBbToStealChance'][i], 
-                                 hudCache['foldedBbToSteal'][i], hudCache['foldSbToStealChance'][i], hudCache['foldedSbToSteal'][i],
-                                 hudCache['street1CBChance'][i], hudCache['street1CBDone'][i], hudCache['street2CBChance'][i], hudCache['street2CBDone'][i],
-                                 hudCache['street3CBChance'][i], hudCache['street3CBDone'][i], hudCache['street4CBChance'][i], hudCache['street4CBDone'][i],
-                                 hudCache['foldToStreet1CBChance'][i], hudCache['foldToStreet1CBDone'][i], 
-                                 hudCache['foldToStreet2CBChance'][i], hudCache['foldToStreet2CBDone'][i],
-                                 hudCache['foldToStreet3CBChance'][i], hudCache['foldToStreet3CBDone'][i], 
-                                 hudCache['foldToStreet4CBChance'][i], hudCache['foldToStreet4CBDone'][i],
-                                 hudCache['street1CheckCallRaiseChance'][i], hudCache['street1CheckCallRaiseDone'][i], 
-                                 hudCache['street2CheckCallRaiseChance'][i], hudCache['street2CheckCallRaiseDone'][i],
-                                 hudCache['street3CheckCallRaiseChance'][i], hudCache['street3CheckCallRaiseDone'][i], 
-                                 hudCache['street4CheckCallRaiseChance'][i], hudCache['street4CheckCallRaiseDone'][i],
-                                 hudCache['street0Calls'][i], hudCache['street1Calls'][i], hudCache['street2Calls'][i], hudCache['street3Calls'][i], hudCache['street4Calls'][i],
-                                 hudCache['street0Bets'][i], hudCache['street1Bets'][i], hudCache['street2Bets'][i], hudCache['street3Bets'][i], hudCache['street4Bets'][i]
-                                ) )
-            c = self.get_cursor()
-            c.executemany ("""
-        INSERT INTO HandsPlayers
-        (handId, playerId, startCash, position,  tourneyTypeId,
-         card1, card2, card3, card4, startCards, winnings, rake, seatNo, totalProfit,
-         street0VPI, street0Aggr, street0_3BChance, street0_3BDone,
-         street1Seen, street2Seen, street3Seen, street4Seen, sawShowdown,
-         street1Aggr, street2Aggr, street3Aggr, street4Aggr,
-         otherRaisedStreet1, otherRaisedStreet2, otherRaisedStreet3, otherRaisedStreet4,
-         foldToOtherRaisedStreet1, foldToOtherRaisedStreet2, foldToOtherRaisedStreet3, foldToOtherRaisedStreet4,
-         wonWhenSeenStreet1, wonAtSD,
-         stealAttemptChance, stealAttempted, foldBbToStealChance, foldedBbToSteal, foldSbToStealChance, foldedSbToSteal,
-         street1CBChance, street1CBDone, street2CBChance, street2CBDone,
-         street3CBChance, street3CBDone, street4CBChance, street4CBDone,
-         foldToStreet1CBChance, foldToStreet1CBDone, foldToStreet2CBChance, foldToStreet2CBDone,
-         foldToStreet3CBChance, foldToStreet3CBDone, foldToStreet4CBChance, foldToStreet4CBDone,
-         street1CheckCallRaiseChance, street1CheckCallRaiseDone, street2CheckCallRaiseChance, street2CheckCallRaiseDone,
-         street3CheckCallRaiseChance, street3CheckCallRaiseDone, street4CheckCallRaiseChance, street4CheckCallRaiseDone,
-         street0Calls, street1Calls, street2Calls, street3Calls, street4Calls, 
-         street0Bets, street1Bets, street2Bets, street3Bets, street4Bets
-        )
-        VALUES (%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, %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)""".replace('%s', self.sql.query['placeholder'])
-                                          ,inserts )
-            result.append( self.get_last_insert_id(c) ) # wrong? not used currently
-        except:
-            raise FpdbError( "store_hands_players_holdem_omaha error: " + str(sys.exc_value) )
-
-        return result
-    #end def store_hands_players_holdem_omaha
-
-    def store_hands_players_stud(self, backend, hands_id, player_ids, start_cashes, antes,
-                                 card_values, card_suits, winnings, rakes, seatNos):
-        #stores hands_players rows for stud/razz games. returns an array of the resulting IDs
-
-        try:
-            result=[]
-            #print "before inserts in store_hands_players_stud, antes:", antes
-            for i in xrange(len(player_ids)):
-                card1 = Card.cardFromValueSuit(card_values[i][0], card_suits[i][0])
-                card2 = Card.cardFromValueSuit(card_values[i][1], card_suits[i][1])
-                card3 = Card.cardFromValueSuit(card_values[i][2], card_suits[i][2])
-                card4 = Card.cardFromValueSuit(card_values[i][3], card_suits[i][3])
-                card5 = Card.cardFromValueSuit(card_values[i][4], card_suits[i][4])
-                card6 = Card.cardFromValueSuit(card_values[i][5], card_suits[i][5])
-                card7 = Card.cardFromValueSuit(card_values[i][6], card_suits[i][6])
-
-                c = self.get_cursor()
-                c.execute ("""INSERT INTO HandsPlayers
-        (handId, playerId, startCash, ante, tourneyTypeId,
-        card1, card2,
-        card3, card4,
-        card5, card6,
-        card7, winnings, rake, seatNo)
-        VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)""".replace('%s', self.sql.query['placeholder']),
-                (hands_id, player_ids[i], start_cashes[i], antes[i], 1, 
-                card1, card2,
-                card3, card4,
-                card5, card6,
-                card7, winnings[i], rakes[i], seatNos[i]))
-                #cursor.execute("SELECT id FROM HandsPlayers WHERE handId=%s AND playerId+0=%s", (hands_id, player_ids[i]))
-                #result.append(cursor.fetchall()[0][0])
-                result.append( self.get_last_insert_id(c) )
-        except:
-            raise FpdbError( "store_hands_players_stud error: " + str(sys.exc_value) )
-
-        return result
-    #end def store_hands_players_stud
-     
-    def store_hands_players_holdem_omaha_tourney(self, backend, category, hands_id, player_ids
-                                                ,start_cashes, positions, card_values, card_suits
-                                                ,winnings, rakes, seatNos, tourneys_players_ids
-                                                ,hudCache, tourneyTypeId):
-        #stores hands_players for tourney holdem/omaha hands
-
-        try:
-            result=[]
-            inserts = []
-            for i in xrange(len(player_ids)):
-                card1 = Card.cardFromValueSuit(card_values[i][0], card_suits[i][0])
-                card2 = Card.cardFromValueSuit(card_values[i][1], card_suits[i][1])
-
-                if len(card_values[0])==2:
-                    startCards = Card.twoStartCards(card_values[i][0], card_suits[i][0], card_values[i][1], card_suits[i][1])
-                    card3 = None
-                    card4 = None
-                elif len(card_values[0])==4:
-                    startCards = Card.fourStartCards(card_values[i][0], card_suits[i][0], card_values[i][1], card_suits[i][1]
-                                                    ,card_values[i][2], card_suits[i][2], card_values[i][3], card_suits[i][3])
-                    card3 = Card.cardFromValueSuit(card_values[i][2], card_suits[i][2])
-                    card4 = Card.cardFromValueSuit(card_values[i][3], card_suits[i][3])
-                else:
-                    raise FpdbError ("invalid card_values length:"+str(len(card_values[0])))
-
-                inserts.append( (hands_id, player_ids[i], start_cashes[i], positions[i], tourneyTypeId,
-                                 card1, card2, card3, card4, startCards,
-                                 winnings[i], rakes[i], tourneys_players_ids[i], seatNos[i], hudCache['totalProfit'][i],
-                                 hudCache['street0VPI'][i], hudCache['street0Aggr'][i], 
-                                 hudCache['street0_3BChance'][i], hudCache['street0_3BDone'][i],
-                                 hudCache['street1Seen'][i], hudCache['street2Seen'][i], hudCache['street3Seen'][i], 
-                                 hudCache['street4Seen'][i], hudCache['sawShowdown'][i],
-                                 hudCache['street1Aggr'][i], hudCache['street2Aggr'][i], hudCache['street3Aggr'][i], hudCache['street4Aggr'][i],
-                                 hudCache['otherRaisedStreet1'][i], hudCache['otherRaisedStreet2'][i], 
-                                 hudCache['otherRaisedStreet3'][i], hudCache['otherRaisedStreet4'][i],
-                                 hudCache['foldToOtherRaisedStreet1'][i], hudCache['foldToOtherRaisedStreet2'][i], 
-                                 hudCache['foldToOtherRaisedStreet3'][i], hudCache['foldToOtherRaisedStreet4'][i],
-                                 hudCache['wonWhenSeenStreet1'][i], hudCache['wonAtSD'][i],
-                                 hudCache['stealAttemptChance'][i], hudCache['stealAttempted'][i], hudCache['foldBbToStealChance'][i], 
-                                 hudCache['foldedBbToSteal'][i], hudCache['foldSbToStealChance'][i], hudCache['foldedSbToSteal'][i],
-                                 hudCache['street1CBChance'][i], hudCache['street1CBDone'][i], hudCache['street2CBChance'][i], hudCache['street2CBDone'][i],
-                                 hudCache['street3CBChance'][i], hudCache['street3CBDone'][i], hudCache['street4CBChance'][i], hudCache['street4CBDone'][i],
-                                 hudCache['foldToStreet1CBChance'][i], hudCache['foldToStreet1CBDone'][i], 
-                                 hudCache['foldToStreet2CBChance'][i], hudCache['foldToStreet2CBDone'][i],
-                                 hudCache['foldToStreet3CBChance'][i], hudCache['foldToStreet3CBDone'][i], 
-                                 hudCache['foldToStreet4CBChance'][i], hudCache['foldToStreet4CBDone'][i],
-                                 hudCache['street1CheckCallRaiseChance'][i], hudCache['street1CheckCallRaiseDone'][i], 
-                                 hudCache['street2CheckCallRaiseChance'][i], hudCache['street2CheckCallRaiseDone'][i],
-                                 hudCache['street3CheckCallRaiseChance'][i], hudCache['street3CheckCallRaiseDone'][i], 
-                                 hudCache['street4CheckCallRaiseChance'][i], hudCache['street4CheckCallRaiseDone'][i],
-                                 hudCache['street0Calls'][i], hudCache['street1Calls'][i], hudCache['street2Calls'][i], 
-                                 hudCache['street3Calls'][i], hudCache['street4Calls'][i],
-                                 hudCache['street0Bets'][i], hudCache['street1Bets'][i], hudCache['street2Bets'][i], 
-                                 hudCache['street3Bets'][i], hudCache['street4Bets'][i]
-                                ) )
-
-            c = self.get_cursor()
-            c.executemany ("""
-        INSERT INTO HandsPlayers
-        (handId, playerId, startCash, position, tourneyTypeId,
-         card1, card2, card3, card4, startCards, winnings, rake, tourneysPlayersId, seatNo, totalProfit,
-         street0VPI, street0Aggr, street0_3BChance, street0_3BDone,
-         street1Seen, street2Seen, street3Seen, street4Seen, sawShowdown,
-         street1Aggr, street2Aggr, street3Aggr, street4Aggr,
-         otherRaisedStreet1, otherRaisedStreet2, otherRaisedStreet3, otherRaisedStreet4,
-         foldToOtherRaisedStreet1, foldToOtherRaisedStreet2, foldToOtherRaisedStreet3, foldToOtherRaisedStreet4,
-         wonWhenSeenStreet1, wonAtSD,
-         stealAttemptChance, stealAttempted, foldBbToStealChance, foldedBbToSteal, foldSbToStealChance, foldedSbToSteal,
-         street1CBChance, street1CBDone, street2CBChance, street2CBDone,
-         street3CBChance, street3CBDone, street4CBChance, street4CBDone,
-         foldToStreet1CBChance, foldToStreet1CBDone, foldToStreet2CBChance, foldToStreet2CBDone,
-         foldToStreet3CBChance, foldToStreet3CBDone, foldToStreet4CBChance, foldToStreet4CBDone,
-         street1CheckCallRaiseChance, street1CheckCallRaiseDone, street2CheckCallRaiseChance, street2CheckCallRaiseDone,
-         street3CheckCallRaiseChance, street3CheckCallRaiseDone, street4CheckCallRaiseChance, street4CheckCallRaiseDone,
-         street0Calls, street1Calls, street2Calls, street3Calls, street4Calls, 
-         street0Bets, street1Bets, street2Bets, street3Bets, street4Bets
-        )
-        VALUES 
-        (%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, %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)""".replace('%s', self.sql.query['placeholder'])
-                                          ,inserts )
-
-            result.append( self.get_last_insert_id(c) )
-            #cursor.execute("SELECT id FROM HandsPlayers WHERE handId=%s AND playerId+0=%s", (hands_id, player_ids[i]))
-            #result.append(cursor.fetchall()[0][0])
-        except:
-            err = traceback.extract_tb(sys.exc_info()[2])[-1]
-            print "***Error storing hand: "+err[2]+"("+str(err[1])+"): "+str(sys.exc_info()[1])
-            raise FpdbError( "store_hands_players_holdem_omaha_tourney error: " + str(sys.exc_value) )
-        
-        return result
-    #end def store_hands_players_holdem_omaha_tourney
-     
-    def store_hands_players_stud_tourney(self, backend, hands_id, player_ids, start_cashes,
-                antes, card_values, card_suits, winnings, rakes, seatNos, tourneys_players_ids, tourneyTypeId):
-        #stores hands_players for tourney stud/razz hands
-        return # TODO: stubbed out until someone updates it for current database structuring
-        try:
-            result=[]
-            for i in xrange(len(player_ids)):
-                c = self.get_cursor()
-                c.execute ("""INSERT INTO HandsPlayers
-        (handId, playerId, startCash, ante,
-        card1Value, card1Suit, card2Value, card2Suit,
-        card3Value, card3Suit, card4Value, card4Suit,
-        card5Value, card5Suit, card6Value, card6Suit,
-        card7Value, card7Suit, winnings, rake, tourneysPlayersId, seatNo, tourneyTypeId)
-        VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s,
-        %s, %s, %s, %s, %s, %s, %s)""".replace('%s', self.sql.query['placeholder']),
-                (hands_id, player_ids[i], start_cashes[i], antes[i],
-                card_values[i][0], card_suits[i][0], card_values[i][1], card_suits[i][1],
-                card_values[i][2], card_suits[i][2], card_values[i][3], card_suits[i][3],
-                card_values[i][4], card_suits[i][4], card_values[i][5], card_suits[i][5],
-                card_values[i][6], card_suits[i][6], winnings[i], rakes[i], tourneys_players_ids[i], seatNos[i], tourneyTypeId))
-                #cursor.execute("SELECT id FROM HandsPlayers WHERE handId=%s AND playerId+0=%s", (hands_id, player_ids[i]))
-                #result.append(cursor.fetchall()[0][0])
-                result.append( self.get_last_insert_id(c) )
-        except:
-            raise FpdbError( "store_hands_players_stud_tourney error: " + str(sys.exc_value) )
-        
-        return result
-    #end def store_hands_players_stud_tourney
- 
-    def storeHudCache(self, backend, base, category, gametypeId, hand_start_time, playerIds, hudImportData):
+    def storeHudCache(self, gid, pid, hc):
         """Update cached statistics. If update fails because no record exists, do an insert.
            Can't use array updates here (not easily anyway) because we need to insert any rows
            that don't get updated."""
 
-        # if (category=="holdem" or category=="omahahi" or category=="omahahilo"):
-        try:
             if self.use_date_in_hudcache:
                 #print "key =", "d%02d%02d%02d " % (hand_start_time.year-2000, hand_start_time.month, hand_start_time.day)
                 styleKey = "d%02d%02d%02d" % (hand_start_time.year-2000, hand_start_time.month, hand_start_time.day)
@@ -2200,48 +1679,128 @@ class Database:
         # else:
         # print "todo: implement storeHudCache for stud base"
 
-        except:
-            raise FpdbError( "storeHudCache error: " + str(sys.exc_value) )
-        
-    #end def storeHudCache
+    def isDuplicate(self, gametypeID, siteHandNo):
+        dup = False
+        c = self.get_cursor()
+        c.execute(self.sql.query['isAlreadyInDB'], (gametypeID, siteHandNo))
+        result = c.fetchall()
+        if len(result) > 0:
+            dup = True
+        return dup
+
+    def getGameTypeId(self, siteid, game):
+        c = self.get_cursor()
+        #FIXME: Fixed for NL at the moment
+        c.execute(self.sql.query['getGametypeNL'], (siteid, game['type'], game['category'], game['limitType'], 
+                        int(Decimal(game['sb'])*100), int(Decimal(game['bb'])*100)))
+        tmp = c.fetchone()
+        if (tmp == None):
+            hilo = "h"
+            if game['category'] in ['studhilo', 'omahahilo']:
+                hilo = "s"
+            elif game['category'] in ['razz','27_3draw','badugi']:
+                hilo = "l"
+            tmp  = self.insertGameTypes( (siteid, game['type'], game['base'], game['category'], game['limitType'], hilo,
+                                    int(Decimal(game['sb'])*100), int(Decimal(game['bb'])*100), 0, 0) )
+        return tmp[0]
+
+    def getSqlPlayerIDs(self, pnames, siteid):
+        result = {}
+        if(self.pcache == None):
+            self.pcache = LambdaDict(lambda  key:self.insertPlayer(key, siteid))
  
-    def store_tourneys(self, tourneyTypeId, siteTourneyNo, entries, prizepool, startTime):
-        ret = -1
-        try:
-            # try and create tourney record, fetch id if it already exists
-            # avoids race condition when doing the select first
-            cursor = self.get_cursor()
-            cursor.execute("savepoint ins_tourney")
-            cursor.execute("""INSERT INTO Tourneys
-                          (tourneyTypeId, siteTourneyNo, entries, prizepool, startTime)
-                          VALUES (%s, %s, %s, %s, %s)""".replace('%s', self.sql.query['placeholder'])
-                          ,(tourneyTypeId, siteTourneyNo, entries, prizepool, startTime))
-            ret = self.get_last_insert_id(cursor)
-            #print "created new tourneys.id:",ret
-        except:
-            #if   str(sys.exc_value) contains 'sitetourneyno':
-            #    raise FpdbError( "store_tourneys error: " + str(sys.exc_value) )
+        for player in pnames:
+            result[player] = self.pcache[player]
+            # NOTE: Using the LambdaDict does the same thing as:
+            #if player in self.pcache:
+            #    #print "DEBUG: cachehit"
+            #    pass
             #else:
-            #print "error insert tourney (%s) trying select ..." % (str(sys.exc_value),)
-            cursor.execute("rollback to savepoint ins_tourney")
-            try:
-                cursor.execute( "SELECT id FROM Tourneys WHERE siteTourneyNo=%s AND tourneyTypeId+0=%s".replace('%s', self.sql.query['placeholder'])
-                              , (siteTourneyNo, tourneyTypeId) )
-                rec = cursor.fetchone()
-                #print "select tourney result: ", rec
-                try:
-                    len(rec)
-                    ret = rec[0]
-                except:
-                    print "Tourney id not found"
-            except:
-                print "Error selecting tourney id:", str(sys.exc_info()[1])
+            #    self.pcache[player] = self.insertPlayer(player, siteid)
+            #result[player] = self.pcache[player]
+
+        return result
+
+    def insertPlayer(self, name, site_id):
+        result = None
+        c = self.get_cursor()
+        q = "SELECT name, id FROM Players WHERE siteid=%s and name=%s"
+        q = q.replace('%s', self.sql.query['placeholder'])
+
+        #NOTE/FIXME?: MySQL has ON DUPLICATE KEY UPDATE
+        #Usage:
+        #        INSERT INTO `tags` (`tag`, `count`)
+        #         VALUES ($tag, 1)
+        #           ON DUPLICATE KEY UPDATE `count`=`count`+1;
+
+
+        #print "DEBUG: name: %s site: %s" %(name, site_id)
+
+        c.execute (q, (site_id, name))
+
+        tmp = c.fetchone()
+        if (tmp == None): #new player
+            c.execute ("INSERT INTO Players (name, siteId) VALUES (%s, %s)".replace('%s',self.sql.query['placeholder'])
+                      ,(name, site_id))
+            #Get last id might be faster here.
+            #c.execute ("SELECT id FROM Players WHERE name=%s", (name,))
+            result = self.get_last_insert_id(c)
+        else:
+            result = tmp[1]
+        return result
+
+    def insertGameTypes(self, row):
+        c = self.get_cursor()
+        c.execute( self.sql.query['insertGameTypes'], row )
+        return [self.get_last_insert_id(c)]
+
+
+
+#################################
+# Finish of NEWIMPORT CODE
+#################################
+
+
+
+    def storeHands(self, backend, site_hand_no, gametype_id
+                  ,hand_start_time, names, tableName, maxSeats, hudCache
+                  ,board_values, board_suits):
+
+        cards = [Card.cardFromValueSuit(v,s) for v,s in zip(board_values,board_suits)]
+        #stores into table hands:
+        try:
+            c = self.get_cursor()
+            c.execute ("""INSERT INTO Hands 
+                          (siteHandNo, gametypeId, handStart, seats, tableName, importTime, maxSeats
+                          ,boardcard1,boardcard2,boardcard3,boardcard4,boardcard5
+                          ,playersVpi, playersAtStreet1, playersAtStreet2
+                          ,playersAtStreet3, playersAtStreet4, playersAtShowdown
+                          ,street0Raises, street1Raises, street2Raises
+                          ,street3Raises, street4Raises, street1Pot
+                          ,street2Pot, street3Pot, street4Pot
+                          ,showdownPot
+                          ) 
+                          VALUES 
+                          (%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)
+                       """.replace('%s', self.sql.query['placeholder'])
+                      ,   (site_hand_no, gametype_id, hand_start_time, len(names), tableName, datetime.today(), maxSeats
+                          ,cards[0], cards[1], cards[2], cards[3], cards[4]
+                          ,hudCache['playersVpi'], hudCache['playersAtStreet1'], hudCache['playersAtStreet2']
+                          ,hudCache['playersAtStreet3'], hudCache['playersAtStreet4'], hudCache['playersAtShowdown']
+                          ,hudCache['street0Raises'], hudCache['street1Raises'], hudCache['street2Raises']
+                          ,hudCache['street3Raises'], hudCache['street4Raises'], hudCache['street1Pot']
+                          ,hudCache['street2Pot'], hudCache['street3Pot'], hudCache['street4Pot']
+                          ,hudCache['showdownPot']
+                          ))
+            ret = self.get_last_insert_id(c)
+        except:
+            ret = -1
+            raise FpdbError( "storeHands error: " + str(sys.exc_value) )
 
-        cursor.execute("release savepoint ins_tourney")
-        #print "store_tourneys returning", ret
         return ret
-    #end def store_tourneys
-
+    #end def storeHands
+     
     def store_tourneys_players(self, tourney_id, player_ids, payin_amounts, ranks, winnings):
         try:
             result=[]

From a0475aa4db5b9688625ef0d1009ec46b0988f8b3 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Wed, 23 Dec 2009 23:14:34 +0800
Subject: [PATCH 032/320] [NEWIMPORT] Add function to update hudcache for Hand

---
 pyfpdb/Database.py     | 288 +++++++++++++++--------------------------
 pyfpdb/DerivedStats.py |   2 +
 pyfpdb/Hand.py         |   3 +
 pyfpdb/SQL.py          | 141 ++++++++++++++++++++
 pyfpdb/fpdb_import.py  |   7 +-
 5 files changed, 252 insertions(+), 189 deletions(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index 9614084f..0b9cd32d 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -586,6 +586,7 @@ class Database:
                         elif not name.lower() in stat_dict[playerid]:
                             stat_dict[playerid][name.lower()] = val
                         elif name.lower() not in ('hand_id', 'player_id', 'seat', 'screen_name', 'seats'):
+                            #print "DEBUG: stat_dict[%s][%s]: %s" %(playerid, name.lower(), val)
                             stat_dict[playerid][name.lower()] += val
                     n += 1
                     if n >= 10000: break  # todo: don't think this is needed so set nice and high 
@@ -1490,194 +1491,109 @@ class Database:
         c = self.get_cursor()
         c.executemany(q, inserts)
 
-    def storeHudCache(self, gid, pid, hc):
-        """Update cached statistics. If update fails because no record exists, do an insert.
-           Can't use array updates here (not easily anyway) because we need to insert any rows
-           that don't get updated."""
+    def storeHudCache(self, gid, pids, starttime, pdata):
+        """Update cached statistics. If update fails because no record exists, do an insert."""
 
-            if self.use_date_in_hudcache:
-                #print "key =", "d%02d%02d%02d " % (hand_start_time.year-2000, hand_start_time.month, hand_start_time.day)
-                styleKey = "d%02d%02d%02d" % (hand_start_time.year-2000, hand_start_time.month, hand_start_time.day)
-            else:
-                # hard-code styleKey as 'A000000' (all-time cache, no key) for now
-                styleKey = 'A000000'
+        if self.use_date_in_hudcache:
+            styleKey = datetime.strftime(starttime, 'd%y%m%d')
+            #styleKey = "d%02d%02d%02d" % (hand_start_time.year-2000, hand_start_time.month, hand_start_time.day)
+        else:
+            # hard-code styleKey as 'A000000' (all-time cache, no key) for now
+            styleKey = 'A000000'
+
+        update_hudcache = self.sql.query['update_hudcache']
+        update_hudcache = update_hudcache.replace('%s', self.sql.query['placeholder'])
+        insert_hudcache = self.sql.query['insert_hudcache']
+        insert_hudcache = insert_hudcache.replace('%s', self.sql.query['placeholder'])
             
-            #print "storeHudCache, len(playerIds)=", len(playerIds), " len(vpip)=" \
-            #, len(hudImportData['street0VPI']), " len(totprof)=", len(hudImportData['totalProfit'])
-            for player in xrange(len(playerIds)):
-                
-                # Set up a clean row
-                row=[]
-                row.append(0)#blank for id
-                row.append(gametypeId)
-                row.append(playerIds[player])
-                row.append(len(playerIds))#seats
-                for i in xrange(len(hudImportData)+2):
-                    row.append(0)
-                    
-                if base=="hold":
-                    row[4]=hudImportData['position'][player]
-                else:
-                    row[4]=0
-                row[5]=1 #tourneysGametypeId
-                row[6]+=1 #HDs
-                if hudImportData['street0VPI'][player]: row[7]+=1
-                if hudImportData['street0Aggr'][player]: row[8]+=1
-                if hudImportData['street0_3BChance'][player]: row[9]+=1
-                if hudImportData['street0_3BDone'][player]: row[10]+=1
-                if hudImportData['street1Seen'][player]: row[11]+=1
-                if hudImportData['street2Seen'][player]: row[12]+=1
-                if hudImportData['street3Seen'][player]: row[13]+=1
-                if hudImportData['street4Seen'][player]: row[14]+=1
-                if hudImportData['sawShowdown'][player]: row[15]+=1
-                if hudImportData['street1Aggr'][player]: row[16]+=1
-                if hudImportData['street2Aggr'][player]: row[17]+=1
-                if hudImportData['street3Aggr'][player]: row[18]+=1
-                if hudImportData['street4Aggr'][player]: row[19]+=1
-                if hudImportData['otherRaisedStreet1'][player]: row[20]+=1
-                if hudImportData['otherRaisedStreet2'][player]: row[21]+=1
-                if hudImportData['otherRaisedStreet3'][player]: row[22]+=1
-                if hudImportData['otherRaisedStreet4'][player]: row[23]+=1
-                if hudImportData['foldToOtherRaisedStreet1'][player]: row[24]+=1
-                if hudImportData['foldToOtherRaisedStreet2'][player]: row[25]+=1
-                if hudImportData['foldToOtherRaisedStreet3'][player]: row[26]+=1
-                if hudImportData['foldToOtherRaisedStreet4'][player]: row[27]+=1
-                if hudImportData['wonWhenSeenStreet1'][player]!=0.0: row[28]+=hudImportData['wonWhenSeenStreet1'][player]
-                if hudImportData['wonAtSD'][player]!=0.0: row[29]+=hudImportData['wonAtSD'][player]
-                if hudImportData['stealAttemptChance'][player]: row[30]+=1
-                if hudImportData['stealAttempted'][player]: row[31]+=1
-                if hudImportData['foldBbToStealChance'][player]: row[32]+=1
-                if hudImportData['foldedBbToSteal'][player]: row[33]+=1
-                if hudImportData['foldSbToStealChance'][player]: row[34]+=1
-                if hudImportData['foldedSbToSteal'][player]: row[35]+=1
-                
-                if hudImportData['street1CBChance'][player]: row[36]+=1
-                if hudImportData['street1CBDone'][player]: row[37]+=1
-                if hudImportData['street2CBChance'][player]: row[38]+=1
-                if hudImportData['street2CBDone'][player]: row[39]+=1
-                if hudImportData['street3CBChance'][player]: row[40]+=1
-                if hudImportData['street3CBDone'][player]: row[41]+=1
-                if hudImportData['street4CBChance'][player]: row[42]+=1
-                if hudImportData['street4CBDone'][player]: row[43]+=1
-                
-                if hudImportData['foldToStreet1CBChance'][player]: row[44]+=1
-                if hudImportData['foldToStreet1CBDone'][player]: row[45]+=1
-                if hudImportData['foldToStreet2CBChance'][player]: row[46]+=1
-                if hudImportData['foldToStreet2CBDone'][player]: row[47]+=1
-                if hudImportData['foldToStreet3CBChance'][player]: row[48]+=1
-                if hudImportData['foldToStreet3CBDone'][player]: row[49]+=1
-                if hudImportData['foldToStreet4CBChance'][player]: row[50]+=1
-                if hudImportData['foldToStreet4CBDone'][player]: row[51]+=1
-     
-                #print "player=", player
-                #print "len(totalProfit)=", len(hudImportData['totalProfit'])
-                if hudImportData['totalProfit'][player]:
-                    row[52]+=hudImportData['totalProfit'][player]
-     
-                if hudImportData['street1CheckCallRaiseChance'][player]: row[53]+=1
-                if hudImportData['street1CheckCallRaiseDone'][player]: row[54]+=1
-                if hudImportData['street2CheckCallRaiseChance'][player]: row[55]+=1
-                if hudImportData['street2CheckCallRaiseDone'][player]: row[56]+=1
-                if hudImportData['street3CheckCallRaiseChance'][player]: row[57]+=1
-                if hudImportData['street3CheckCallRaiseDone'][player]: row[58]+=1
-                if hudImportData['street4CheckCallRaiseChance'][player]: row[59]+=1
-                if hudImportData['street4CheckCallRaiseDone'][player]: row[60]+=1
-                
-                # Try to do the update first:
-                cursor = self.get_cursor()
-                num = cursor.execute("""UPDATE HudCache
-    SET HDs=HDs+%s, street0VPI=street0VPI+%s, street0Aggr=street0Aggr+%s,
-        street0_3BChance=street0_3BChance+%s, street0_3BDone=street0_3BDone+%s,
-        street1Seen=street1Seen+%s, street2Seen=street2Seen+%s, street3Seen=street3Seen+%s,
-        street4Seen=street4Seen+%s, sawShowdown=sawShowdown+%s,
-        street1Aggr=street1Aggr+%s, street2Aggr=street2Aggr+%s, street3Aggr=street3Aggr+%s,
-        street4Aggr=street4Aggr+%s, otherRaisedStreet1=otherRaisedStreet1+%s,
-        otherRaisedStreet2=otherRaisedStreet2+%s, otherRaisedStreet3=otherRaisedStreet3+%s,
-        otherRaisedStreet4=otherRaisedStreet4+%s,
-        foldToOtherRaisedStreet1=foldToOtherRaisedStreet1+%s, foldToOtherRaisedStreet2=foldToOtherRaisedStreet2+%s,
-        foldToOtherRaisedStreet3=foldToOtherRaisedStreet3+%s, foldToOtherRaisedStreet4=foldToOtherRaisedStreet4+%s,
-        wonWhenSeenStreet1=wonWhenSeenStreet1+%s, wonAtSD=wonAtSD+%s, stealAttemptChance=stealAttemptChance+%s,
-        stealAttempted=stealAttempted+%s, foldBbToStealChance=foldBbToStealChance+%s,
-        foldedBbToSteal=foldedBbToSteal+%s,
-        foldSbToStealChance=foldSbToStealChance+%s, foldedSbToSteal=foldedSbToSteal+%s,
-        street1CBChance=street1CBChance+%s, street1CBDone=street1CBDone+%s, street2CBChance=street2CBChance+%s,
-        street2CBDone=street2CBDone+%s, street3CBChance=street3CBChance+%s,
-        street3CBDone=street3CBDone+%s, street4CBChance=street4CBChance+%s, street4CBDone=street4CBDone+%s,
-        foldToStreet1CBChance=foldToStreet1CBChance+%s, foldToStreet1CBDone=foldToStreet1CBDone+%s,
-        foldToStreet2CBChance=foldToStreet2CBChance+%s, foldToStreet2CBDone=foldToStreet2CBDone+%s,
-        foldToStreet3CBChance=foldToStreet3CBChance+%s,
-        foldToStreet3CBDone=foldToStreet3CBDone+%s, foldToStreet4CBChance=foldToStreet4CBChance+%s,
-        foldToStreet4CBDone=foldToStreet4CBDone+%s, totalProfit=totalProfit+%s,
-        street1CheckCallRaiseChance=street1CheckCallRaiseChance+%s,
-        street1CheckCallRaiseDone=street1CheckCallRaiseDone+%s, street2CheckCallRaiseChance=street2CheckCallRaiseChance+%s,
-        street2CheckCallRaiseDone=street2CheckCallRaiseDone+%s, street3CheckCallRaiseChance=street3CheckCallRaiseChance+%s,
-        street3CheckCallRaiseDone=street3CheckCallRaiseDone+%s, street4CheckCallRaiseChance=street4CheckCallRaiseChance+%s,
-        street4CheckCallRaiseDone=street4CheckCallRaiseDone+%s
-    WHERE gametypeId+0=%s 
-    AND   playerId=%s 
-    AND   activeSeats=%s 
-    AND   position=%s 
-    AND   tourneyTypeId+0=%s
-    AND   styleKey=%s
-                                     """.replace('%s', self.sql.query['placeholder'])
-                                    ,(row[6], row[7], row[8], row[9], row[10],
-                                      row[11], row[12], row[13], row[14], row[15],
-                                      row[16], row[17], row[18], row[19], row[20],
-                                      row[21], row[22], row[23], row[24], row[25],
-                                      row[26], row[27], row[28], row[29], row[30],
-                                      row[31], row[32], row[33], row[34], row[35],
-                                      row[36], row[37], row[38], row[39], row[40],
-                                      row[41], row[42], row[43], row[44], row[45],
-                                      row[46], row[47], row[48], row[49], row[50],
-                                      row[51], row[52], row[53], row[54], row[55],
-                                      row[56], row[57], row[58], row[59], row[60],
-                                      row[1], row[2], row[3], str(row[4]), row[5], styleKey))
-                # Test statusmessage to see if update worked, do insert if not
-                #print "storehud2, upd num =", num.rowcount
-                # num is a cursor in sqlite
-                if (   (backend == self.PGSQL and cursor.statusmessage != "UPDATE 1")
-                    or (backend == self.MYSQL_INNODB and num == 0) 
-                    or (backend == self.SQLITE and num.rowcount == 0) 
-                   ):
-                    #print "playerid before insert:",row[2]," num = ", num
-                    num = cursor.execute("""INSERT INTO HudCache
-    (gametypeId, playerId, activeSeats, position, tourneyTypeId, styleKey,
-    HDs, street0VPI, street0Aggr, street0_3BChance, street0_3BDone,
-    street1Seen, street2Seen, street3Seen, street4Seen, sawShowdown,
-    street1Aggr, street2Aggr, street3Aggr, street4Aggr, otherRaisedStreet1,
-    otherRaisedStreet2, otherRaisedStreet3, otherRaisedStreet4, foldToOtherRaisedStreet1, foldToOtherRaisedStreet2,
-    foldToOtherRaisedStreet3, foldToOtherRaisedStreet4, wonWhenSeenStreet1, wonAtSD, 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)
-    VALUES (%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,
-    %s, %s, %s, %s, %s,
-    %s, %s, %s, %s, %s,
-    %s, %s, %s, %s, %s,
-    %s, %s, %s, %s, %s)""".replace('%s', self.sql.query['placeholder'])
-                                  , (row[1], row[2], row[3], row[4], row[5], styleKey, row[6], row[7], row[8], row[9], row[10]
-                                    ,row[11], row[12], row[13], row[14], row[15], row[16], row[17], row[18], row[19], row[20]
-                                    ,row[21], row[22], row[23], row[24], row[25], row[26], row[27], row[28], row[29], row[30]
-                                    ,row[31], row[32], row[33], row[34], row[35], row[36], row[37], row[38], row[39], row[40]
-                                    ,row[41], row[42], row[43], row[44], row[45], row[46], row[47], row[48], row[49], row[50]
-                                    ,row[51], row[52], row[53], row[54], row[55], row[56], row[57], row[58], row[59], row[60]) )
-                    #print "hopefully inserted hud data line: ", cursor.rowcount
-                    # message seems to be "INSERT 0 1"
-                else:
-                    #print "updated(2) hud data line"
-                    pass
-        # else:
-        # print "todo: implement storeHudCache for stud base"
+        #print "DEBUG: %s %s %s" %(hid, pids, pdata)
+        inserts = []
+        for p in pdata:
+            line = [0]*61
+            
+            line[0] = 1 # HDs
+            if pdata[p]['street0VPI']:                  line[1] = 1
+            if pdata[p]['street0Aggr']:                 line[2] = 1
+            if pdata[p]['street0_3BChance']:            line[3] = 1
+            if pdata[p]['street0_3BDone']:              line[4] = 1
+            if pdata[p]['street1Seen']:                 line[5] = 1
+            if pdata[p]['street2Seen']:                 line[6] = 1
+            if pdata[p]['street3Seen']:                 line[7] = 1
+            if pdata[p]['street4Seen']:                 line[8] = 1
+            if pdata[p]['sawShowdown']:                 line[9] = 1
+            if pdata[p]['street1Aggr']:                 line[10] = 1
+            if pdata[p]['street2Aggr']:                 line[11] = 1
+            if pdata[p]['street3Aggr']:                 line[12] = 1
+            if pdata[p]['street4Aggr']:                 line[13] = 1
+            if pdata[p]['otherRaisedStreet1']:          line[14] = 1
+            if pdata[p]['otherRaisedStreet2']:          line[15] = 1
+            if pdata[p]['otherRaisedStreet3']:          line[16] = 1
+            if pdata[p]['otherRaisedStreet4']:          line[17] = 1
+            if pdata[p]['foldToOtherRaisedStreet1']:    line[18] = 1
+            if pdata[p]['foldToOtherRaisedStreet2']:    line[19] = 1
+            if pdata[p]['foldToOtherRaisedStreet3']:    line[20] = 1
+            if pdata[p]['foldToOtherRaisedStreet4']:    line[21] = 1
+            line[22] = pdata[p]['wonWhenSeenStreet1']
+            line[23] = pdata[p]['wonAtSD']
+            if pdata[p]['stealAttemptChance']:          line[24] = 1
+            if pdata[p]['stealAttempted']:              line[25] = 1
+            if pdata[p]['foldBbToStealChance']:         line[26] = 1
+            if pdata[p]['foldedBbToSteal']:             line[27] = 1
+            if pdata[p]['foldSbToStealChance']:         line[28] = 1
+            if pdata[p]['foldedSbToSteal']:             line[29] = 1
+            if pdata[p]['street1CBChance']:             line[30] = 1
+            if pdata[p]['street1CBDone']:               line[31] = 1
+            if pdata[p]['street2CBChance']:             line[32] = 1
+            if pdata[p]['street2CBDone']:               line[33] = 1
+            if pdata[p]['street3CBChance']:             line[34] = 1
+            if pdata[p]['street3CBDone']:               line[35] = 1
+            if pdata[p]['street4CBChance']:             line[36] = 1
+            if pdata[p]['street4CBDone']:               line[37] = 1
+            if pdata[p]['foldToStreet1CBChance']:       line[38] = 1
+            if pdata[p]['foldToStreet1CBDone']:         line[39] = 1
+            if pdata[p]['foldToStreet2CBChance']:       line[40] = 1
+            if pdata[p]['foldToStreet2CBDone']:         line[41] = 1
+            if pdata[p]['foldToStreet3CBChance']:       line[42] = 1
+            if pdata[p]['foldToStreet3CBDone']:         line[43] = 1
+            if pdata[p]['foldToStreet4CBChance']:       line[44] = 1
+            if pdata[p]['foldToStreet4CBDone']:         line[45] = 1
+            line[46] = pdata[p]['totalProfit']
+            if pdata[p]['street1CheckCallRaiseChance']: line[47] = 1
+            if pdata[p]['street1CheckCallRaiseDone']:   line[48] = 1
+            if pdata[p]['street2CheckCallRaiseChance']: line[49] = 1
+            if pdata[p]['street2CheckCallRaiseDone']:   line[50] = 1
+            if pdata[p]['street3CheckCallRaiseChance']: line[51] = 1
+            if pdata[p]['street3CheckCallRaiseDone']:   line[52] = 1
+            if pdata[p]['street4CheckCallRaiseChance']: line[53] = 1
+            if pdata[p]['street4CheckCallRaiseDone']:   line[54] = 1
+            line[55] = gid    # gametypeId
+            line[56] = pids[p]    # playerId
+            line[57] = len(pids)    # activeSeats
+            line[58] = pdata[p]['position']
+            line[59] = pdata[p]['tourneyTypeId']
+            line[60] = styleKey    # styleKey
+            inserts.append(line)
+
+
+        cursor = self.get_cursor()
+
+        for row in inserts:
+            # Try to do the update first:
+            num = cursor.execute(update_hudcache, row)
+           # Test statusmessage to see if update worked, do insert if not
+           # num is a cursor in sqlite
+            if ((self.backend == self.PGSQL and cursor.statusmessage != "UPDATE 1")
+                    or (self.backend == self.MYSQL_INNODB and num == 0) 
+                    or (self.backend == self.SQLITE and num.rowcount == 0)):
+                #move the last 6 items in WHERE clause of row from the end of the array
+                # to the beginning for the INSERT statement
+                print "DEBUG: using INSERT: %s" % num
+                row = row[-6:] + row[:-6]
+                num = cursor.execute(insert_hudcache, row)
+                print "DEBUG: Successfully(?: %s) updated HudCacho using INSERT" % num
+            else:
+                print "DEBUG: Successfully updated HudCacho using UPDATE"
+                pass
 
     def isDuplicate(self, gametypeID, siteHandNo):
         dup = False
diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py
index c87e714a..1e81dd8d 100644
--- a/pyfpdb/DerivedStats.py
+++ b/pyfpdb/DerivedStats.py
@@ -201,6 +201,7 @@ class DerivedStats():
         #  2 Hijack
 
     def assembleHudCache(self, hand):
+        # No real work to be done - HandsPlayers data already contains the correct info
         pass
 
     def vpip(self, hand):
@@ -443,4 +444,5 @@ class DerivedStats():
                 betOrRaise = True
             else:
                 break
+        return betOrRaise
 
diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 3467216a..a660b56d 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -232,6 +232,9 @@ db: a connected fpdb_db object"""
             #Raise Duplicate exception?
             pass
 
+    def updateHudCache(self, db):
+        db.storeHudCache(self.dbid_gt, self.dbid_pids, self.starttime, self.stats.getHandsPlayers())
+
     def select(self, handId):
         """ Function to create Hand object from database """
 
diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py
index 56c1f388..2b19b04a 100644
--- a/pyfpdb/SQL.py
+++ b/pyfpdb/SQL.py
@@ -3088,6 +3088,147 @@ class Sql:
                         ,'d' || substr(strftime('%Y%m%d', h.handStart),3,7)
 """
 
+        self.query['insert_hudcache'] = """
+            INSERT INTO HudCache (
+                gametypeId,
+                playerId,
+                activeSeats,
+                position,
+                tourneyTypeId,
+                styleKey,
+                HDs,
+                street0VPI,
+                street0Aggr,
+                street0_3BChance,
+                street0_3BDone,
+                street1Seen,
+                street2Seen,
+                street3Seen,
+                street4Seen,
+                sawShowdown,
+                street1Aggr,
+                street2Aggr,
+                street3Aggr,
+                street4Aggr,
+                otherRaisedStreet1,
+                otherRaisedStreet2,
+                otherRaisedStreet3,
+                otherRaisedStreet4,
+                foldToOtherRaisedStreet1,
+                foldToOtherRaisedStreet2,
+                foldToOtherRaisedStreet3,
+                foldToOtherRaisedStreet4,
+                wonWhenSeenStreet1,
+                wonAtSD,
+                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)
+            VALUES (%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, %s, %s, %s, %s,
+                    %s, %s, %s, %s, %s,
+                    %s, %s, %s, %s, %s,
+                    %s, %s, %s, %s, %s,
+                    %s)"""
+
+        self.query['update_hudcache'] = """
+            UPDATE HudCache SET
+            HDs=HDs+%s,
+            street0VPI=street0VPI+%s,
+            street0Aggr=street0Aggr+%s,
+            street0_3BChance=street0_3BChance+%s,
+            street0_3BDone=street0_3BDone+%s,
+            street1Seen=street1Seen+%s,
+            street2Seen=street2Seen+%s,
+            street3Seen=street3Seen+%s,
+            street4Seen=street4Seen+%s,
+            sawShowdown=sawShowdown+%s,
+            street1Aggr=street1Aggr+%s,
+            street2Aggr=street2Aggr+%s,
+            street3Aggr=street3Aggr+%s,
+            street4Aggr=street4Aggr+%s,
+            otherRaisedStreet1=otherRaisedStreet1+%s,
+            otherRaisedStreet2=otherRaisedStreet2+%s,
+            otherRaisedStreet3=otherRaisedStreet3+%s,
+            otherRaisedStreet4=otherRaisedStreet4+%s,
+            foldToOtherRaisedStreet1=foldToOtherRaisedStreet1+%s,
+            foldToOtherRaisedStreet2=foldToOtherRaisedStreet2+%s,
+            foldToOtherRaisedStreet3=foldToOtherRaisedStreet3+%s,
+            foldToOtherRaisedStreet4=foldToOtherRaisedStreet4+%s,
+            wonWhenSeenStreet1=wonWhenSeenStreet1+%s,
+            wonAtSD=wonAtSD+%s,
+            stealAttemptChance=stealAttemptChance+%s,
+            stealAttempted=stealAttempted+%s,
+            foldBbToStealChance=foldBbToStealChance+%s,
+            foldedBbToSteal=foldedBbToSteal+%s,
+            foldSbToStealChance=foldSbToStealChance+%s,
+            foldedSbToSteal=foldedSbToSteal+%s,
+            street1CBChance=street1CBChance+%s,
+            street1CBDone=street1CBDone+%s,
+            street2CBChance=street2CBChance+%s,
+            street2CBDone=street2CBDone+%s,
+            street3CBChance=street3CBChance+%s,
+            street3CBDone=street3CBDone+%s,
+            street4CBChance=street4CBChance+%s,
+            street4CBDone=street4CBDone+%s,
+            foldToStreet1CBChance=foldToStreet1CBChance+%s,
+            foldToStreet1CBDone=foldToStreet1CBDone+%s,
+            foldToStreet2CBChance=foldToStreet2CBChance+%s,
+            foldToStreet2CBDone=foldToStreet2CBDone+%s,
+            foldToStreet3CBChance=foldToStreet3CBChance+%s,
+            foldToStreet3CBDone=foldToStreet3CBDone+%s,
+            foldToStreet4CBChance=foldToStreet4CBChance+%s,
+            foldToStreet4CBDone=foldToStreet4CBDone+%s,
+            totalProfit=totalProfit+%s,
+            street1CheckCallRaiseChance=street1CheckCallRaiseChance+%s,
+            street1CheckCallRaiseDone=street1CheckCallRaiseDone+%s,
+            street2CheckCallRaiseChance=street2CheckCallRaiseChance+%s,
+            street2CheckCallRaiseDone=street2CheckCallRaiseDone+%s,
+            street3CheckCallRaiseChance=street3CheckCallRaiseChance+%s,
+            street3CheckCallRaiseDone=street3CheckCallRaiseDone+%s,
+            street4CheckCallRaiseChance=street4CheckCallRaiseChance+%s,
+            street4CheckCallRaiseDone=street4CheckCallRaiseDone+%s
+        WHERE gametypeId+0=%s
+            AND   playerId=%s
+            AND   activeSeats=%s
+            AND   position=%s
+            AND   tourneyTypeId+0=%s
+            AND   styleKey=%s"""
+
         self.query['get_hero_hudcache_start'] = """select min(hc.styleKey)
                                                    from HudCache hc
                                                    where hc.playerId in <playerid_list>
diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index 24f16000..41d04283 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -432,9 +432,8 @@ class Importer:
                 idx = self.pos_in_file[file]
             else:
                 self.pos_in_file[file] = 0
-            hhc = obj(in_path = file, out_path = out_path, index = idx, starsArchive = self.settings['starsArchive']) # Index into file 0 until changeover
+            hhc = obj(in_path = file, out_path = out_path, index = idx, starsArchive = self.settings['starsArchive'])
             if hhc.getStatus() and self.NEWIMPORT == True:
-                #This code doesn't do anything yet
                 handlist = hhc.getProcessedHands()
                 self.pos_in_file[file] = hhc.getLastCharacterRead()
                 to_hud = []
@@ -449,8 +448,10 @@ class Importer:
                     else:
                         log.error("Hand processed but empty")
                 self.database.commit()
+                # Call hudcache update if not in bulk import mode
+                # FIXME: Need to test for bulk import that isn't rebuilding the cache
                 if self.callHud:
-                    self.database.rebuild_hudcache()
+                    hand.updateHudCache(self.database)
 
                 #pipe the Hands.id out to the HUD
                 for hid in to_hud:

From 0adf0a7b18ae44b6a1b5f67b398a1788ea60303d Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 24 Dec 2009 01:12:39 +0800
Subject: [PATCH 033/320] [NEWIMPORT] updateHudCache update.

Fix a couple of bugs:
    position != 2 its = 'M'
    actually commit changes to hud
---
 pyfpdb/Database.py    | 14 ++++++++------
 pyfpdb/fpdb_import.py |  1 +
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index 0b9cd32d..fcb0c066 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -1569,7 +1569,8 @@ class Database:
             line[55] = gid    # gametypeId
             line[56] = pids[p]    # playerId
             line[57] = len(pids)    # activeSeats
-            line[58] = pdata[p]['position']
+            pos = {-2:'B', -1:'S', 0:'D', 1:'C', 2:'M', 3:'M', 4:'M', 5:'E', 6:'E', 7:'E', 8:'E', 9:'E' }
+            line[58] = pos[pdata[p]['position']]
             line[59] = pdata[p]['tourneyTypeId']
             line[60] = styleKey    # styleKey
             inserts.append(line)
@@ -1580,19 +1581,20 @@ class Database:
         for row in inserts:
             # Try to do the update first:
             num = cursor.execute(update_hudcache, row)
-           # Test statusmessage to see if update worked, do insert if not
-           # num is a cursor in sqlite
+            #print "DEBUG: values: %s" % row[-6:]
+            # Test statusmessage to see if update worked, do insert if not
+            # num is a cursor in sqlite
             if ((self.backend == self.PGSQL and cursor.statusmessage != "UPDATE 1")
                     or (self.backend == self.MYSQL_INNODB and num == 0) 
                     or (self.backend == self.SQLITE and num.rowcount == 0)):
                 #move the last 6 items in WHERE clause of row from the end of the array
                 # to the beginning for the INSERT statement
-                print "DEBUG: using INSERT: %s" % num
+                #print "DEBUG: using INSERT: %s" % num
                 row = row[-6:] + row[:-6]
                 num = cursor.execute(insert_hudcache, row)
-                print "DEBUG: Successfully(?: %s) updated HudCacho using INSERT" % num
+                #print "DEBUG: Successfully(?: %s) updated HudCacho using INSERT" % num
             else:
-                print "DEBUG: Successfully updated HudCacho using UPDATE"
+                #print "DEBUG: Successfully updated HudCacho using UPDATE"
                 pass
 
     def isDuplicate(self, gametypeID, siteHandNo):
diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index 41d04283..7c240cbe 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -452,6 +452,7 @@ class Importer:
                 # FIXME: Need to test for bulk import that isn't rebuilding the cache
                 if self.callHud:
                     hand.updateHudCache(self.database)
+                    self.database.commit()
 
                 #pipe the Hands.id out to the HUD
                 for hid in to_hud:

From 3b1e67e78bcb0051fef3ade940466dfd403d8214 Mon Sep 17 00:00:00 2001
From: Mika Bostrom <bostik@odin.bostik.iki.fi>
Date: Thu, 24 Dec 2009 09:52:47 +0200
Subject: [PATCH 034/320] Store names as UTF-8

The names should be always in UTF-8 encoding. At least for PostgreSQL
the encdoding of the database comes from the time of running 'initdb'
(which is different from 'createdb') and if the encoding was selected or
set to something else at that time, the following error will occur:

  File ".../pyfpdb/Database.py", line 1630, in <lambda>
    self.pcache = LambdaDict(lambda  key:self.insertPlayer(key, siteid))
  File ".../pyfpdb/Database.py", line 1661, in insertPlayer
    c.execute (q, (site_id, _name))
  File "/usr/lib/python2.5/encodings/iso8859_15.py", line 12, in encode
    return codecs.charmap_encode(input,errors,encoding_table)
UnicodeEncodeError: 'charmap' codec can't encode character u'\u2122' in
position 10: character maps to <undefined>

This happens because 'name' is a regular string as opposed to a valid
unicode object. By forcing the string to unicode and encoding it in
UTF-8 the error goes away. In my case the database encoding was
ISO-8859-15 (latin9) but any other "wrong" encoding would trigger the
same problem.

This is a relatively common problem in python.
---
 pyfpdb/Database.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index fcb0c066..fb70dbab 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -38,6 +38,7 @@ from decimal import Decimal
 import string
 import re
 import Queue
+import codecs
 
 #    pyGTK modules
 
@@ -50,6 +51,7 @@ import Tourney
 from Exceptions import *
 
 log = Configuration.get_logger("logging.conf")
+encoder = codecs.lookup('utf-8')
 
 class Database:
 
@@ -1641,6 +1643,7 @@ class Database:
 
     def insertPlayer(self, name, site_id):
         result = None
+        (_name, _len) = encoder.encode(unicode(name))
         c = self.get_cursor()
         q = "SELECT name, id FROM Players WHERE siteid=%s and name=%s"
         q = q.replace('%s', self.sql.query['placeholder'])
@@ -1654,12 +1657,12 @@ class Database:
 
         #print "DEBUG: name: %s site: %s" %(name, site_id)
 
-        c.execute (q, (site_id, name))
+        c.execute (q, (site_id, _name))
 
         tmp = c.fetchone()
         if (tmp == None): #new player
             c.execute ("INSERT INTO Players (name, siteId) VALUES (%s, %s)".replace('%s',self.sql.query['placeholder'])
-                      ,(name, site_id))
+                      ,(_name, site_id))
             #Get last id might be faster here.
             #c.execute ("SELECT id FROM Players WHERE name=%s", (name,))
             result = self.get_last_insert_id(c)

From 46e91e1a0f687aa25e33924807b554e097a1983b Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Fri, 25 Dec 2009 18:55:13 +0800
Subject: [PATCH 035/320] [NEWIMPORT] Remove a couple of unused functions

---
 pyfpdb/Database.py | 102 ---------------------------------------------
 1 file changed, 102 deletions(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index fcb0c066..0e67e6b6 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -619,69 +619,6 @@ class Database:
         rows = c.fetchall()
         return rows
             
-    #returns the SQL ids of the names given in an array
-    # TODO: if someone gets industrious, they should make the parts that use the output of this function deal with a dict
-    # { playername: id } instead of depending on it's relation to the positions list
-    # then this can be reduced in complexity a bit
-
-    #def recognisePlayerIDs(cursor, names, site_id):
-    #    result = []
-    #    for i in xrange(len(names)):
-    #        cursor.execute ("SELECT id FROM Players WHERE name=%s", (names[i],))
-    #        tmp=cursor.fetchall()
-    #        if (len(tmp)==0): #new player
-    #            cursor.execute ("INSERT INTO Players (name, siteId) VALUES (%s, %s)", (names[i], site_id))
-    #            #print "Number of players rows inserted: %d" % cursor.rowcount
-    #            cursor.execute ("SELECT id FROM Players WHERE name=%s", (names[i],))
-    #            tmp=cursor.fetchall()
-    #        #print "recognisePlayerIDs, names[i]:",names[i],"tmp:",tmp
-    #        result.append(tmp[0][0])
-    #    return result
-
-    def recognisePlayerIDs(self, names, site_id):
-        c = self.get_cursor()
-        q = "SELECT name,id FROM Players WHERE siteid=%d and (name=%s)" %(site_id, " OR name=".join([self.sql.query['placeholder'] for n in names]))
-        c.execute(q, names) # get all playerids by the names passed in
-        ids = dict(c.fetchall()) # convert to dict
-        if len(ids) != len(names):
-            notfound = [n for n in names if n not in ids] # make list of names not in database
-            if notfound: # insert them into database
-                q_ins = "INSERT INTO Players (name, siteId) VALUES (%s, "+str(site_id)+")"
-                q_ins = q_ins.replace('%s', self.sql.query['placeholder'])
-                c.executemany(q_ins, [(n,) for n in notfound])
-                q2 = "SELECT name,id FROM Players WHERE siteid=%d and (name=%s)" % (site_id, " OR name=".join(["%s" for n in notfound]))
-                q2 = q2.replace('%s', self.sql.query['placeholder'])
-                c.execute(q2, notfound) # get their new ids
-                tmp = c.fetchall()
-                for n,id in tmp: # put them all into the same dict
-                    ids[n] = id
-        # return them in the SAME ORDER that they came in in the names argument, rather than the order they came out of the DB
-        return [ids[n] for n in names]
-    #end def recognisePlayerIDs
-
-    # Here's a version that would work if it wasn't for the fact that it needs to have the output in the same order as input
-    # this version could also be improved upon using list comprehensions, etc
-
-    #def recognisePlayerIDs(cursor, names, site_id):
-    #    result = []
-    #    notfound = []
-    #    cursor.execute("SELECT name,id FROM Players WHERE name='%s'" % "' OR name='".join(names))
-    #    tmp = dict(cursor.fetchall())
-    #    for n in names:
-    #        if n not in tmp:
-    #            notfound.append(n)
-    #        else:
-    #            result.append(tmp[n])
-    #    if notfound:
-    #        cursor.executemany("INSERT INTO Players (name, siteId) VALUES (%s, "+str(site_id)+")", (notfound))
-    #        cursor.execute("SELECT id FROM Players WHERE name='%s'" % "' OR name='".join(notfound))
-    #        tmp = cursor.fetchall()
-    #        for n in tmp:
-    #            result.append(n[0])
-    #        
-    #    return result
-
-
     def get_site_id(self, site):
         c = self.get_cursor()
         c.execute(self.sql.query['getSiteId'], (site,))
@@ -1680,45 +1617,6 @@ class Database:
 
 
 
-    def storeHands(self, backend, site_hand_no, gametype_id
-                  ,hand_start_time, names, tableName, maxSeats, hudCache
-                  ,board_values, board_suits):
-
-        cards = [Card.cardFromValueSuit(v,s) for v,s in zip(board_values,board_suits)]
-        #stores into table hands:
-        try:
-            c = self.get_cursor()
-            c.execute ("""INSERT INTO Hands 
-                          (siteHandNo, gametypeId, handStart, seats, tableName, importTime, maxSeats
-                          ,boardcard1,boardcard2,boardcard3,boardcard4,boardcard5
-                          ,playersVpi, playersAtStreet1, playersAtStreet2
-                          ,playersAtStreet3, playersAtStreet4, playersAtShowdown
-                          ,street0Raises, street1Raises, street2Raises
-                          ,street3Raises, street4Raises, street1Pot
-                          ,street2Pot, street3Pot, street4Pot
-                          ,showdownPot
-                          ) 
-                          VALUES 
-                          (%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)
-                       """.replace('%s', self.sql.query['placeholder'])
-                      ,   (site_hand_no, gametype_id, hand_start_time, len(names), tableName, datetime.today(), maxSeats
-                          ,cards[0], cards[1], cards[2], cards[3], cards[4]
-                          ,hudCache['playersVpi'], hudCache['playersAtStreet1'], hudCache['playersAtStreet2']
-                          ,hudCache['playersAtStreet3'], hudCache['playersAtStreet4'], hudCache['playersAtShowdown']
-                          ,hudCache['street0Raises'], hudCache['street1Raises'], hudCache['street2Raises']
-                          ,hudCache['street3Raises'], hudCache['street4Raises'], hudCache['street1Pot']
-                          ,hudCache['street2Pot'], hudCache['street3Pot'], hudCache['street4Pot']
-                          ,hudCache['showdownPot']
-                          ))
-            ret = self.get_last_insert_id(c)
-        except:
-            ret = -1
-            raise FpdbError( "storeHands error: " + str(sys.exc_value) )
-
-        return ret
-    #end def storeHands
-     
     def store_tourneys_players(self, tourney_id, player_ids, payin_amounts, ranks, winnings):
         try:
             result=[]

From 1bcb6736eb25e9e29f5f38ebbb1a4a2515f42409 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sat, 26 Dec 2009 10:07:33 +0800
Subject: [PATCH 036/320] New test file - All-in pre flop

---
 ...HE-6max-USD-0.05-0.10-200912.Allin-pre.txt | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Allin-pre.txt

diff --git a/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Allin-pre.txt b/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Allin-pre.txt
new file mode 100644
index 00000000..b876c42a
--- /dev/null
+++ b/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Allin-pre.txt
@@ -0,0 +1,41 @@
+PokerStars Game #37165169101:  Hold'em No Limit ($0.10/$0.25 USD) - 2009/12/25 9:50:09 ET
+Table 'Lucretia IV' 6-max Seat #2 is the button
+Seat 1: Blåveis ($55.10 in chips) 
+Seat 2: Kinewma ($31.40 in chips) 
+Seat 3: AAALISAAAA ($20.20 in chips) 
+Seat 4: Arbaz ($25 in chips) 
+Seat 5: s0rrow ($29.85 in chips) 
+Seat 6: bys7 ($41.35 in chips) 
+AAALISAAAA: posts small blind $0.10
+Arbaz: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to s0rrow [Ac As]
+s0rrow: raises $0.50 to $0.75
+bys7: calls $0.75
+Blåveis: folds 
+Kinewma: folds 
+AAALISAAAA: raises $1.50 to $2.25
+Arbaz: folds 
+s0rrow: raises $3.50 to $5.75
+bys7: folds 
+AAALISAAAA: raises $14.45 to $20.20 and is all-in
+s0rrow: calls $14.45
+*** FLOP *** [3d 7h Kh]
+*** TURN *** [3d 7h Kh] [Ts]
+*** RIVER *** [3d 7h Kh Ts] [5c]
+*** SHOW DOWN ***
+AAALISAAAA: shows [Kd 5d] (two pair, Kings and Fives)
+s0rrow: shows [Ac As] (a pair of Aces)
+AAALISAAAA collected $39.35 from pot
+*** SUMMARY ***
+Total pot $41.40 | Rake $2.05 
+Board [3d 7h Kh Ts 5c]
+Seat 1: Blåveis folded before Flop (didn't bet)
+Seat 2: Kinewma (button) folded before Flop (didn't bet)
+Seat 3: AAALISAAAA (small blind) showed [Kd 5d] and won ($39.35) with two pair, Kings and Fives
+Seat 4: Arbaz (big blind) folded before Flop
+Seat 5: s0rrow showed [Ac As] and lost with a pair of Aces
+Seat 6: bys7 folded before Flop
+
+
+

From 624ab07f853bdf634f2086f66dadb61a3a8ebe4b Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sat, 26 Dec 2009 12:23:20 +0800
Subject: [PATCH 037/320] New test for all-in preflop.

Test still fails - need to sort out an issue with database placement
---
 pyfpdb/test_PokerStars.py | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/pyfpdb/test_PokerStars.py b/pyfpdb/test_PokerStars.py
index e3e45c35..18a9f556 100644
--- a/pyfpdb/test_PokerStars.py
+++ b/pyfpdb/test_PokerStars.py
@@ -82,6 +82,8 @@ def testFlopImport():
     # River: hero (continuation bets?) all-in and is not called
     importer.addBulkImportImportFileOrDir(
             """regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Stats-comparision.txt""", site="PokerStars")
+    importer.addBulkImportImportFileOrDir(
+            """regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Allin-pre.txt""", site="PokerStars")
     importer.setCallHud(False)
     (stored, dups, partial, errs, ttime) = importer.runImport()
     print "DEBUG: stored: %s dups: %s partial: %s errs: %s ttime: %s" %(stored, dups, partial, errs, ttime)
@@ -114,6 +116,32 @@ and s.id = p.siteid"""
         # Assert if any sawShowdown = True
         assert result[row][col['sawShowdown']] == 0
 
+    q = """SELECT
+    s.name,
+    p.name,
+    hp.sawShowdown
+FROM
+    Hands as h,
+    Sites as s,
+    Gametypes as g,
+    HandsPlayers as hp,
+    Players as p
+WHERE
+    h.siteHandNo = 37165169101
+and g.id = h.gametypeid
+and hp.handid = h.id
+and p.id = hp.playerid
+and s.id = p.siteid"""
+    c = db.get_cursor()
+    c.execute(q) 
+    result = c.fetchall()
+    for row, data in enumerate(result):
+        print "DEBUG: result[%s]: %s" %(row, result[row])
+        # Assert if any sawShowdown = True
+        assert result[row][col['sawShowdown']] == 1
+
+    assert 0 == 1
+
 def testStudImport():
     db.recreate_tables()
     importer = fpdb_import.Importer(False, settings, config)

From 1245a0cab3091575f13da4e8a0c5d1aa2fb507ec Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sat, 26 Dec 2009 10:07:33 +0800
Subject: [PATCH 038/320] New test file - All-in pre flop

---
 ...HE-6max-USD-0.05-0.10-200912.Allin-pre.txt | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Allin-pre.txt

diff --git a/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Allin-pre.txt b/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Allin-pre.txt
new file mode 100644
index 00000000..b876c42a
--- /dev/null
+++ b/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Allin-pre.txt
@@ -0,0 +1,41 @@
+PokerStars Game #37165169101:  Hold'em No Limit ($0.10/$0.25 USD) - 2009/12/25 9:50:09 ET
+Table 'Lucretia IV' 6-max Seat #2 is the button
+Seat 1: Blåveis ($55.10 in chips) 
+Seat 2: Kinewma ($31.40 in chips) 
+Seat 3: AAALISAAAA ($20.20 in chips) 
+Seat 4: Arbaz ($25 in chips) 
+Seat 5: s0rrow ($29.85 in chips) 
+Seat 6: bys7 ($41.35 in chips) 
+AAALISAAAA: posts small blind $0.10
+Arbaz: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to s0rrow [Ac As]
+s0rrow: raises $0.50 to $0.75
+bys7: calls $0.75
+Blåveis: folds 
+Kinewma: folds 
+AAALISAAAA: raises $1.50 to $2.25
+Arbaz: folds 
+s0rrow: raises $3.50 to $5.75
+bys7: folds 
+AAALISAAAA: raises $14.45 to $20.20 and is all-in
+s0rrow: calls $14.45
+*** FLOP *** [3d 7h Kh]
+*** TURN *** [3d 7h Kh] [Ts]
+*** RIVER *** [3d 7h Kh Ts] [5c]
+*** SHOW DOWN ***
+AAALISAAAA: shows [Kd 5d] (two pair, Kings and Fives)
+s0rrow: shows [Ac As] (a pair of Aces)
+AAALISAAAA collected $39.35 from pot
+*** SUMMARY ***
+Total pot $41.40 | Rake $2.05 
+Board [3d 7h Kh Ts 5c]
+Seat 1: Blåveis folded before Flop (didn't bet)
+Seat 2: Kinewma (button) folded before Flop (didn't bet)
+Seat 3: AAALISAAAA (small blind) showed [Kd 5d] and won ($39.35) with two pair, Kings and Fives
+Seat 4: Arbaz (big blind) folded before Flop
+Seat 5: s0rrow showed [Ac As] and lost with a pair of Aces
+Seat 6: bys7 folded before Flop
+
+
+

From 9f2f015fd0e65a6d64973d284b28d50d7a746c71 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sat, 26 Dec 2009 12:23:20 +0800
Subject: [PATCH 039/320] New test for all-in preflop.

Test still fails - need to sort out an issue with database placement
---
 pyfpdb/test_PokerStars.py | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/pyfpdb/test_PokerStars.py b/pyfpdb/test_PokerStars.py
index e3e45c35..18a9f556 100644
--- a/pyfpdb/test_PokerStars.py
+++ b/pyfpdb/test_PokerStars.py
@@ -82,6 +82,8 @@ def testFlopImport():
     # River: hero (continuation bets?) all-in and is not called
     importer.addBulkImportImportFileOrDir(
             """regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Stats-comparision.txt""", site="PokerStars")
+    importer.addBulkImportImportFileOrDir(
+            """regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Allin-pre.txt""", site="PokerStars")
     importer.setCallHud(False)
     (stored, dups, partial, errs, ttime) = importer.runImport()
     print "DEBUG: stored: %s dups: %s partial: %s errs: %s ttime: %s" %(stored, dups, partial, errs, ttime)
@@ -114,6 +116,32 @@ and s.id = p.siteid"""
         # Assert if any sawShowdown = True
         assert result[row][col['sawShowdown']] == 0
 
+    q = """SELECT
+    s.name,
+    p.name,
+    hp.sawShowdown
+FROM
+    Hands as h,
+    Sites as s,
+    Gametypes as g,
+    HandsPlayers as hp,
+    Players as p
+WHERE
+    h.siteHandNo = 37165169101
+and g.id = h.gametypeid
+and hp.handid = h.id
+and p.id = hp.playerid
+and s.id = p.siteid"""
+    c = db.get_cursor()
+    c.execute(q) 
+    result = c.fetchall()
+    for row, data in enumerate(result):
+        print "DEBUG: result[%s]: %s" %(row, result[row])
+        # Assert if any sawShowdown = True
+        assert result[row][col['sawShowdown']] == 1
+
+    assert 0 == 1
+
 def testStudImport():
     db.recreate_tables()
     importer = fpdb_import.Importer(False, settings, config)

From 0e318e6d9f4e0a7b9d7911842e60091d084e172a Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sat, 26 Dec 2009 17:18:05 +0800
Subject: [PATCH 040/320] [NEWIMPORT] Commit currnetly failing test -
 sawShowdown

It would appear that all-in pre-flop doesn't flag sawShowdown.

Also modified the query to select street0Aggr, as that appears to be wrong at the moment
---
 pyfpdb/DerivedStats.py    |  2 +-
 pyfpdb/test_PokerStars.py | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py
index 1e81dd8d..7c50178b 100644
--- a/pyfpdb/DerivedStats.py
+++ b/pyfpdb/DerivedStats.py
@@ -363,7 +363,7 @@ class DerivedStats():
     def aggr(self, hand, i):
         aggrers = set()
         for act in hand.actions[hand.actionStreets[i]]:
-            if act[1] in ('completes', 'raises'):
+            if act[1] in ('completes', 'bets', 'raises'):
                 aggrers.add(act[0])
 
         for player in hand.players:
diff --git a/pyfpdb/test_PokerStars.py b/pyfpdb/test_PokerStars.py
index 18a9f556..72c9049c 100644
--- a/pyfpdb/test_PokerStars.py
+++ b/pyfpdb/test_PokerStars.py
@@ -89,13 +89,14 @@ def testFlopImport():
     print "DEBUG: stored: %s dups: %s partial: %s errs: %s ttime: %s" %(stored, dups, partial, errs, ttime)
     importer.clearFileList()
 
-    col = { 'sawShowdown': 2
+    col = { 'sawShowdown': 2, 'street0Aggr':3
           }
 
     q = """SELECT
     s.name,
     p.name,
-    hp.sawShowdown
+    hp.sawShowdown,
+    hp.street0Aggr
 FROM
     Hands as h,
     Sites as s,
@@ -119,7 +120,8 @@ and s.id = p.siteid"""
     q = """SELECT
     s.name,
     p.name,
-    hp.sawShowdown
+    hp.sawShowdown,
+    hp.street0Aggr
 FROM
     Hands as h,
     Sites as s,
@@ -135,10 +137,10 @@ and s.id = p.siteid"""
     c = db.get_cursor()
     c.execute(q) 
     result = c.fetchall()
+    pstats = { u'Kinewma':0, u'Arbaz':0, u's0rrow':1, u'bys7':0, u'AAALISAAAA':1, u'Bl\xe5veis':0 }
     for row, data in enumerate(result):
-        print "DEBUG: result[%s]: %s" %(row, result[row])
-        # Assert if any sawShowdown = True
-        assert result[row][col['sawShowdown']] == 1
+        print "DEBUG: result[%s]: %s == %s" %(row, result[row], pstats[data[1]])
+        assert result[row][col['sawShowdown']] == pstats[data[1]]
 
     assert 0 == 1
 

From f66b8307d311b97fdfb667c0cebd66e4d5413fcf Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Wed, 23 Dec 2009 21:12:56 +0100
Subject: [PATCH 041/320] search string for table detect changed

---
 pyfpdb/HandHistoryConverter.py | 2 +-
 pyfpdb/Tables.py               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index a18797df..1ea0d203 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -512,7 +512,7 @@ or None if we fail to get the info """
     def getTableTitleRe(type, table_name=None, tournament = None, table_number=None):
         "Returns string to search in windows titles"
         if type=="tour":
-            return "%s.+Table\s%s" % (tournament, table_number)
+            return "%s.+Table.+%s" % (tournament, table_number)
         else:
             return table_name
 
diff --git a/pyfpdb/Tables.py b/pyfpdb/Tables.py
index ea5dfc4c..28bd313a 100755
--- a/pyfpdb/Tables.py
+++ b/pyfpdb/Tables.py
@@ -161,7 +161,7 @@ def discover_posix_by_name(c, tablename):
 
 def discover_posix_tournament(c, t_number, s_number):
     """Finds the X window for a client, given tournament and table nos."""
-    search_string = "%s.+Table\s%s" % (t_number, s_number)
+    search_string = "%s.+Table.+%s" % (t_number, s_number)
     for listing in os.popen('xwininfo -root -tree').readlines():
         if re.search(search_string, listing):
             return decode_xwininfo(c, listing)

From 3553bdaf715575ee4b8e20de97d4062002bac798 Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Wed, 23 Dec 2009 21:12:56 +0100
Subject: [PATCH 042/320] search string for table detect changed

---
 pyfpdb/HandHistoryConverter.py | 2 +-
 pyfpdb/Tables.py               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index 9d4807a2..47cfd302 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -512,7 +512,7 @@ or None if we fail to get the info """
     def getTableTitleRe(type, table_name=None, tournament = None, table_number=None):
         "Returns string to search in windows titles"
         if type=="tour":
-            return "%s.+Table\s%s" % (tournament, table_number)
+            return "%s.+Table.+%s" % (tournament, table_number)
         else:
             return table_name
 
diff --git a/pyfpdb/Tables.py b/pyfpdb/Tables.py
index 75bc574c..ce99b274 100755
--- a/pyfpdb/Tables.py
+++ b/pyfpdb/Tables.py
@@ -160,7 +160,7 @@ def discover_posix_by_name(c, tablename):
 
 def discover_posix_tournament(c, t_number, s_number):
     """Finds the X window for a client, given tournament and table nos."""
-    search_string = "%s.+Table\s%s" % (t_number, s_number)
+    search_string = "%s.+Table.+%s" % (t_number, s_number)
     for listing in os.popen('xwininfo -root -tree').readlines():
         if re.search(search_string, listing):
             return decode_xwininfo(c, listing)

From 2cd57e826df07caebf37cacbfbf4019a78091682 Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Wed, 23 Dec 2009 21:15:55 +0100
Subject: [PATCH 043/320] Added color highlight for stats window. high and low
 threshold and color can be set in the xml file

---
 pyfpdb/Configuration.py       |  4 ++
 pyfpdb/HUD_config.xml.example | 97 ++++++++++++++++++-----------------
 pyfpdb/Hud.py                 | 10 ++++
 3 files changed, 63 insertions(+), 48 deletions(-)

diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py
index 996ef60c..117fd0c7 100755
--- a/pyfpdb/Configuration.py
+++ b/pyfpdb/Configuration.py
@@ -267,6 +267,10 @@ class Game:
             stat.hudprefix = stat_node.getAttribute("hudprefix")
             stat.hudsuffix = stat_node.getAttribute("hudsuffix")
             stat.hudcolor  = stat_node.getAttribute("hudcolor")
+            stat.stat_loth = stat_node.getAttribute("stat_loth")
+            stat.stat_hith = stat_node.getAttribute("stat_hith")
+            stat.stat_locolor = stat_node.getAttribute("stat_locolor")
+            stat.stat_hicolor = stat_node.getAttribute("stat_hicolor")
 
             self.stats[stat.stat_name] = stat
 
diff --git a/pyfpdb/HUD_config.xml.example b/pyfpdb/HUD_config.xml.example
index b1ebd761..a772773e 100644
--- a/pyfpdb/HUD_config.xml.example
+++ b/pyfpdb/HUD_config.xml.example
@@ -449,59 +449,60 @@ Left-Drag to Move"
 
     <supported_games>
 
-        <game cols="3" db="fpdb" game_name="holdem" rows="2" aux="mucked">
-            <stat click="tog_decorate" col="0" popup="default" row="0" stat_name="vpip" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="1" popup="default" row="0" stat_name="pfr" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="2" popup="default" row="0" stat_name="ffreq1" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="0" popup="default" row="1" stat_name="n" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="1" popup="default" row="1" stat_name="wtsd" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="2" popup="default" row="1" stat_name="wmsd" tip="tip1"> </stat>
-        </game>
+    	<game aux="mucked" cols="2" db="fpdb" game_name="holdem" rows="3">
+            <stat click="tog_decorate" col="0" hudcolor="#98FFB0" hudprefix="" hudsuffix="" popup="default" row="0" stat_name="playername" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="n" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="vpip" stat_loth="20" stat_locolor ="#408000" stat_hith="40" stat_hicolor ="#F05000" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="pfr" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="0" popup="default" row="2" stat_name="wtsd" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="1" popup="default" row="2" stat_name="cb1" tip="tip1"> </stat>
+    	</game>    	
 
-        <game cols="3" db="fpdb" game_name="razz" rows="2" aux="stud_mucked">
-            <stat click="tog_decorate" col="0" popup="default" row="0" stat_name="vpip" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="1" popup="default" row="0" stat_name="pfr" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="2" popup="default" row="0" stat_name="ffreq1" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="0" popup="default" row="1" stat_name="n" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="1" popup="default" row="1" stat_name="wtsd" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="2" popup="default" row="1" stat_name="wmsd" tip="tip1"> </stat>
-        </game>
+    	<game aux="stud_mucked" cols="2" db="fpdb" game_name="razz" rows="3">
+            <stat click="tog_decorate" col="0" hudcolor="#98FFB0" hudprefix="" hudsuffix="" popup="default" row="0" stat_name="playername" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="n" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="vpip" stat_loth="20" stat_locolor ="#408000" stat_hith="40" stat_hicolor ="#F05000" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="pfr" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="0" popup="default" row="2" stat_name="saw_f" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="1" popup="default" row="2" stat_name="ffreq1" tip="tip1"> </stat>
+    	</game>    	
 
-        <game cols="3" db="fpdb" game_name="omahahi" rows="2" aux="mucked">
-            <stat click="tog_decorate" col="0" popup="default" row="0" stat_name="vpip" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="1" popup="default" row="0" stat_name="pfr" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="2" popup="default" row="0" stat_name="ffreq1" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="0" popup="default" row="1" stat_name="n" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="1" popup="default" row="1" stat_name="wtsd" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="2" popup="default" row="1" stat_name="wmsd" tip="tip1"> </stat>
-        </game>
+    	<game aux="mucked" cols="2" db="fpdb" game_name="omahahi" rows="3">
+            <stat click="tog_decorate" col="0" hudcolor="#98FFB0" hudprefix="" hudsuffix="" popup="default" row="0" stat_name="playername" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="n" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="vpip" stat_loth="20" stat_locolor ="#408000" stat_hith="40" stat_hicolor ="#F05000" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="pfr" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="0" popup="default" row="2" stat_name="saw_f" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="1" popup="default" row="2" stat_name="ffreq1" tip="tip1"> </stat>
+    	</game>    	 	
 
-        <game cols="3" db="fpdb" game_name="omahahilo" rows="2" aux="mucked">
-            <stat click="tog_decorate" col="0" popup="default" row="0" stat_name="vpip" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="1" popup="default" row="0" stat_name="pfr" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="2" popup="default" row="0" stat_name="ffreq1" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="0" popup="default" row="1" stat_name="n" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="1" popup="default" row="1" stat_name="wtsd" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="2" popup="default" row="1" stat_name="wmsd" tip="tip1"> </stat>
-        </game>
+    	<game aux="mucked" cols="2" db="fpdb" game_name="omahahilo" rows="3">
+            <stat click="tog_decorate" col="0" hudcolor="#98FFB0" hudprefix="" hudsuffix="" popup="default" row="0" stat_name="playername" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="n" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="vpip" stat_loth="20" stat_locolor ="#408000" stat_hith="40" stat_hicolor ="#F05000" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="pfr" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="0" popup="default" row="2" stat_name="saw_f" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="1" popup="default" row="2" stat_name="ffreq1" tip="tip1"> </stat>
+    	</game>    	
 
-        <game cols="3" db="fpdb" game_name="studhi" rows="2" aux="stud_mucked">
-            <stat click="tog_decorate" col="0" popup="default" row="0" stat_name="vpip" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="1" popup="default" row="0" stat_name="pfr" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="2" popup="default" row="0" stat_name="ffreq1" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="0" popup="default" row="1" stat_name="n" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="1" popup="default" row="1" stat_name="wtsd" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="2" popup="default" row="1" stat_name="wmsd" tip="tip1"> </stat>
-        </game>
+    	<game aux="stud_mucked" cols="2" db="fpdb" game_name="studhi" rows="3">
+            <stat click="tog_decorate" col="0" hudcolor="#98FFB0" hudprefix="" hudsuffix="" popup="default" row="0" stat_name="playername" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="n" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="vpip" stat_loth="20" stat_locolor ="#408000" stat_hith="40" stat_hicolor ="#F05000" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="pfr" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="0" popup="default" row="2" stat_name="saw_f" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="1" popup="default" row="2" stat_name="ffreq1" tip="tip1"> </stat>
+    	</game>    	
 
-        <game cols="3" db="fpdb" game_name="studhilo" rows="2" aux="stud_mucked">
-            <stat click="tog_decorate" col="0" popup="default" row="0" stat_name="vpip" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="1" popup="default" row="0" stat_name="pfr" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="2" popup="default" row="0" stat_name="ffreq1" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="0" popup="default" row="1" stat_name="n" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="1" popup="default" row="1" stat_name="wtsd" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="2" popup="default" row="1" stat_name="wmsd" tip="tip1"> </stat>
-        </game>
+
+    	<game aux="stud_mucked" cols="2" db="fpdb" game_name="studhilo" rows="3">
+            <stat click="tog_decorate" col="0" hudcolor="#98FFB0" hudprefix="" hudsuffix="" popup="default" row="0" stat_name="playername" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="n" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="vpip" stat_loth="20" stat_locolor ="#408000" stat_hith="40" stat_hicolor ="#F05000" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="pfr" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="0" popup="default" row="2" stat_name="saw_f" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="1" popup="default" row="2" stat_name="ffreq1" tip="tip1"> </stat>
+    	</game>    	
     </supported_games>
 
     <popup_windows>
diff --git a/pyfpdb/Hud.py b/pyfpdb/Hud.py
index b61c17aa..1eb51aea 100644
--- a/pyfpdb/Hud.py
+++ b/pyfpdb/Hud.py
@@ -632,6 +632,16 @@ class Hud:
                         self.label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.colors['hudfgcolor']))
                         window.label[r][c].modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(this_stat.hudcolor))
 
+                    if this_stat.stat_loth != "":
+                    	if number[0] < (float(this_stat.stat_loth)/100):
+                    		self.label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.colors['hudfgcolor']))
+                    		window.label[r][c].modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(this_stat.stat_locolor))
+
+                    if this_stat.stat_hith != "":
+                    	if number[0] > (float(this_stat.stat_hith)/100):
+                    		self.label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.colors['hudfgcolor']))
+                    		window.label[r][c].modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(this_stat.stat_hicolor))
+
                     window.label[r][c].set_text(statstring)
                     if statstring != "xxx": # is there a way to tell if this particular stat window is visible already, or no?
                         window.window.show_all()

From eb226c002678d2e63bd6f3d568386605c55e5af0 Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Wed, 23 Dec 2009 21:15:55 +0100
Subject: [PATCH 044/320] Added color highlight for stats window. high and low
 threshold and color can be set in the xml file

---
 pyfpdb/Configuration.py       |  4 ++
 pyfpdb/HUD_config.xml.example | 97 ++++++++++++++++++-----------------
 pyfpdb/Hud.py                 | 10 ++++
 3 files changed, 63 insertions(+), 48 deletions(-)

diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py
index 174d0673..39bf5921 100755
--- a/pyfpdb/Configuration.py
+++ b/pyfpdb/Configuration.py
@@ -269,6 +269,10 @@ class Game:
             stat.hudprefix = stat_node.getAttribute("hudprefix")
             stat.hudsuffix = stat_node.getAttribute("hudsuffix")
             stat.hudcolor  = stat_node.getAttribute("hudcolor")
+            stat.stat_loth = stat_node.getAttribute("stat_loth")
+            stat.stat_hith = stat_node.getAttribute("stat_hith")
+            stat.stat_locolor = stat_node.getAttribute("stat_locolor")
+            stat.stat_hicolor = stat_node.getAttribute("stat_hicolor")
 
             self.stats[stat.stat_name] = stat
 
diff --git a/pyfpdb/HUD_config.xml.example b/pyfpdb/HUD_config.xml.example
index b1ebd761..a772773e 100644
--- a/pyfpdb/HUD_config.xml.example
+++ b/pyfpdb/HUD_config.xml.example
@@ -449,59 +449,60 @@ Left-Drag to Move"
 
     <supported_games>
 
-        <game cols="3" db="fpdb" game_name="holdem" rows="2" aux="mucked">
-            <stat click="tog_decorate" col="0" popup="default" row="0" stat_name="vpip" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="1" popup="default" row="0" stat_name="pfr" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="2" popup="default" row="0" stat_name="ffreq1" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="0" popup="default" row="1" stat_name="n" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="1" popup="default" row="1" stat_name="wtsd" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="2" popup="default" row="1" stat_name="wmsd" tip="tip1"> </stat>
-        </game>
+    	<game aux="mucked" cols="2" db="fpdb" game_name="holdem" rows="3">
+            <stat click="tog_decorate" col="0" hudcolor="#98FFB0" hudprefix="" hudsuffix="" popup="default" row="0" stat_name="playername" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="n" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="vpip" stat_loth="20" stat_locolor ="#408000" stat_hith="40" stat_hicolor ="#F05000" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="pfr" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="0" popup="default" row="2" stat_name="wtsd" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="1" popup="default" row="2" stat_name="cb1" tip="tip1"> </stat>
+    	</game>    	
 
-        <game cols="3" db="fpdb" game_name="razz" rows="2" aux="stud_mucked">
-            <stat click="tog_decorate" col="0" popup="default" row="0" stat_name="vpip" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="1" popup="default" row="0" stat_name="pfr" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="2" popup="default" row="0" stat_name="ffreq1" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="0" popup="default" row="1" stat_name="n" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="1" popup="default" row="1" stat_name="wtsd" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="2" popup="default" row="1" stat_name="wmsd" tip="tip1"> </stat>
-        </game>
+    	<game aux="stud_mucked" cols="2" db="fpdb" game_name="razz" rows="3">
+            <stat click="tog_decorate" col="0" hudcolor="#98FFB0" hudprefix="" hudsuffix="" popup="default" row="0" stat_name="playername" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="n" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="vpip" stat_loth="20" stat_locolor ="#408000" stat_hith="40" stat_hicolor ="#F05000" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="pfr" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="0" popup="default" row="2" stat_name="saw_f" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="1" popup="default" row="2" stat_name="ffreq1" tip="tip1"> </stat>
+    	</game>    	
 
-        <game cols="3" db="fpdb" game_name="omahahi" rows="2" aux="mucked">
-            <stat click="tog_decorate" col="0" popup="default" row="0" stat_name="vpip" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="1" popup="default" row="0" stat_name="pfr" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="2" popup="default" row="0" stat_name="ffreq1" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="0" popup="default" row="1" stat_name="n" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="1" popup="default" row="1" stat_name="wtsd" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="2" popup="default" row="1" stat_name="wmsd" tip="tip1"> </stat>
-        </game>
+    	<game aux="mucked" cols="2" db="fpdb" game_name="omahahi" rows="3">
+            <stat click="tog_decorate" col="0" hudcolor="#98FFB0" hudprefix="" hudsuffix="" popup="default" row="0" stat_name="playername" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="n" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="vpip" stat_loth="20" stat_locolor ="#408000" stat_hith="40" stat_hicolor ="#F05000" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="pfr" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="0" popup="default" row="2" stat_name="saw_f" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="1" popup="default" row="2" stat_name="ffreq1" tip="tip1"> </stat>
+    	</game>    	 	
 
-        <game cols="3" db="fpdb" game_name="omahahilo" rows="2" aux="mucked">
-            <stat click="tog_decorate" col="0" popup="default" row="0" stat_name="vpip" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="1" popup="default" row="0" stat_name="pfr" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="2" popup="default" row="0" stat_name="ffreq1" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="0" popup="default" row="1" stat_name="n" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="1" popup="default" row="1" stat_name="wtsd" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="2" popup="default" row="1" stat_name="wmsd" tip="tip1"> </stat>
-        </game>
+    	<game aux="mucked" cols="2" db="fpdb" game_name="omahahilo" rows="3">
+            <stat click="tog_decorate" col="0" hudcolor="#98FFB0" hudprefix="" hudsuffix="" popup="default" row="0" stat_name="playername" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="n" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="vpip" stat_loth="20" stat_locolor ="#408000" stat_hith="40" stat_hicolor ="#F05000" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="pfr" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="0" popup="default" row="2" stat_name="saw_f" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="1" popup="default" row="2" stat_name="ffreq1" tip="tip1"> </stat>
+    	</game>    	
 
-        <game cols="3" db="fpdb" game_name="studhi" rows="2" aux="stud_mucked">
-            <stat click="tog_decorate" col="0" popup="default" row="0" stat_name="vpip" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="1" popup="default" row="0" stat_name="pfr" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="2" popup="default" row="0" stat_name="ffreq1" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="0" popup="default" row="1" stat_name="n" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="1" popup="default" row="1" stat_name="wtsd" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="2" popup="default" row="1" stat_name="wmsd" tip="tip1"> </stat>
-        </game>
+    	<game aux="stud_mucked" cols="2" db="fpdb" game_name="studhi" rows="3">
+            <stat click="tog_decorate" col="0" hudcolor="#98FFB0" hudprefix="" hudsuffix="" popup="default" row="0" stat_name="playername" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="n" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="vpip" stat_loth="20" stat_locolor ="#408000" stat_hith="40" stat_hicolor ="#F05000" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="pfr" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="0" popup="default" row="2" stat_name="saw_f" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="1" popup="default" row="2" stat_name="ffreq1" tip="tip1"> </stat>
+    	</game>    	
 
-        <game cols="3" db="fpdb" game_name="studhilo" rows="2" aux="stud_mucked">
-            <stat click="tog_decorate" col="0" popup="default" row="0" stat_name="vpip" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="1" popup="default" row="0" stat_name="pfr" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="2" popup="default" row="0" stat_name="ffreq1" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="0" popup="default" row="1" stat_name="n" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="1" popup="default" row="1" stat_name="wtsd" tip="tip1"> </stat>
-            <stat click="tog_decorate" col="2" popup="default" row="1" stat_name="wmsd" tip="tip1"> </stat>
-        </game>
+
+    	<game aux="stud_mucked" cols="2" db="fpdb" game_name="studhilo" rows="3">
+            <stat click="tog_decorate" col="0" hudcolor="#98FFB0" hudprefix="" hudsuffix="" popup="default" row="0" stat_name="playername" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="n" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="vpip" stat_loth="20" stat_locolor ="#408000" stat_hith="40" stat_hicolor ="#F05000" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="pfr" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="0" popup="default" row="2" stat_name="saw_f" tip="tip1"> </stat>
+    		<stat click="tog_decorate" col="1" popup="default" row="2" stat_name="ffreq1" tip="tip1"> </stat>
+    	</game>    	
     </supported_games>
 
     <popup_windows>
diff --git a/pyfpdb/Hud.py b/pyfpdb/Hud.py
index b61c17aa..1eb51aea 100644
--- a/pyfpdb/Hud.py
+++ b/pyfpdb/Hud.py
@@ -632,6 +632,16 @@ class Hud:
                         self.label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.colors['hudfgcolor']))
                         window.label[r][c].modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(this_stat.hudcolor))
 
+                    if this_stat.stat_loth != "":
+                    	if number[0] < (float(this_stat.stat_loth)/100):
+                    		self.label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.colors['hudfgcolor']))
+                    		window.label[r][c].modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(this_stat.stat_locolor))
+
+                    if this_stat.stat_hith != "":
+                    	if number[0] > (float(this_stat.stat_hith)/100):
+                    		self.label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.colors['hudfgcolor']))
+                    		window.label[r][c].modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(this_stat.stat_hicolor))
+
                     window.label[r][c].set_text(statstring)
                     if statstring != "xxx": # is there a way to tell if this particular stat window is visible already, or no?
                         window.window.show_all()

From 805d35c3fd35fbbf6c0e3ba398db27a7e57692c5 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Mon, 28 Dec 2009 10:21:31 +0800
Subject: [PATCH 045/320] Fix tab spacing from Gerkos recent patch

---
 pyfpdb/Hud.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pyfpdb/Hud.py b/pyfpdb/Hud.py
index 1eb51aea..e2994de8 100644
--- a/pyfpdb/Hud.py
+++ b/pyfpdb/Hud.py
@@ -633,14 +633,14 @@ class Hud:
                         window.label[r][c].modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(this_stat.hudcolor))
 
                     if this_stat.stat_loth != "":
-                    	if number[0] < (float(this_stat.stat_loth)/100):
-                    		self.label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.colors['hudfgcolor']))
-                    		window.label[r][c].modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(this_stat.stat_locolor))
+                        if number[0] < (float(this_stat.stat_loth)/100):
+                            self.label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.colors['hudfgcolor']))
+                            window.label[r][c].modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(this_stat.stat_locolor))
 
                     if this_stat.stat_hith != "":
-                    	if number[0] > (float(this_stat.stat_hith)/100):
-                    		self.label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.colors['hudfgcolor']))
-                    		window.label[r][c].modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(this_stat.stat_hicolor))
+                        if number[0] > (float(this_stat.stat_hith)/100):
+                            self.label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.colors['hudfgcolor']))
+                            window.label[r][c].modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(this_stat.stat_hicolor))
 
                     window.label[r][c].set_text(statstring)
                     if statstring != "xxx": # is there a way to tell if this particular stat window is visible already, or no?

From 3f3d8ac54a59d0617d18e212621aa5045676f171 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Mon, 28 Dec 2009 10:21:31 +0800
Subject: [PATCH 046/320] Fix tab spacing from Gerkos recent patch

---
 pyfpdb/Hud.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pyfpdb/Hud.py b/pyfpdb/Hud.py
index 1eb51aea..e2994de8 100644
--- a/pyfpdb/Hud.py
+++ b/pyfpdb/Hud.py
@@ -633,14 +633,14 @@ class Hud:
                         window.label[r][c].modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(this_stat.hudcolor))
 
                     if this_stat.stat_loth != "":
-                    	if number[0] < (float(this_stat.stat_loth)/100):
-                    		self.label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.colors['hudfgcolor']))
-                    		window.label[r][c].modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(this_stat.stat_locolor))
+                        if number[0] < (float(this_stat.stat_loth)/100):
+                            self.label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.colors['hudfgcolor']))
+                            window.label[r][c].modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(this_stat.stat_locolor))
 
                     if this_stat.stat_hith != "":
-                    	if number[0] > (float(this_stat.stat_hith)/100):
-                    		self.label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.colors['hudfgcolor']))
-                    		window.label[r][c].modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(this_stat.stat_hicolor))
+                        if number[0] > (float(this_stat.stat_hith)/100):
+                            self.label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.colors['hudfgcolor']))
+                            window.label[r][c].modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(this_stat.stat_hicolor))
 
                     window.label[r][c].set_text(statstring)
                     if statstring != "xxx": # is there a way to tell if this particular stat window is visible already, or no?

From 6efccd9067fe1dc48f3110748d068012038eddec Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Wed, 23 Dec 2009 21:44:55 +0100
Subject: [PATCH 047/320] Hmm forgot the color reset to default. There must be
 a better methode

---
 pyfpdb/Hud.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/Hud.py b/pyfpdb/Hud.py
index e2994de8..2b6d0237 100644
--- a/pyfpdb/Hud.py
+++ b/pyfpdb/Hud.py
@@ -631,7 +631,10 @@ class Hud:
                     if this_stat.hudcolor != "":
                         self.label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.colors['hudfgcolor']))
                         window.label[r][c].modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(this_stat.hudcolor))
-
+                    else:
+                        self.label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.colors['hudfgcolor']))
+                        window.label[r][c].modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse("#FFFFFF"))
+					
                     if this_stat.stat_loth != "":
                         if number[0] < (float(this_stat.stat_loth)/100):
                             self.label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.colors['hudfgcolor']))

From 1cf464283f15228f6c0d42abd8651bcaf3a4056e Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Wed, 23 Dec 2009 21:44:55 +0100
Subject: [PATCH 048/320] Hmm forgot the color reset to default. There must be
 a better methode

---
 pyfpdb/Hud.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/Hud.py b/pyfpdb/Hud.py
index e2994de8..2b6d0237 100644
--- a/pyfpdb/Hud.py
+++ b/pyfpdb/Hud.py
@@ -631,7 +631,10 @@ class Hud:
                     if this_stat.hudcolor != "":
                         self.label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.colors['hudfgcolor']))
                         window.label[r][c].modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(this_stat.hudcolor))
-
+                    else:
+                        self.label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.colors['hudfgcolor']))
+                        window.label[r][c].modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse("#FFFFFF"))
+					
                     if this_stat.stat_loth != "":
                         if number[0] < (float(this_stat.stat_loth)/100):
                             self.label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.colors['hudfgcolor']))

From c7aca0a32e9fe6398dfcc3d73ea9ce17cf3257e6 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Mon, 28 Dec 2009 22:03:26 +0800
Subject: [PATCH 049/320] Update HUD_config.xml

- Change default Holdem stat window layout to 3x3, add some more colouring
- Fix tab breakage from Gerko.
---
 pyfpdb/HUD_config.xml.example | 91 ++++++++++++++++++-----------------
 1 file changed, 46 insertions(+), 45 deletions(-)

diff --git a/pyfpdb/HUD_config.xml.example b/pyfpdb/HUD_config.xml.example
index a772773e..3acfd812 100644
--- a/pyfpdb/HUD_config.xml.example
+++ b/pyfpdb/HUD_config.xml.example
@@ -448,61 +448,62 @@ Left-Drag to Move"
     </supported_sites>
 
     <supported_games>
+        <game aux="mucked" cols="3" db="fpdb" game_name="holdem" rows="3">
+            <stat click="tog_decorate" col="0" popup="default" row="0" stat_name="vpip" stat_loth="25" stat_locolor ="#408000" stat_hith="40" stat_hicolor ="#F05000" tip="tip1"> </stat>
+            <stat click="tog_decorate" col="1" popup="default" row="0" stat_name="pfr" stat_loth="20" stat_locolor ="#408000" stat_hith="35" stat_hicolor ="#F05000" tip="tip1"> </stat>
+            <stat click="tog_decorate" col="2" popup="default" row="0" stat_name="three_B" stat_loth="4" stat_locolor ="#408000" stat_hith="13" stat_hicolor ="#F05000" tip="tip1"> </stat>
+            <stat click="tog_decorate" col="0" popup="default" row="1" stat_name="n" tip="tip1"> </stat>
+            <stat click="tog_decorate" col="1" hudcolor="#98FFB0" hudprefix="" hudsuffix="" popup="default" row="1" stat_name="playername" tip="tip1"> </stat>
+            <stat click="tog_decorate" col="2" popup="default" row="1" stat_name="cb1" tip="tip1"> </stat>
+            <stat click="tog_decorate" col="0" popup="default" row="2" stat_name="wtsd" tip="tip1"> </stat>
+            <stat click="tog_decorate" col="1" popup="default" row="2" stat_name="steal" tip="tip1"> </stat>
+            <stat click="tog_decorate" col="2" popup="default" row="2" stat_name="totalprofit" stat_loth="0" stat_locolor ="#F05000" stat_hith="0" stat_hicolor ="#408000" tip="tip1"> </stat>
+        </game>
 
-    	<game aux="mucked" cols="2" db="fpdb" game_name="holdem" rows="3">
+        <game aux="stud_mucked" cols="2" db="fpdb" game_name="razz" rows="3">
             <stat click="tog_decorate" col="0" hudcolor="#98FFB0" hudprefix="" hudsuffix="" popup="default" row="0" stat_name="playername" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="n" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="vpip" stat_loth="20" stat_locolor ="#408000" stat_hith="40" stat_hicolor ="#F05000" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="pfr" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="0" popup="default" row="2" stat_name="wtsd" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="1" popup="default" row="2" stat_name="cb1" tip="tip1"> </stat>
-    	</game>    	
+        	<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="n" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="vpip" stat_loth="20" stat_locolor ="#408000" stat_hith="40" stat_hicolor ="#F05000" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="pfr" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="0" popup="default" row="2" stat_name="saw_f" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="1" popup="default" row="2" stat_name="ffreq1" tip="tip1"> </stat>
+        </game>
 
-    	<game aux="stud_mucked" cols="2" db="fpdb" game_name="razz" rows="3">
+        <game aux="mucked" cols="2" db="fpdb" game_name="omahahi" rows="3">
             <stat click="tog_decorate" col="0" hudcolor="#98FFB0" hudprefix="" hudsuffix="" popup="default" row="0" stat_name="playername" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="n" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="vpip" stat_loth="20" stat_locolor ="#408000" stat_hith="40" stat_hicolor ="#F05000" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="pfr" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="0" popup="default" row="2" stat_name="saw_f" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="1" popup="default" row="2" stat_name="ffreq1" tip="tip1"> </stat>
-    	</game>    	
+        	<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="n" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="vpip" stat_loth="20" stat_locolor ="#408000" stat_hith="40" stat_hicolor ="#F05000" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="pfr" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="0" popup="default" row="2" stat_name="saw_f" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="1" popup="default" row="2" stat_name="ffreq1" tip="tip1"> </stat>
+        </game>
 
-    	<game aux="mucked" cols="2" db="fpdb" game_name="omahahi" rows="3">
+        <game aux="mucked" cols="2" db="fpdb" game_name="omahahilo" rows="3">
             <stat click="tog_decorate" col="0" hudcolor="#98FFB0" hudprefix="" hudsuffix="" popup="default" row="0" stat_name="playername" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="n" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="vpip" stat_loth="20" stat_locolor ="#408000" stat_hith="40" stat_hicolor ="#F05000" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="pfr" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="0" popup="default" row="2" stat_name="saw_f" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="1" popup="default" row="2" stat_name="ffreq1" tip="tip1"> </stat>
-    	</game>    	 	
+        	<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="n" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="vpip" stat_loth="20" stat_locolor ="#408000" stat_hith="40" stat_hicolor ="#F05000" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="pfr" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="0" popup="default" row="2" stat_name="saw_f" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="1" popup="default" row="2" stat_name="ffreq1" tip="tip1"> </stat>
+        </game>
 
-    	<game aux="mucked" cols="2" db="fpdb" game_name="omahahilo" rows="3">
+        <game aux="stud_mucked" cols="2" db="fpdb" game_name="studhi" rows="3">
             <stat click="tog_decorate" col="0" hudcolor="#98FFB0" hudprefix="" hudsuffix="" popup="default" row="0" stat_name="playername" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="n" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="vpip" stat_loth="20" stat_locolor ="#408000" stat_hith="40" stat_hicolor ="#F05000" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="pfr" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="0" popup="default" row="2" stat_name="saw_f" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="1" popup="default" row="2" stat_name="ffreq1" tip="tip1"> </stat>
-    	</game>    	
+        	<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="n" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="vpip" stat_loth="20" stat_locolor ="#408000" stat_hith="40" stat_hicolor ="#F05000" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="pfr" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="0" popup="default" row="2" stat_name="saw_f" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="1" popup="default" row="2" stat_name="ffreq1" tip="tip1"> </stat>
+        </game>
 
-    	<game aux="stud_mucked" cols="2" db="fpdb" game_name="studhi" rows="3">
+        <game aux="stud_mucked" cols="2" db="fpdb" game_name="studhilo" rows="3">
             <stat click="tog_decorate" col="0" hudcolor="#98FFB0" hudprefix="" hudsuffix="" popup="default" row="0" stat_name="playername" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="n" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="vpip" stat_loth="20" stat_locolor ="#408000" stat_hith="40" stat_hicolor ="#F05000" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="pfr" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="0" popup="default" row="2" stat_name="saw_f" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="1" popup="default" row="2" stat_name="ffreq1" tip="tip1"> </stat>
-    	</game>    	
-
-
-    	<game aux="stud_mucked" cols="2" db="fpdb" game_name="studhilo" rows="3">
-            <stat click="tog_decorate" col="0" hudcolor="#98FFB0" hudprefix="" hudsuffix="" popup="default" row="0" stat_name="playername" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="n" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="vpip" stat_loth="20" stat_locolor ="#408000" stat_hith="40" stat_hicolor ="#F05000" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="pfr" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="0" popup="default" row="2" stat_name="saw_f" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="1" popup="default" row="2" stat_name="ffreq1" tip="tip1"> </stat>
-    	</game>    	
+        	<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="n" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="vpip" stat_loth="20" stat_locolor ="#408000" stat_hith="40" stat_hicolor ="#F05000" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="pfr" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="0" popup="default" row="2" stat_name="saw_f" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="1" popup="default" row="2" stat_name="ffreq1" tip="tip1"> </stat>
+        </game>
     </supported_games>
 
     <popup_windows>

From 4800f2515fe37d277c27e497abaf4f5d34a66ccd Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Mon, 28 Dec 2009 22:03:26 +0800
Subject: [PATCH 050/320] Update HUD_config.xml

- Change default Holdem stat window layout to 3x3, add some more colouring
- Fix tab breakage from Gerko.
---
 pyfpdb/HUD_config.xml.example | 91 ++++++++++++++++++-----------------
 1 file changed, 46 insertions(+), 45 deletions(-)

diff --git a/pyfpdb/HUD_config.xml.example b/pyfpdb/HUD_config.xml.example
index a772773e..3acfd812 100644
--- a/pyfpdb/HUD_config.xml.example
+++ b/pyfpdb/HUD_config.xml.example
@@ -448,61 +448,62 @@ Left-Drag to Move"
     </supported_sites>
 
     <supported_games>
+        <game aux="mucked" cols="3" db="fpdb" game_name="holdem" rows="3">
+            <stat click="tog_decorate" col="0" popup="default" row="0" stat_name="vpip" stat_loth="25" stat_locolor ="#408000" stat_hith="40" stat_hicolor ="#F05000" tip="tip1"> </stat>
+            <stat click="tog_decorate" col="1" popup="default" row="0" stat_name="pfr" stat_loth="20" stat_locolor ="#408000" stat_hith="35" stat_hicolor ="#F05000" tip="tip1"> </stat>
+            <stat click="tog_decorate" col="2" popup="default" row="0" stat_name="three_B" stat_loth="4" stat_locolor ="#408000" stat_hith="13" stat_hicolor ="#F05000" tip="tip1"> </stat>
+            <stat click="tog_decorate" col="0" popup="default" row="1" stat_name="n" tip="tip1"> </stat>
+            <stat click="tog_decorate" col="1" hudcolor="#98FFB0" hudprefix="" hudsuffix="" popup="default" row="1" stat_name="playername" tip="tip1"> </stat>
+            <stat click="tog_decorate" col="2" popup="default" row="1" stat_name="cb1" tip="tip1"> </stat>
+            <stat click="tog_decorate" col="0" popup="default" row="2" stat_name="wtsd" tip="tip1"> </stat>
+            <stat click="tog_decorate" col="1" popup="default" row="2" stat_name="steal" tip="tip1"> </stat>
+            <stat click="tog_decorate" col="2" popup="default" row="2" stat_name="totalprofit" stat_loth="0" stat_locolor ="#F05000" stat_hith="0" stat_hicolor ="#408000" tip="tip1"> </stat>
+        </game>
 
-    	<game aux="mucked" cols="2" db="fpdb" game_name="holdem" rows="3">
+        <game aux="stud_mucked" cols="2" db="fpdb" game_name="razz" rows="3">
             <stat click="tog_decorate" col="0" hudcolor="#98FFB0" hudprefix="" hudsuffix="" popup="default" row="0" stat_name="playername" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="n" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="vpip" stat_loth="20" stat_locolor ="#408000" stat_hith="40" stat_hicolor ="#F05000" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="pfr" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="0" popup="default" row="2" stat_name="wtsd" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="1" popup="default" row="2" stat_name="cb1" tip="tip1"> </stat>
-    	</game>    	
+        	<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="n" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="vpip" stat_loth="20" stat_locolor ="#408000" stat_hith="40" stat_hicolor ="#F05000" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="pfr" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="0" popup="default" row="2" stat_name="saw_f" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="1" popup="default" row="2" stat_name="ffreq1" tip="tip1"> </stat>
+        </game>
 
-    	<game aux="stud_mucked" cols="2" db="fpdb" game_name="razz" rows="3">
+        <game aux="mucked" cols="2" db="fpdb" game_name="omahahi" rows="3">
             <stat click="tog_decorate" col="0" hudcolor="#98FFB0" hudprefix="" hudsuffix="" popup="default" row="0" stat_name="playername" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="n" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="vpip" stat_loth="20" stat_locolor ="#408000" stat_hith="40" stat_hicolor ="#F05000" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="pfr" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="0" popup="default" row="2" stat_name="saw_f" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="1" popup="default" row="2" stat_name="ffreq1" tip="tip1"> </stat>
-    	</game>    	
+        	<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="n" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="vpip" stat_loth="20" stat_locolor ="#408000" stat_hith="40" stat_hicolor ="#F05000" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="pfr" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="0" popup="default" row="2" stat_name="saw_f" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="1" popup="default" row="2" stat_name="ffreq1" tip="tip1"> </stat>
+        </game>
 
-    	<game aux="mucked" cols="2" db="fpdb" game_name="omahahi" rows="3">
+        <game aux="mucked" cols="2" db="fpdb" game_name="omahahilo" rows="3">
             <stat click="tog_decorate" col="0" hudcolor="#98FFB0" hudprefix="" hudsuffix="" popup="default" row="0" stat_name="playername" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="n" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="vpip" stat_loth="20" stat_locolor ="#408000" stat_hith="40" stat_hicolor ="#F05000" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="pfr" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="0" popup="default" row="2" stat_name="saw_f" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="1" popup="default" row="2" stat_name="ffreq1" tip="tip1"> </stat>
-    	</game>    	 	
+        	<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="n" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="vpip" stat_loth="20" stat_locolor ="#408000" stat_hith="40" stat_hicolor ="#F05000" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="pfr" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="0" popup="default" row="2" stat_name="saw_f" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="1" popup="default" row="2" stat_name="ffreq1" tip="tip1"> </stat>
+        </game>
 
-    	<game aux="mucked" cols="2" db="fpdb" game_name="omahahilo" rows="3">
+        <game aux="stud_mucked" cols="2" db="fpdb" game_name="studhi" rows="3">
             <stat click="tog_decorate" col="0" hudcolor="#98FFB0" hudprefix="" hudsuffix="" popup="default" row="0" stat_name="playername" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="n" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="vpip" stat_loth="20" stat_locolor ="#408000" stat_hith="40" stat_hicolor ="#F05000" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="pfr" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="0" popup="default" row="2" stat_name="saw_f" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="1" popup="default" row="2" stat_name="ffreq1" tip="tip1"> </stat>
-    	</game>    	
+        	<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="n" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="vpip" stat_loth="20" stat_locolor ="#408000" stat_hith="40" stat_hicolor ="#F05000" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="pfr" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="0" popup="default" row="2" stat_name="saw_f" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="1" popup="default" row="2" stat_name="ffreq1" tip="tip1"> </stat>
+        </game>
 
-    	<game aux="stud_mucked" cols="2" db="fpdb" game_name="studhi" rows="3">
+        <game aux="stud_mucked" cols="2" db="fpdb" game_name="studhilo" rows="3">
             <stat click="tog_decorate" col="0" hudcolor="#98FFB0" hudprefix="" hudsuffix="" popup="default" row="0" stat_name="playername" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="n" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="vpip" stat_loth="20" stat_locolor ="#408000" stat_hith="40" stat_hicolor ="#F05000" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="pfr" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="0" popup="default" row="2" stat_name="saw_f" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="1" popup="default" row="2" stat_name="ffreq1" tip="tip1"> </stat>
-    	</game>    	
-
-
-    	<game aux="stud_mucked" cols="2" db="fpdb" game_name="studhilo" rows="3">
-            <stat click="tog_decorate" col="0" hudcolor="#98FFB0" hudprefix="" hudsuffix="" popup="default" row="0" stat_name="playername" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="n" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="vpip" stat_loth="20" stat_locolor ="#408000" stat_hith="40" stat_hicolor ="#F05000" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="pfr" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="0" popup="default" row="2" stat_name="saw_f" tip="tip1"> </stat>
-    		<stat click="tog_decorate" col="1" popup="default" row="2" stat_name="ffreq1" tip="tip1"> </stat>
-    	</game>    	
+        	<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="n" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="0" popup="default" row="1" stat_name="vpip" stat_loth="20" stat_locolor ="#408000" stat_hith="40" stat_hicolor ="#F05000" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="pfr" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="0" popup="default" row="2" stat_name="saw_f" tip="tip1"> </stat>
+        	<stat click="tog_decorate" col="1" popup="default" row="2" stat_name="ffreq1" tip="tip1"> </stat>
+        </game>
     </supported_games>
 
     <popup_windows>

From 478b82587dfcf307b6d7e9e907dc89fa8c68e291 Mon Sep 17 00:00:00 2001
From: Mika Bostrom <bostik@odin.bostik.iki.fi>
Date: Thu, 24 Dec 2009 09:52:47 +0200
Subject: [PATCH 051/320] Store names as UTF-8

The names should be always in UTF-8 encoding. At least for PostgreSQL
the encdoding of the database comes from the time of running 'initdb'
(which is different from 'createdb') and if the encoding was selected or
set to something else at that time, the following error will occur:

  File ".../pyfpdb/Database.py", line 1630, in <lambda>
    self.pcache = LambdaDict(lambda  key:self.insertPlayer(key, siteid))
  File ".../pyfpdb/Database.py", line 1661, in insertPlayer
    c.execute (q, (site_id, _name))
  File "/usr/lib/python2.5/encodings/iso8859_15.py", line 12, in encode
    return codecs.charmap_encode(input,errors,encoding_table)
UnicodeEncodeError: 'charmap' codec can't encode character u'\u2122' in
position 10: character maps to <undefined>

This happens because 'name' is a regular string as opposed to a valid
unicode object. By forcing the string to unicode and encoding it in
UTF-8 the error goes away. In my case the database encoding was
ISO-8859-15 (latin9) but any other "wrong" encoding would trigger the
same problem.

This is a relatively common problem in python.
---
 pyfpdb/Database.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index 0e67e6b6..63e9a0a5 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -38,6 +38,7 @@ from decimal import Decimal
 import string
 import re
 import Queue
+import codecs
 
 #    pyGTK modules
 
@@ -50,6 +51,7 @@ import Tourney
 from Exceptions import *
 
 log = Configuration.get_logger("logging.conf")
+encoder = codecs.lookup('utf-8')
 
 class Database:
 
@@ -1578,6 +1580,7 @@ class Database:
 
     def insertPlayer(self, name, site_id):
         result = None
+        (_name, _len) = encoder.encode(unicode(name))
         c = self.get_cursor()
         q = "SELECT name, id FROM Players WHERE siteid=%s and name=%s"
         q = q.replace('%s', self.sql.query['placeholder'])
@@ -1591,12 +1594,12 @@ class Database:
 
         #print "DEBUG: name: %s site: %s" %(name, site_id)
 
-        c.execute (q, (site_id, name))
+        c.execute (q, (site_id, _name))
 
         tmp = c.fetchone()
         if (tmp == None): #new player
             c.execute ("INSERT INTO Players (name, siteId) VALUES (%s, %s)".replace('%s',self.sql.query['placeholder'])
-                      ,(name, site_id))
+                      ,(_name, site_id))
             #Get last id might be faster here.
             #c.execute ("SELECT id FROM Players WHERE name=%s", (name,))
             result = self.get_last_insert_id(c)

From cd88de7c7e57c334cc87f09126711a2c1dd15c8f Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Wed, 30 Dec 2009 15:44:48 +0800
Subject: [PATCH 052/320] [NEWIMPORT] Copy in Alchemy files from Grigorij's
 alchemy branch

---
 pyfpdb/AlchemyFacilities.py | 116 +++++++++
 pyfpdb/AlchemyMappings.py   | 464 ++++++++++++++++++++++++++++++++++++
 pyfpdb/AlchemyTables.py     | 438 ++++++++++++++++++++++++++++++++++
 3 files changed, 1018 insertions(+)
 create mode 100644 pyfpdb/AlchemyFacilities.py
 create mode 100644 pyfpdb/AlchemyMappings.py
 create mode 100644 pyfpdb/AlchemyTables.py

diff --git a/pyfpdb/AlchemyFacilities.py b/pyfpdb/AlchemyFacilities.py
new file mode 100644
index 00000000..c8284efb
--- /dev/null
+++ b/pyfpdb/AlchemyFacilities.py
@@ -0,0 +1,116 @@
+# -*- coding: utf-8 -*-
+from decimal import Decimal
+
+from sqlalchemy import types
+from sqlalchemy.orm.exc import NoResultFound 
+from sqlalchemy.exc import IntegrityError
+
+import Card
+
+class CardColumn(types.TypeDecorator):
+    """Stores cards as smallints
+    
+    Automatically converts values like '9h' to smallint
+
+    >>> CardColumn().process_bind_param( 'Td', '' )
+    22
+    >>> CardColumn().process_bind_param( u'Td', '' )
+    22
+    >>> CardColumn().process_bind_param( 22, '' )
+    22
+    >>> CardColumn().process_result_value( 22, '' )
+    'Td'
+    """
+
+    impl = types.SmallInteger
+
+    def process_bind_param(self, value, dialect):
+        if value is None or isinstance(value, int):
+            return value
+        elif isinstance(value, basestring) and len(value) == 2:
+            return Card.encodeCard(str(value))
+        else:
+            raise Exception, "Incorrect card value: " + repr(value)
+
+    def process_result_value(self, value, dialect):
+        return Card.valueSuitFromCard( value )
+
+
+class MoneyColumn(types.TypeDecorator):
+    """Stores money: bets, pots, etc
+    
+    Understands: 
+        Decimal as real amount
+        int     as amount mupliplied by 100
+        string  as decimal
+    Returns Decimal
+    >>> MoneyColumn().process_bind_param( 230, '' )
+    230
+    >>> MoneyColumn().process_bind_param( Decimal('2.30'), '' )
+    230
+    >>> MoneyColumn().process_bind_param( '2.30', '' )
+    230
+    >>> MoneyColumn().process_result_value( 230, '' )
+    Decimal('2.3')
+    """
+
+    impl = types.Integer
+
+    def process_bind_param(self, value, dialect):
+        if value is None or isinstance(value, int):
+            return value
+        elif isinstance(value, basestring) or isinstance(value, Decimal): 
+            return int(Decimal(value)*100)
+        else:
+            raise Exception, "Incorrect amount:" + repr(value)
+
+    def process_result_value(self, value, dialect):
+        if value is None:
+            return None
+        return Decimal(value)/100
+
+
+class BigIntColumn(types.TypeDecorator, types.Integer): 
+    """Representing db-independent big integer """
+    # Integer inheritance required for auto_increment flag
+
+    impl = types.Integer
+
+    def load_dialect_impl(self, dialect):
+        from sqlalchemy import databases
+        if dialect.name == 'mysql':
+            return databases.mysql.MSBigInteger()
+        elif dialect.name == 'postgres':
+            return databases.mysql.PGBigInteger()
+        return types.Integer()
+
+
+class MappedBase(object):
+    """Provide dummy contrcutor"""
+
+    def __init__(self, **kwargs):
+        for k, v in kwargs.iteritems():
+            setattr(self, k, v)
+
+    def get_columns_names(self):
+        return [i.name for i in self._sa_class_manager.mapper.c]
+
+def get_or_create(klass, session, **kwargs):
+    """ 
+    Looks up an object with the given kwargs, creating one if necessary.
+    Returns a tuple of (object, created), where created is a boolean
+    specifying whether an object was created.
+    """
+    assert kwargs, \
+            'get_or_create() must be passed at least one keyword argument'
+    try:
+        return session.query(klass).filter_by(**kwargs).one(), False
+    except NoResultFound:
+        try:
+            obj = klass(**kwargs)
+            session.add(obj)
+            session.flush()
+            return obj, True
+        except IntegrityError:
+            return session.query(klass).filter_by(**kwargs).one(), False
+
diff --git a/pyfpdb/AlchemyMappings.py b/pyfpdb/AlchemyMappings.py
new file mode 100644
index 00000000..c2e088a9
--- /dev/null
+++ b/pyfpdb/AlchemyMappings.py
@@ -0,0 +1,464 @@
+# -*- coding: utf-8 -*-
+"""@package AlchemyMappings
+This package contains all classes to be mapped and mappers themselves
+"""
+
+import logging
+import re
+from decimal import Decimal
+from sqlalchemy.orm import mapper, relation, reconstructor
+from sqlalchemy.sql import select
+from collections import defaultdict
+
+
+from AlchemyTables import *
+from AlchemyFacilities import get_or_create, MappedBase
+from DerivedStats import DerivedStats
+from Exceptions import IncompleteHandError, FpdbError
+
+
+class Player(MappedBase):
+    """Class reflecting Players db table"""
+
+    @staticmethod
+    def get_or_create(session, siteId, name):
+        return get_or_create(Player, session, siteId=siteId, name=name)[0]
+
+    def __str__(self):
+        return '<Player "%s" on %s>' % (self.name, self.site and self.site.name)
+
+
+class Gametype(MappedBase):
+    """Class reflecting Gametypes db table"""
+
+    @staticmethod
+    def get_or_create(session, siteId, gametype):
+        map = zip(
+            ['type', 'base', 'category', 'limitType', 'smallBlind', 'bigBlind', 'smallBet', 'bigBet'],
+            ['type', 'base', 'category', 'limitType', 'sb', 'bb', 'dummy', 'dummy', ])
+        gametype = dict([(new, gametype.get(old)) for new, old in map  ])
+
+        hilo = "h"
+        if gametype['category'] in ('studhilo', 'omahahilo'):
+            hilo = "s"
+        elif gametype['category'] in ('razz','27_3draw','badugi'):
+            hilo = "l"
+        gametype['hiLo'] = hilo
+
+        for f in ['smallBlind', 'bigBlind', 'smallBet', 'bigBet']:
+            if gametype[f] is None: 
+                gametype[f] = 0
+            gametype[f] = int(Decimal(gametype[f])*100)
+
+        gametype['siteId'] = siteId
+        return get_or_create(Gametype, session, **gametype)[0]
+
+
+class HandActions(object):
+    """Class reflecting HandsActions db table"""
+    def initFromImportedHand(self, hand, actions):
+        self.hand = hand
+        self.actions = {}
+        for street, street_actions in actions.iteritems():
+            self.actions[street] = []
+            for v in street_actions:
+                hp = hand.handplayers_by_name[v[0]]
+                self.actions[street].append({'street': street, 'pid': hp.id, 'seat': hp.seatNo, 'action':v})
+
+    @property
+    def flat_actions(self):
+        actions = []
+        for street in self.hand.allStreets:
+            actions += self.actions[street]
+        return actions
+
+
+
+class HandInternal(DerivedStats):
+    """Class reflecting Hands db table"""
+
+    def parseImportedHandStep1(self, hand):
+        """Extracts values to insert into from hand returned by HHC. No db is needed he"""
+        hand.players = hand.getAlivePlayers() 
+
+        # also save some data for step2. Those fields aren't in Hands table
+        self.siteId = hand.siteId 
+        self.gametype_dict = hand.gametype 
+
+        self.attachHandPlayers(hand)
+        self.attachActions(hand) 
+
+        self.assembleHands(hand)
+        self.assembleHandsPlayers(hand)
+
+    def parseImportedHandStep2(self, session):
+        """Fetching ids for gametypes and players"""
+        gametype = Gametype.get_or_create(session, self.siteId, self.gametype_dict)
+        self.gametypeId = gametype.id
+        for hp in self.handPlayers:
+            hp.playerId = Player.get_or_create(session, self.siteId, hp.name).id
+
+    def getPlayerByName(self, name):
+        if not hasattr(self, 'handplayers_by_name'):
+            self.handplayers_by_name = {}
+            for hp in self.handPlayers:
+                pname = getattr(hp, 'name', None) or hp.player.name
+                self.handplayers_by_name[pname] = hp
+        return self.handplayers_by_name[name]
+
+    def attachHandPlayers(self, hand):
+        """Fill HandInternal.handPlayers list. Create self.handplayers_by_name"""
+        hand.noSb = getattr(hand, 'noSb', None)
+        if hand.noSb is None and self.gametype_dict['base']=='hold':
+            saw_sb = False
+            for action in hand.actions[hand.actionStreets[0]]: # blindsantes
+                if action[1] == 'posts' and action[2] == 'small blind' and action[0] is not None:
+                    saw_sb = True
+            hand.noSb = saw_sb
+
+        self.handplayers_by_name = {}
+        for seat, name, chips in hand.players:
+            p = HandPlayer(hand = self, imported_hand=hand, seatNo=seat, 
+                           name=name, startCash=chips)         
+            self.handplayers_by_name[name] = p
+        
+    def attachActions(self, hand):
+        """Create HandActions object"""
+        a = HandActions()
+        a.initFromImportedHand(self, hand.actions)
+
+    def parseImportedTournament(self, hand, session):
+        """Fetching tourney, its type and players
+        
+        Must be called after Step2
+        """
+        if self.gametype_dict['type'] != 'tour': return
+
+        # check for consistense
+        for i in ('buyin', 'tourNo'):
+            if not hasattr(hand, i):
+                raise IncompleteHandError( 
+                    "Field '%s' required for tournaments" % i, self.id, hand )
+
+        # repair old-style buyin value
+        m = re.match('\$(\d+)\+\$(\d+)', hand.buyin)
+        if m is not None:
+            hand.buyin, self.fee = m.groups()
+
+        # fetch tourney type
+        tour_type_hand2db = {
+            'buyin':         'buyin',
+            'fee':           'fee',
+            'speed':         'speed',
+            'maxSeats':      'maxseats',
+            'knockout':      'isKO',
+            'rebuyOrAddon':  'isRebuy',
+            'headsUp':       'isHU',
+            'shootout':      'isShootout',
+            'matrix':        'isMatrix',
+            'sng':           'isSNG',
+        }
+        tour_type_index = dict([
+                    ( i_db, getattr(hand, i_hand, None) )
+                    for i_db, i_hand in tour_type_hand2db.iteritems() 
+                ])
+        tour_type_index['siteId'] = self.siteId
+        tour_type = TourneyType.get_or_create(session, **tour_type_index)
+
+        # fetch and update tourney
+        tour  = Tourney.get_or_create(session, hand.tourNo, tour_type.id)
+        cols = tour.get_columns_names()
+        for col in cols:
+            hand_val = getattr(hand, col, None)
+            if col in ('id', 'tourneyTypeId', 'comment', 'commentTs') or hand_val is None:
+                continue
+            db_val = getattr(tour, col, None)
+            if db_val is None:
+                setattr(tour, col, hand_val)
+            elif col == 'koBounty':
+                setattr(tour, col, max(db_val, hand_val))
+            elif col == 'tourStartTime' and hand.handStart:
+                setattr(tour, col, min(db_val, hand.handStart))
+
+        if tour.entries is None and tour_type.sng:
+            tour.entries = tour_type.maxSeats
+
+        # fetch and update tourney players
+        for hp in self.handPlayers:
+            tp = TourneyPlayer.get_or_create(session, tour.id, hp.playerId)
+            # FIXME: other TourneysPlayers should be added here
+
+        session.flush()
+
+    def isDuplicate(self, session):
+        """Checks if current hand already exists in db
+        
+        siteHandNo ans gameTypeId have to be setted
+        """
+        return session.query(HandInternal).filter_by(
+                siteHandNo=self.siteHandNo, gametypeId=self.gametypeId).count()!=0
+
+    def __str__(self):
+        s = list()
+        for i in self._sa_class_manager.mapper.c:
+            s.append('%25s     %s' % (i, getattr(self, i.name)))
+
+        s+=['', '']
+        for i,p in enumerate(self.handPlayers):
+            s.append('%d. %s' % (i, p.name or '???'))
+            s.append(str(p))
+        return '\n'.join(s)
+
+    @property
+    def boardcards(self):
+        cards = []
+        for i in range(5):
+            cards.append(getattr(self, 'boardcard%d' % (i+1), None))
+        return filter(bool, cards)
+
+    @property
+    def HandClass(self):
+        """Return HoldemOmahaHand or something like this"""
+        import Hand
+        if self.gametype.base == 'hold':
+            return Hand.HoldemOmahaHand
+        elif self.gametype.base == 'draw':
+            return Hand.DrawHand
+        elif self.gametype.base == 'stud':
+            return Hand.StudHand
+        raise Exception("Unknow gametype.base: '%s'" % self.gametype.base)
+
+    @property
+    def allStreets(self):
+        return self.HandClass.allStreets
+
+    @property
+    def actionStreets(self):
+        return self.HandClass.actionStreets
+
+
+
+class HandPlayer(MappedBase):
+    """Class reflecting HandsPlayers db table"""
+    def __init__(self, **kwargs):
+        if 'imported_hand' in kwargs and 'seatNo' in kwargs:
+            imported_hand = kwargs.pop('imported_hand')
+            self.position = self.getPosition(imported_hand, kwargs['seatNo'])
+        super(HandPlayer, self).__init__(**kwargs)
+
+    @reconstructor
+    def init_on_load(self):
+        self.name = self.player.name
+
+    @staticmethod
+    def getPosition(hand, seat):
+        """Returns position value like 'B', 'S', '0', '1', ...
+
+        >>> class A(object): pass
+        ... 
+        >>> A.noSb = False
+        >>> A.maxseats = 6
+        >>> A.buttonpos = 2
+        >>> A.gametype = {'base': 'hold'}
+        >>> A.players = [(i, None, None) for i in (2, 4, 5, 6)]
+        >>> HandPlayer.getPosition(A, 6) # cut off
+        '1'
+        >>> HandPlayer.getPosition(A, 2) # button
+        '0'
+        >>> HandPlayer.getPosition(A, 4) # SB
+        'S'
+        >>> HandPlayer.getPosition(A, 5) # BB
+        'B'
+        >>> A.noSb = True
+        >>> HandPlayer.getPosition(A, 5) # MP3
+        '2'
+        >>> HandPlayer.getPosition(A, 6) # cut off
+        '1'
+        >>> HandPlayer.getPosition(A, 2) # button
+        '0'
+        >>> HandPlayer.getPosition(A, 4) # BB
+        'B'
+        """
+        from itertools import chain
+        if hand.gametype['base'] == 'stud':
+            # FIXME: i've never played stud so plz check & del comment \\grindi
+            bringin = None
+            for action in chain(*[self.actions[street] for street in hand.allStreets]):
+                if action[1]=='bringin':
+                    bringin = action[0]
+                    break
+            if bringin is None:
+                raise Exception, "Cannot find bringin"
+            # name -> seat
+            bringin = int(filter(lambda p: p[1]==bringin, bringin)[0])
+            seat = (int(seat) - int(bringin))%int(hand.maxseats)
+            return str(seat)
+        else:
+            seats_occupied = sorted([seat_ for seat_, name, chips in hand.players], key=int)
+            if hand.buttonpos not in seats_occupied:
+                # i.e. something like
+                # Seat 3: PlayerX ($0), is sitting out
+                # The button is in seat #3
+                hand.buttonpos = max(seats_occupied, 
+                                     key = lambda s: int(s) 
+                                        if int(s) <= int(hand.buttonpos) 
+                                        else int(s) - int(hand.maxseats)
+                                    )
+            seats_occupied = sorted(seats_occupied, 
+                    key = lambda seat_: (
+                        - seats_occupied.index(seat_) 
+                        + seats_occupied.index(hand.buttonpos) 
+                        + 2) % len(seats_occupied)
+                    )
+            # now (if SB presents) seats_occupied contains seats in order: BB, SB, BU, CO, MP3, ...
+            if hand.noSb:
+                # fix order in the case nosb
+                seats_occupied = seats_occupied[1:] + seats_occupied[0:1]
+                seats_occupied.insert(1, -1)
+            seat = seats_occupied.index(seat)
+            if seat == 0:
+                return 'B'
+            elif seat == 1:
+                return 'S'
+            else:
+                return str(seat-2)
+
+    @property
+    def cards(self):
+        cards = []
+        for i in range(7):
+            cards.append(getattr(self, 'card%d' % (i+1), None))
+        return filter(bool, cards)
+
+    def __str__(self):
+        s = list()
+        for i in self._sa_class_manager.mapper.c:
+            s.append('%45s     %s' % (i, getattr(self, i.name)))
+        return '\n'.join(s)
+
+
+class Site(object):
+    """Class reflecting Players db table"""
+    INITIAL_DATA = [
+            (1 , 'Full Tilt Poker','USD'),
+            (2 , 'PokerStars',     'USD'),
+            (3 , 'Everleaf',       'USD'),
+            (4 , 'Win2day',        'USD'),
+            (5 , 'OnGame',         'USD'),
+            (6 , 'UltimateBet',    'USD'),
+            (7 , 'Betfair',        'USD'),
+            (8 , 'Absolute',       'USD'),
+            (9 , 'PartyPoker',     'USD'),
+            (10, 'Partouche',      'EUR'),
+        ]
+    INITIAL_DATA_KEYS = ('id', 'name', 'currency')
+
+    INITIAL_DATA_DICTS = [ dict(zip(INITIAL_DATA_KEYS, datum)) for datum in INITIAL_DATA ] 
+
+    @classmethod
+    def insert_initial(cls, connection):
+        connection.execute(sites_table.insert(), cls.INITIAL_DATA_DICTS)
+
+
+class Tourney(MappedBase):
+    """Class reflecting Tourneys db table"""
+
+    @classmethod
+    def get_or_create(cls, session, siteTourneyNo, tourneyTypeId):
+        """Fetch tourney by index or creates one if none.  """
+        return get_or_create(cls, session, siteTourneyNo=siteTourneyNo, 
+                                tourneyTypeId=tourneyTypeId)[0]
+    
+
+
+class TourneyType(MappedBase):
+    """Class reflecting TourneysType db table"""
+
+    @classmethod
+    def get_or_create(cls, session, **kwargs):
+        """Fetch tourney type by index or creates one if none
+
+        Required kwargs: 
+            buyin fee speed maxSeats knockout 
+            rebuyOrAddon headsUp shootout matrix sng
+        """
+        return get_or_create(cls, session, **kwargs)[0]
+
+
+class TourneyPlayer(MappedBase):
+    """Class reflecting TourneysPlayers db table"""
+
+    @classmethod
+    def get_or_create(cls, session, tourneyId, playerId):
+        """Fetch tourney player by index or creates one if none """
+        return get_or_create(cls, session, tourneyId=tourneyId, playerId=playerId)
+
+
+class Version(object):
+    """Provides read/write access for version var"""
+    CURRENT_VERSION = 120 # db version for current release
+    # 119 - first alchemy version
+    # 120 - add m_factor
+
+    conn = None 
+    ver  = None
+    def __init__(self, connection=None):
+        if self.__class__.conn is None:
+            self.__class__.conn = connection
+
+    @classmethod
+    def is_wrong(cls):
+        return cls.get() != cls.CURRENT_VERSION
+
+    @classmethod
+    def get(cls):
+        if cls.ver is None:
+            try:
+                cls.ver = cls.conn.execute(select(['version'], settings_table)).fetchone()[0]
+            except:
+                return None
+        return cls.ver
+
+    @classmethod
+    def set(cls, value):
+        if cls.conn.execute(settings_table.select()).rowcount==0:
+            cls.conn.execute(settings_table.insert(), version=value)
+        else:
+            cls.conn.execute(settings_table.update().values(version=value))
+        cls.ver = value
+    
+    @classmethod
+    def set_initial(cls):
+        cls.set(cls.CURRENT_VERSION)
+
+
+mapper (Gametype, gametypes_table, properties={
+    'hands': relation(HandInternal, backref='gametype'),
+})
+mapper (Player, players_table, properties={
+    'playerHands': relation(HandPlayer, backref='player'),
+    'playerTourney': relation(TourneyPlayer, backref='player'),
+})
+mapper (Site, sites_table, properties={
+    'gametypes': relation(Gametype, backref = 'site'),
+    'players': relation(Player, backref = 'site'),
+    'tourneyTypes': relation(TourneyType, backref = 'site'),
+})
+mapper (HandActions, hands_actions_table, properties={})
+mapper (HandInternal, hands_table, properties={
+    'handPlayers': relation(HandPlayer, backref='hand'),
+    'actions_all':     relation(HandActions, backref='hand', uselist=False),
+})
+mapper (HandPlayer, hands_players_table, properties={})
+
+mapper (Tourney, tourneys_table) 
+mapper (TourneyType, tourney_types_table, properties={
+    'tourneys': relation(Tourney, backref='type'),
+})
+mapper (TourneyPlayer, tourneys_players_table) 
+
+class LambdaKeyDict(defaultdict):
+    """Operates like defaultdict but passes key argument to the factory function"""
+    def __missing__(key):
+        return self.default_factory(key)
+
diff --git a/pyfpdb/AlchemyTables.py b/pyfpdb/AlchemyTables.py
new file mode 100644
index 00000000..3165a480
--- /dev/null
+++ b/pyfpdb/AlchemyTables.py
@@ -0,0 +1,438 @@
+# -*- coding: utf-8 -*-
+"""@package AlchemyTables
+Contains all sqlalchemy tables
+"""
+
+from sqlalchemy import Table, Float, Column, Integer, String, MetaData, \
+        ForeignKey, Boolean, SmallInteger, DateTime, Text, Index, CHAR, \
+        PickleType, Unicode
+
+from AlchemyFacilities import CardColumn, MoneyColumn, BigIntColumn
+
+
+metadata = MetaData()
+
+
+autorates_table = Table('Autorates', metadata,
+    Column('id',             Integer, primary_key=True, nullable=False),
+    Column('playerId',       Integer, ForeignKey("Players.id"), nullable=False), 
+    Column('gametypeId',     SmallInteger, ForeignKey("Gametypes.id"), nullable=False), 
+    Column('description',    String(50), nullable=False), 
+    Column('shortDesc',      CHAR(8), nullable=False), 
+    Column('ratingTime',     DateTime, nullable=False), 
+    Column('handCount',      Integer, nullable=False), 
+    mysql_charset='utf8',
+    mysql_engine='InnoDB',
+)
+
+
+gametypes_table = Table('Gametypes', metadata,
+    Column('id',            SmallInteger, primary_key=True),
+    Column('siteId',        SmallInteger, ForeignKey("Sites.id"), nullable=False), # SMALLINT
+    Column('type',          String(4), nullable=False), # char(4) NOT NULL
+    Column('base',          String(4), nullable=False), # char(4) NOT NULL
+    Column('category',      String(9), nullable=False), # varchar(9) NOT NULL
+    Column('limitType',     CHAR(2), nullable=False), # char(2) NOT NULL
+    Column('hiLo',          CHAR(1), nullable=False), # char(1) NOT NULL
+    Column('smallBlind',    Integer(3)), # int
+    Column('bigBlind',      Integer(3)), # int
+    Column('smallBet',      Integer(3), nullable=False), # int NOT NULL
+    Column('bigBet',        Integer(3), nullable=False), # int NOT NULL
+    mysql_charset='utf8',
+    mysql_engine='InnoDB',
+)
+
+
+hands_table = Table('Hands', metadata,
+    Column('id',            BigIntColumn, primary_key=True),
+    Column('tableName',     String(30), nullable=False),
+    Column('siteHandNo',    BigIntColumn, nullable=False),
+    Column('gametypeId',    SmallInteger, ForeignKey('Gametypes.id'), nullable=False),
+    Column('handStart',     DateTime, nullable=False),
+    Column('importTime',    DateTime, nullable=False),
+    Column('seats',         SmallInteger, nullable=False),
+    Column('maxSeats',      SmallInteger, nullable=False),
+
+    Column('boardcard1',    CardColumn),
+    Column('boardcard2',    CardColumn),
+    Column('boardcard3',    CardColumn),
+    Column('boardcard4',    CardColumn),
+    Column('boardcard5',    CardColumn),
+    Column('texture',       SmallInteger),
+    Column('playersVpi',    SmallInteger, nullable=False),
+    Column('playersAtStreet1', SmallInteger, nullable=False, default=0),
+    Column('playersAtStreet2', SmallInteger, nullable=False, default=0),
+    Column('playersAtStreet3', SmallInteger, nullable=False, default=0),
+    Column('playersAtStreet4', SmallInteger, nullable=False, default=0),
+    Column('playersAtShowdown',SmallInteger, nullable=False),
+    Column('street0Raises', SmallInteger, nullable=False),
+    Column('street1Raises', SmallInteger, nullable=False),
+    Column('street2Raises', SmallInteger, nullable=False),
+    Column('street3Raises', SmallInteger, nullable=False),
+    Column('street4Raises', SmallInteger, nullable=False),
+    Column('street1Pot',    MoneyColumn),
+    Column('street2Pot',    MoneyColumn),
+    Column('street3Pot',    MoneyColumn),
+    Column('street4Pot',    MoneyColumn),
+    Column('showdownPot',   MoneyColumn),
+    Column('comment',       Text),
+    Column('commentTs',     DateTime),
+    mysql_charset='utf8',
+    mysql_engine='InnoDB',
+)
+Index('siteHandNo', hands_table.c.siteHandNo, hands_table.c.gametypeId, unique=True)
+
+
+hands_actions_table = Table('HandsActions', metadata,
+    Column('id',            BigIntColumn, primary_key=True, nullable=False),
+    Column('handId',        BigIntColumn, ForeignKey("Hands.id"), nullable=False),
+    Column('actions',       PickleType, nullable=False),
+    mysql_charset='utf8',
+    mysql_engine='InnoDB',
+)
+
+
+hands_players_table = Table('HandsPlayers', metadata,
+    Column('id',                BigIntColumn, primary_key=True),
+    Column('handId',            BigIntColumn, ForeignKey("Hands.id"), nullable=False),
+    Column('playerId',          Integer, ForeignKey("Players.id"), nullable=False),
+    Column('startCash',         MoneyColumn),
+    Column('position',          CHAR(1)), #CHAR(1)
+    Column('seatNo',            SmallInteger, nullable=False), #SMALLINT NOT NULL
+        
+    Column('card1',             CardColumn), #smallint NOT NULL,
+    Column('card2',             CardColumn), #smallint NOT NULL
+    Column('card3',             CardColumn), #smallint
+    Column('card4',             CardColumn), #smallint
+    Column('card5',             CardColumn), #smallint
+    Column('card6',             CardColumn), #smallint
+    Column('card7',             CardColumn), #smallint
+    Column('startCards',        SmallInteger), #smallint
+        
+    Column('m_factor',          Integer), # null for ring games
+    Column('ante',              MoneyColumn), #INT
+    Column('winnings',          MoneyColumn, nullable=False, default=0), #int NOT NULL
+    Column('rake',              MoneyColumn, nullable=False, default=0), #int NOT NULL
+    Column('totalProfit',       MoneyColumn), #INT
+    Column('comment',           Text), #text
+    Column('commentTs',         DateTime), #DATETIME
+    Column('tourneysPlayersId', BigIntColumn, ForeignKey("TourneysPlayers.id"),), #BIGINT UNSIGNED
+    Column('tourneyTypeId',     Integer, ForeignKey("TourneyTypes.id"),), #SMALLINT UNSIGNED
+
+    Column('wonWhenSeenStreet1',Float), #FLOAT
+    Column('wonWhenSeenStreet2',Float), #FLOAT
+    Column('wonWhenSeenStreet3',Float), #FLOAT
+    Column('wonWhenSeenStreet4',Float), #FLOAT
+    Column('wonAtSD',           Float), #FLOAT
+
+    Column('street0VPI',        Boolean), #BOOLEAN
+    Column('street0Aggr',       Boolean), #BOOLEAN
+    Column('street0_3BChance',  Boolean), #BOOLEAN
+    Column('street0_3BDone',    Boolean), #BOOLEAN
+    Column('street0_4BChance',  Boolean), #BOOLEAN
+    Column('street0_4BDone',    Boolean), #BOOLEAN
+    Column('other3BStreet0',    Boolean), #BOOLEAN
+    Column('other4BStreet0',    Boolean), #BOOLEAN
+
+    Column('street1Seen',       Boolean), #BOOLEAN
+    Column('street2Seen',       Boolean), #BOOLEAN
+    Column('street3Seen',       Boolean), #BOOLEAN
+    Column('street4Seen',       Boolean), #BOOLEAN
+    Column('sawShowdown',       Boolean), #BOOLEAN
+
+    Column('street1Aggr',       Boolean), #BOOLEAN
+    Column('street2Aggr',       Boolean), #BOOLEAN
+    Column('street3Aggr',       Boolean), #BOOLEAN
+    Column('street4Aggr',       Boolean), #BOOLEAN
+
+    Column('otherRaisedStreet0',Boolean), #BOOLEAN
+    Column('otherRaisedStreet1',Boolean), #BOOLEAN
+    Column('otherRaisedStreet2',Boolean), #BOOLEAN
+    Column('otherRaisedStreet3',Boolean), #BOOLEAN
+    Column('otherRaisedStreet4',Boolean), #BOOLEAN
+    Column('foldToOtherRaisedStreet0',   Boolean), #BOOLEAN
+    Column('foldToOtherRaisedStreet1',   Boolean), #BOOLEAN
+    Column('foldToOtherRaisedStreet2',   Boolean), #BOOLEAN
+    Column('foldToOtherRaisedStreet3',   Boolean), #BOOLEAN
+    Column('foldToOtherRaisedStreet4',   Boolean), #BOOLEAN
+
+    Column('stealAttemptChance',         Boolean), #BOOLEAN
+    Column('stealAttempted',             Boolean), #BOOLEAN
+    Column('foldBbToStealChance',        Boolean), #BOOLEAN
+    Column('foldedBbToSteal',            Boolean), #BOOLEAN
+    Column('foldSbToStealChance',        Boolean), #BOOLEAN
+    Column('foldedSbToSteal',            Boolean), #BOOLEAN
+
+    Column('street1CBChance',            Boolean), #BOOLEAN
+    Column('street1CBDone',              Boolean), #BOOLEAN
+    Column('street2CBChance',            Boolean), #BOOLEAN
+    Column('street2CBDone',              Boolean), #BOOLEAN
+    Column('street3CBChance',            Boolean), #BOOLEAN
+    Column('street3CBDone',              Boolean), #BOOLEAN
+    Column('street4CBChance',            Boolean), #BOOLEAN
+    Column('street4CBDone',              Boolean), #BOOLEAN
+
+    Column('foldToStreet1CBChance',      Boolean), #BOOLEAN
+    Column('foldToStreet1CBDone',        Boolean), #BOOLEAN
+    Column('foldToStreet2CBChance',      Boolean), #BOOLEAN
+    Column('foldToStreet2CBDone',        Boolean), #BOOLEAN
+    Column('foldToStreet3CBChance',      Boolean), #BOOLEAN
+    Column('foldToStreet3CBDone',        Boolean), #BOOLEAN
+    Column('foldToStreet4CBChance',      Boolean), #BOOLEAN
+    Column('foldToStreet4CBDone',        Boolean), #BOOLEAN
+
+    Column('street1CheckCallRaiseChance',Boolean), #BOOLEAN
+    Column('street1CheckCallRaiseDone',  Boolean), #BOOLEAN
+    Column('street2CheckCallRaiseChance',Boolean), #BOOLEAN
+    Column('street2CheckCallRaiseDone',  Boolean), #BOOLEAN
+    Column('street3CheckCallRaiseChance',Boolean), #BOOLEAN
+    Column('street3CheckCallRaiseDone',  Boolean), #BOOLEAN
+    Column('street4CheckCallRaiseChance',Boolean), #BOOLEAN
+    Column('street4CheckCallRaiseDone',  Boolean), #BOOLEAN
+
+    Column('street0Calls',               SmallInteger), #TINYINT
+    Column('street1Calls',               SmallInteger), #TINYINT
+    Column('street2Calls',               SmallInteger), #TINYINT
+    Column('street3Calls',               SmallInteger), #TINYINT
+    Column('street4Calls',               SmallInteger), #TINYINT
+    Column('street0Bets',                SmallInteger), #TINYINT
+    Column('street1Bets',                SmallInteger), #TINYINT
+    Column('street2Bets',                SmallInteger), #TINYINT
+    Column('street3Bets',                SmallInteger), #TINYINT
+    Column('street4Bets',                SmallInteger), #TINYINT
+    Column('street0Raises',              SmallInteger), #TINYINT
+    Column('street1Raises',              SmallInteger), #TINYINT
+    Column('street2Raises',              SmallInteger), #TINYINT
+    Column('street3Raises',              SmallInteger), #TINYINT
+    Column('street4Raises',              SmallInteger), #TINYINT
+
+    Column('actionString',               String(15)), #VARCHAR(15)
+    mysql_charset='utf8',
+    mysql_engine='InnoDB',
+)
+
+
+hud_cache_table = Table('HudCache', metadata,
+    Column('id',            BigIntColumn, primary_key=True),
+    Column('gametypeId',    SmallInteger, ForeignKey("Gametypes.id"), nullable=False), # SMALLINT 
+    Column('playerId',      Integer, ForeignKey("Players.id"), nullable=False), # SMALLINT 
+    Column('activeSeats',   SmallInteger, nullable=False), # SMALLINT NOT NULL
+    Column('position',      CHAR(1)), # CHAR(1)
+    Column('tourneyTypeId', Integer, ForeignKey("TourneyTypes.id") ), # SMALLINT 
+    Column('styleKey',      CHAR(7), nullable=False), # CHAR(7) NOT NULL
+    Column('m_factor',      Integer),
+    Column('HDs',           Integer, nullable=False), # INT NOT NULL
+
+    Column('wonWhenSeenStreet1',    Float), # FLOAT
+    Column('wonWhenSeenStreet2',    Float), # FLOAT
+    Column('wonWhenSeenStreet3',    Float), # FLOAT
+    Column('wonWhenSeenStreet4',    Float), # FLOAT
+    Column('wonAtSD',               Float), # FLOAT
+
+    Column('street0VPI',            Integer), # INT
+    Column('street0Aggr',           Integer), # INT
+    Column('street0_3BChance',      Integer), # INT
+    Column('street0_3BDone',        Integer), # INT
+    Column('street0_4BChance',      Integer), # INT
+    Column('street0_4BDone',        Integer), # INT
+    Column('other3BStreet0',        Integer), # INT
+    Column('other4BStreet0',        Integer), # INT
+
+    Column('street1Seen',           Integer), # INT
+    Column('street2Seen',           Integer), # INT
+    Column('street3Seen',           Integer), # INT
+    Column('street4Seen',           Integer), # INT
+    Column('sawShowdown',           Integer), # INT
+
+    Column('street1Aggr',           Integer), # INT
+    Column('street2Aggr',           Integer), # INT
+    Column('street3Aggr',           Integer), # INT
+    Column('street4Aggr',           Integer), # INT
+
+    Column('otherRaisedStreet0',        Integer), # INT
+    Column('otherRaisedStreet1',        Integer), # INT
+    Column('otherRaisedStreet2',        Integer), # INT
+    Column('otherRaisedStreet3',        Integer), # INT
+    Column('otherRaisedStreet4',        Integer), # INT
+    Column('foldToOtherRaisedStreet0',  Integer), # INT
+    Column('foldToOtherRaisedStreet1',  Integer), # INT
+    Column('foldToOtherRaisedStreet2',  Integer), # INT
+    Column('foldToOtherRaisedStreet3',  Integer), # INT
+    Column('foldToOtherRaisedStreet4',  Integer), # INT
+
+    Column('stealAttemptChance',        Integer), # INT
+    Column('stealAttempted',            Integer), # INT
+    Column('foldBbToStealChance',       Integer), # INT
+    Column('foldedBbToSteal',           Integer), # INT
+    Column('foldSbToStealChance',       Integer), # INT
+    Column('foldedSbToSteal',           Integer), # INT
+
+    Column('street1CBChance',           Integer), # INT
+    Column('street1CBDone',             Integer), # INT
+    Column('street2CBChance',           Integer), # INT
+    Column('street2CBDone',             Integer), # INT
+    Column('street3CBChance',           Integer), # INT
+    Column('street3CBDone',             Integer), # INT
+    Column('street4CBChance',           Integer), # INT
+    Column('street4CBDone',             Integer), # INT
+
+    Column('foldToStreet1CBChance',     Integer), # INT
+    Column('foldToStreet1CBDone',       Integer), # INT
+    Column('foldToStreet2CBChance',     Integer), # INT
+    Column('foldToStreet2CBDone',       Integer), # INT
+    Column('foldToStreet3CBChance',     Integer), # INT
+    Column('foldToStreet3CBDone',       Integer), # INT
+    Column('foldToStreet4CBChance',     Integer), # INT
+    Column('foldToStreet4CBDone',       Integer), # INT
+
+    Column('totalProfit',               Integer), # INT
+
+    Column('street1CheckCallRaiseChance',   Integer), # INT
+    Column('street1CheckCallRaiseDone',     Integer), # INT
+    Column('street2CheckCallRaiseChance',   Integer), # INT
+    Column('street2CheckCallRaiseDone',     Integer), # INT
+    Column('street3CheckCallRaiseChance',   Integer), # INT
+    Column('street3CheckCallRaiseDone',     Integer), # INT
+    Column('street4CheckCallRaiseChance',   Integer), # INT
+    Column('street4CheckCallRaiseDone',     Integer), # INT
+
+    Column('street0Calls',          Integer), # INT
+    Column('street1Calls',          Integer), # INT
+    Column('street2Calls',          Integer), # INT
+    Column('street3Calls',          Integer), # INT
+    Column('street4Calls',          Integer), # INT
+    Column('street0Bets',           Integer), # INT
+    Column('street1Bets',           Integer), # INT
+    Column('street2Bets',           Integer), # INT
+    Column('street3Bets',           Integer), # INT
+    Column('street4Bets',           Integer), # INT
+    Column('street0Raises',         Integer), # INT
+    Column('street1Raises',         Integer), # INT
+    Column('street2Raises',         Integer), # INT
+    Column('street3Raises',         Integer), # INT
+    Column('street4Raises',         Integer), # INT
+    mysql_charset='utf8',
+    mysql_engine='InnoDB',
+)
+
+
+players_table = Table('Players', metadata,
+    Column('id',            Integer, primary_key=True),
+    Column('name',          Unicode(32), nullable=False), # VARCHAR(32) CHARACTER SET utf8 NOT NULL
+    Column('siteId',        SmallInteger, ForeignKey("Sites.id"), nullable=False), # SMALLINT 
+    Column('comment',       Text), # text
+    Column('commentTs',     DateTime), # DATETIME
+    mysql_charset='utf8',
+    mysql_engine='InnoDB',
+)
+Index('name', players_table.c.name, players_table.c.siteId, unique=True)
+
+
+settings_table = Table('Settings', metadata,
+    Column('version',          SmallInteger, nullable=False), 
+    mysql_charset='utf8',
+    mysql_engine='InnoDB',
+)
+
+
+sites_table = Table('Sites', metadata,
+    Column('id',            SmallInteger, primary_key=True),
+    Column('name',          String(32), nullable=False), # varchar(32) NOT NULL
+    Column('currency',      String(3), nullable=False), # char(3) NOT NULL
+    mysql_charset='utf8',
+    mysql_engine='InnoDB',
+)
+
+
+tourneys_table = Table('Tourneys', metadata,
+    Column('id',            Integer, primary_key=True), 
+    Column('tourneyTypeId', Integer, ForeignKey("TourneyTypes.id"), nullable=False, default=1), 
+    Column('siteTourneyNo', BigIntColumn, nullable=False), # BIGINT NOT NULL
+    Column('entries',       Integer), # INT NOT NULL
+    Column('prizepool',     Integer), # INT NOT NULL
+    Column('tourStartTime',     DateTime), # DATETIME NOT NULL
+    Column('tourEndTime',       DateTime), # DATETIME
+    Column('buyinChips',    Integer), # INT
+    Column('tourneyName',   String(40)), # varchar(40)
+    # Mask use : 1=Positionnal Winnings|2=Match1|4=Match2|...|pow(2,n)=Matchn 
+    Column('matrixIdProcessed',SmallInteger, default=0), # TINYINT UNSIGNED DEFAULT 0   
+    Column('rebuyChips',    Integer, default=0), # INT DEFAULT 0
+    Column('addonChips',    Integer, default=0), # INT DEFAULT 0
+    Column('rebuyAmount',   MoneyColumn, default=0), # INT DEFAULT 0
+    Column('addonAmount',   MoneyColumn, default=0), # INT DEFAULT 0
+    Column('totalRebuys',   Integer, default=0), # INT DEFAULT 0
+    Column('totalAddons',   Integer, default=0), # INT DEFAULT 0
+    Column('koBounty',      Integer, default=0), # INT DEFAULT 0
+    Column('comment',       Text), # TEXT
+    Column('commentTs',     DateTime), # DATETIME
+    mysql_charset='utf8',
+    mysql_engine='InnoDB',
+)
+Index('siteTourneyNo', tourneys_table.c.siteTourneyNo, tourneys_table.c.tourneyTypeId, unique=True)
+
+
+tourney_types_table = Table('TourneyTypes', metadata,
+    Column('id',            Integer, primary_key=True), 
+    Column('siteId',        SmallInteger, ForeignKey("Sites.id"), nullable=False), 
+    Column('buyin',         Integer, nullable=False), # INT NOT NULL
+    Column('fee',           Integer, nullable=False, default=0), # INT NOT NULL
+    Column('maxSeats',      Boolean, nullable=False, default=-1), # INT NOT NULL DEFAULT -1
+    Column('knockout',      Boolean, nullable=False, default=False), # BOOLEAN NOT NULL DEFAULT False
+    Column('rebuyOrAddon',  Boolean, nullable=False, default=False), # BOOLEAN NOT NULL DEFAULT False
+    Column('speed',         String(10)), # varchar(10)
+    Column('headsUp',       Boolean, nullable=False, default=False), # BOOLEAN NOT NULL DEFAULT False
+    Column('shootout',      Boolean, nullable=False, default=False), # BOOLEAN NOT NULL DEFAULT False
+    Column('matrix',        Boolean, nullable=False, default=False), # BOOLEAN NOT NULL DEFAULT False
+    Column('sng',           Boolean, nullable=False, default=False), # BOOLEAN NOT NULL DEFAULT False
+    mysql_charset='utf8',
+    mysql_engine='InnoDB',
+)
+Index('tourneyTypes_all', 
+    tourney_types_table.c.siteId, tourney_types_table.c.buyin, tourney_types_table.c.fee, 
+    tourney_types_table.c.maxSeats, tourney_types_table.c.knockout, tourney_types_table.c.rebuyOrAddon, 
+    tourney_types_table.c.speed, tourney_types_table.c.headsUp, tourney_types_table.c.shootout, 
+    tourney_types_table.c.matrix, tourney_types_table.c.sng)
+
+
+tourneys_players_table = Table('TourneysPlayers', metadata,
+    Column('id',            BigIntColumn, primary_key=True), 
+    Column('tourneyId',     Integer, ForeignKey("Tourneys.id"), nullable=False), 
+    Column('playerId',      Integer, ForeignKey("Players.id"), nullable=False), 
+    Column('payinAmount',   Integer), # INT NOT NULL
+    Column('rank',          Integer), # INT NOT NULL
+    Column('winnings',      Integer), # INT NOT NULL
+    Column('nbRebuys',      Integer, default=0), # INT DEFAULT 0
+    Column('nbAddons',      Integer, default=0), # INT DEFAULT 0
+    Column('nbKO',          Integer, default=0), # INT DEFAULT 0
+    Column('comment',       Text), # TEXT
+    Column('commentTs',     DateTime), # DATETIME
+    mysql_charset='utf8',
+    mysql_engine='InnoDB',
+)
+Index('tourneyId', tourneys_players_table.c.tourneyId, tourneys_players_table.c.playerId, unique=True)
+
+
+def sss():
+    "Debug function. Returns (config, sql, db)"
+
+    import Configuration, SQL, Database, os
+    class Dummy(object):
+        pass
+    self = Dummy()
+    self.config = Configuration.Config()
+    self.settings = {}
+    if (os.sep=="/"):
+        self.settings['os']="linuxmac"
+    else:
+        self.settings['os']="windows"
+
+    self.settings.update(self.config.get_db_parameters())
+    self.settings.update(self.config.get_tv_parameters())
+    self.settings.update(self.config.get_import_parameters())
+    self.settings.update(self.config.get_default_paths())
+
+    self.sql = SQL.Sql( db_server = self.settings['db-server'])
+    self.db = Database.Database(self.config, sql = self.sql)
+
+    return self.config, self.sql, self.db
+

From 8cb73b822cfc258cf89256dfd0bda8ad9f9cfdc9 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Fri, 1 Jan 2010 22:57:25 +0000
Subject: [PATCH 053/320] set stats color to fgcolor

---
 pyfpdb/Hud.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pyfpdb/Hud.py b/pyfpdb/Hud.py
index 2b6d0237..1a27b682 100644
--- a/pyfpdb/Hud.py
+++ b/pyfpdb/Hud.py
@@ -606,6 +606,7 @@ class Hud:
             if self.update_table_position() == False: # we got killed by finding our table was gone
                 return
 
+        self.label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.colors['hudfgcolor']))
         for s in self.stat_dict:
             try:
                 statd = self.stat_dict[s]
@@ -629,20 +630,16 @@ class Hud:
                     window = self.stat_windows[statd['seat']]
 
                     if this_stat.hudcolor != "":
-                        self.label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.colors['hudfgcolor']))
                         window.label[r][c].modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(this_stat.hudcolor))
                     else:
-                        self.label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.colors['hudfgcolor']))
-                        window.label[r][c].modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse("#FFFFFF"))
+                        window.label[r][c].modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.colors['hudfgcolor']))
 					
                     if this_stat.stat_loth != "":
                         if number[0] < (float(this_stat.stat_loth)/100):
-                            self.label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.colors['hudfgcolor']))
                             window.label[r][c].modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(this_stat.stat_locolor))
 
                     if this_stat.stat_hith != "":
                         if number[0] > (float(this_stat.stat_hith)/100):
-                            self.label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.colors['hudfgcolor']))
                             window.label[r][c].modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(this_stat.stat_hicolor))
 
                     window.label[r][c].set_text(statstring)

From 1287ab95e736cfa58aea0b5d51ecc91765a5edf5 Mon Sep 17 00:00:00 2001
From: Eric Blade <blade.eric@gmail.com>
Date: Fri, 1 Jan 2010 20:53:27 -0500
Subject: [PATCH 054/320] stupid windows git newline mangling

---
 ...HE-6max-USD-0.05-0.10-200912.Allin-pre.txt | 82 +++++++++----------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Allin-pre.txt b/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Allin-pre.txt
index b876c42a..6c3ba7d3 100644
--- a/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Allin-pre.txt
+++ b/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Allin-pre.txt
@@ -1,41 +1,41 @@
-PokerStars Game #37165169101:  Hold'em No Limit ($0.10/$0.25 USD) - 2009/12/25 9:50:09 ET
-Table 'Lucretia IV' 6-max Seat #2 is the button
-Seat 1: Blåveis ($55.10 in chips) 
-Seat 2: Kinewma ($31.40 in chips) 
-Seat 3: AAALISAAAA ($20.20 in chips) 
-Seat 4: Arbaz ($25 in chips) 
-Seat 5: s0rrow ($29.85 in chips) 
-Seat 6: bys7 ($41.35 in chips) 
-AAALISAAAA: posts small blind $0.10
-Arbaz: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to s0rrow [Ac As]
-s0rrow: raises $0.50 to $0.75
-bys7: calls $0.75
-Blåveis: folds 
-Kinewma: folds 
-AAALISAAAA: raises $1.50 to $2.25
-Arbaz: folds 
-s0rrow: raises $3.50 to $5.75
-bys7: folds 
-AAALISAAAA: raises $14.45 to $20.20 and is all-in
-s0rrow: calls $14.45
-*** FLOP *** [3d 7h Kh]
-*** TURN *** [3d 7h Kh] [Ts]
-*** RIVER *** [3d 7h Kh Ts] [5c]
-*** SHOW DOWN ***
-AAALISAAAA: shows [Kd 5d] (two pair, Kings and Fives)
-s0rrow: shows [Ac As] (a pair of Aces)
-AAALISAAAA collected $39.35 from pot
-*** SUMMARY ***
-Total pot $41.40 | Rake $2.05 
-Board [3d 7h Kh Ts 5c]
-Seat 1: Blåveis folded before Flop (didn't bet)
-Seat 2: Kinewma (button) folded before Flop (didn't bet)
-Seat 3: AAALISAAAA (small blind) showed [Kd 5d] and won ($39.35) with two pair, Kings and Fives
-Seat 4: Arbaz (big blind) folded before Flop
-Seat 5: s0rrow showed [Ac As] and lost with a pair of Aces
-Seat 6: bys7 folded before Flop
-
-
-
+PokerStars Game #37165169101:  Hold'em No Limit ($0.10/$0.25 USD) - 2009/12/25 9:50:09 ET
+Table 'Lucretia IV' 6-max Seat #2 is the button
+Seat 1: Blåveis ($55.10 in chips) 
+Seat 2: Kinewma ($31.40 in chips) 
+Seat 3: AAALISAAAA ($20.20 in chips) 
+Seat 4: Arbaz ($25 in chips) 
+Seat 5: s0rrow ($29.85 in chips) 
+Seat 6: bys7 ($41.35 in chips) 
+AAALISAAAA: posts small blind $0.10
+Arbaz: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to s0rrow [Ac As]
+s0rrow: raises $0.50 to $0.75
+bys7: calls $0.75
+Blåveis: folds 
+Kinewma: folds 
+AAALISAAAA: raises $1.50 to $2.25
+Arbaz: folds 
+s0rrow: raises $3.50 to $5.75
+bys7: folds 
+AAALISAAAA: raises $14.45 to $20.20 and is all-in
+s0rrow: calls $14.45
+*** FLOP *** [3d 7h Kh]
+*** TURN *** [3d 7h Kh] [Ts]
+*** RIVER *** [3d 7h Kh Ts] [5c]
+*** SHOW DOWN ***
+AAALISAAAA: shows [Kd 5d] (two pair, Kings and Fives)
+s0rrow: shows [Ac As] (a pair of Aces)
+AAALISAAAA collected $39.35 from pot
+*** SUMMARY ***
+Total pot $41.40 | Rake $2.05 
+Board [3d 7h Kh Ts 5c]
+Seat 1: Blåveis folded before Flop (didn't bet)
+Seat 2: Kinewma (button) folded before Flop (didn't bet)
+Seat 3: AAALISAAAA (small blind) showed [Kd 5d] and won ($39.35) with two pair, Kings and Fives
+Seat 4: Arbaz (big blind) folded before Flop
+Seat 5: s0rrow showed [Ac As] and lost with a pair of Aces
+Seat 6: bys7 folded before Flop
+
+
+

From 62935664c80099f93d25b5dd4ca0628f9cc56f71 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Fri, 1 Jan 2010 22:57:25 +0000
Subject: [PATCH 055/320] set stats color to fgcolor

---
 pyfpdb/Hud.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pyfpdb/Hud.py b/pyfpdb/Hud.py
index 2b6d0237..1a27b682 100644
--- a/pyfpdb/Hud.py
+++ b/pyfpdb/Hud.py
@@ -606,6 +606,7 @@ class Hud:
             if self.update_table_position() == False: # we got killed by finding our table was gone
                 return
 
+        self.label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.colors['hudfgcolor']))
         for s in self.stat_dict:
             try:
                 statd = self.stat_dict[s]
@@ -629,20 +630,16 @@ class Hud:
                     window = self.stat_windows[statd['seat']]
 
                     if this_stat.hudcolor != "":
-                        self.label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.colors['hudfgcolor']))
                         window.label[r][c].modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(this_stat.hudcolor))
                     else:
-                        self.label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.colors['hudfgcolor']))
-                        window.label[r][c].modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse("#FFFFFF"))
+                        window.label[r][c].modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.colors['hudfgcolor']))
 					
                     if this_stat.stat_loth != "":
                         if number[0] < (float(this_stat.stat_loth)/100):
-                            self.label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.colors['hudfgcolor']))
                             window.label[r][c].modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(this_stat.stat_locolor))
 
                     if this_stat.stat_hith != "":
                         if number[0] > (float(this_stat.stat_hith)/100):
-                            self.label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.colors['hudfgcolor']))
                             window.label[r][c].modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(this_stat.stat_hicolor))
 
                     window.label[r][c].set_text(statstring)

From 659443127711355cd47dc5a133bb456ddaae8a03 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Tue, 12 Jan 2010 22:10:59 +0000
Subject: [PATCH 056/320] fix twostartcards to handle 22 and unknowns properly

---
 pyfpdb/Card.py           | 35 ++++++++++++++++++++++++-----------
 pyfpdb/GuiPlayerStats.py |  4 ++--
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/pyfpdb/Card.py b/pyfpdb/Card.py
index 8639fd35..22eab979 100755
--- a/pyfpdb/Card.py
+++ b/pyfpdb/Card.py
@@ -39,23 +39,36 @@ def calcStartCards(hand, player):
 
 def twoStartCards(value1, suit1, value2, suit2):
     """ Function to convert 2 value,suit pairs into a Holdem style starting hand e.g. AQo
-        Hand is stored as an int 13 * x + y where (x+2) represents rank of 1st card and
+        Incoming values should be ints 2-14 (2,3,...K,A), suits are 'd'/'h'/'c'/'s'
+        Hand is stored as an int 13 * x + y + 1 where (x+2) represents rank of 1st card and
         (y+2) represents rank of second card (2=2 .. 14=Ace)
-        If x > y then pair is suited, if x < y then unsuited"""
-    if value1 < 2 or value2 < 2:
+        If x > y then pair is suited, if x < y then unsuited
+        Examples:
+           0  Unknown / Illegal cards
+           1  22
+           2  32o
+           3  42o
+              ...
+          14  32s
+          15  33
+          16  42o
+              ...
+         170  AA
+    """
+    if value1 is None or value1 < 2 or value1 > 14 or value2 is None or value2 < 2 or value2 > 14:
         ret = 0
-    if value1 == value2: # pairs
-        ret = (13 * (value2-2) + (value2-2) )
+    elif value1 == value2: # pairs
+        ret = (13 * (value2-2) + (value2-2) ) + 1
     elif suit1 == suit2:
         if value1 > value2:
-            ret = 13 * (value1-2) + (value2-2)
+            ret = 13 * (value1-2) + (value2-2) + 1
         else:
-            ret = 13 * (value2-2) + (value1-2)
+            ret = 13 * (value2-2) + (value1-2) + 1
     else:
         if value1 > value2:
-            ret = 13 * (value2-2) + (value1-2)
+            ret = 13 * (value2-2) + (value1-2) + 1
         else:
-            ret = 13 * (value1-2) + (value2-2)
+            ret = 13 * (value1-2) + (value2-2) + 1
             
 #    print "twoStartCards(", value1, suit1, value2, suit2, ")=", ret
     return ret
@@ -66,8 +79,8 @@ def twoStartCardString(card):
     ret = 'xx'
     if card > 0:
         s = ('2', '3', '4', '5', '6', '7', '8', '9', 'T', 'J', 'Q', 'K', 'A')
-        x = card / 13
-        y = card - 13 * x
+        x = (card-1) / 13
+        y = (card-1) - 13 * x
         if x == y:  ret = s[x] + s[y]
         elif x > y: ret = s[x] + s[y] + 's'
         else:       ret = s[y] + s[x] + 'o'
diff --git a/pyfpdb/GuiPlayerStats.py b/pyfpdb/GuiPlayerStats.py
index d65b9ab6..889988c5 100644
--- a/pyfpdb/GuiPlayerStats.py
+++ b/pyfpdb/GuiPlayerStats.py
@@ -516,8 +516,8 @@ class GuiPlayerStats (threading.Thread):
         if holecards:  # re-use level variables for hole card query
             query = query.replace("<hgameTypeId>", "hp.startcards")
             query = query.replace("<orderbyhgameTypeId>"
-                                 , ",case when floor(hp.startcards/13) >= mod(hp.startcards,13) then hp.startcards + 0.1 "
-                                   +    " else 13*mod(hp.startcards,13) + floor(hp.startcards/13) "
+                                 , ",case when floor((hp.startcards-1)/13) >= mod((hp.startcards-1),13) then hp.startcards + 0.1 "
+                                   +    " else 13*mod((hp.startcards-1),13) + floor((hp.startcards-1)/13) + 1 "
                                    +    " end desc ")
         else:
             query = query.replace("<orderbyhgameTypeId>", "")

From 012b5bc72c5ec08043237f619e10814d07c04f3c Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Tue, 12 Jan 2010 22:10:59 +0000
Subject: [PATCH 057/320] fix twostartcards to handle 22 and unknowns properly

---
 pyfpdb/Card.py           | 35 ++++++++++++++++++++++++-----------
 pyfpdb/GuiPlayerStats.py |  4 ++--
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/pyfpdb/Card.py b/pyfpdb/Card.py
index 287a0f6a..3eef58c5 100755
--- a/pyfpdb/Card.py
+++ b/pyfpdb/Card.py
@@ -20,23 +20,36 @@
 
 def twoStartCards(value1, suit1, value2, suit2):
     """ Function to convert 2 value,suit pairs into a Holdem style starting hand e.g. AQo
-        Hand is stored as an int 13 * x + y where (x+2) represents rank of 1st card and
+        Incoming values should be ints 2-14 (2,3,...K,A), suits are 'd'/'h'/'c'/'s'
+        Hand is stored as an int 13 * x + y + 1 where (x+2) represents rank of 1st card and
         (y+2) represents rank of second card (2=2 .. 14=Ace)
-        If x > y then pair is suited, if x < y then unsuited"""
-    if value1 < 2 or value2 < 2:
+        If x > y then pair is suited, if x < y then unsuited
+        Examples:
+           0  Unknown / Illegal cards
+           1  22
+           2  32o
+           3  42o
+              ...
+          14  32s
+          15  33
+          16  42o
+              ...
+         170  AA
+    """
+    if value1 is None or value1 < 2 or value1 > 14 or value2 is None or value2 < 2 or value2 > 14:
         ret = 0
-    if value1 == value2: # pairs
-        ret = (13 * (value2-2) + (value2-2) )
+    elif value1 == value2: # pairs
+        ret = (13 * (value2-2) + (value2-2) ) + 1
     elif suit1 == suit2:
         if value1 > value2:
-            ret = 13 * (value1-2) + (value2-2)
+            ret = 13 * (value1-2) + (value2-2) + 1
         else:
-            ret = 13 * (value2-2) + (value1-2)
+            ret = 13 * (value2-2) + (value1-2) + 1
     else:
         if value1 > value2:
-            ret = 13 * (value2-2) + (value1-2)
+            ret = 13 * (value2-2) + (value1-2) + 1
         else:
-            ret = 13 * (value1-2) + (value2-2)
+            ret = 13 * (value1-2) + (value2-2) + 1
             
 #    print "twoStartCards(", value1, suit1, value2, suit2, ")=", ret
     return ret
@@ -47,8 +60,8 @@ def twoStartCardString(card):
     ret = 'xx'
     if card > 0:
         s = ('2', '3', '4', '5', '6', '7', '8', '9', 'T', 'J', 'Q', 'K', 'A')
-        x = card / 13
-        y = card - 13 * x
+        x = (card-1) / 13
+        y = (card-1) - 13 * x
         if x == y:  ret = s[x] + s[y]
         elif x > y: ret = s[x] + s[y] + 's'
         else:       ret = s[y] + s[x] + 'o'
diff --git a/pyfpdb/GuiPlayerStats.py b/pyfpdb/GuiPlayerStats.py
index d65b9ab6..889988c5 100644
--- a/pyfpdb/GuiPlayerStats.py
+++ b/pyfpdb/GuiPlayerStats.py
@@ -516,8 +516,8 @@ class GuiPlayerStats (threading.Thread):
         if holecards:  # re-use level variables for hole card query
             query = query.replace("<hgameTypeId>", "hp.startcards")
             query = query.replace("<orderbyhgameTypeId>"
-                                 , ",case when floor(hp.startcards/13) >= mod(hp.startcards,13) then hp.startcards + 0.1 "
-                                   +    " else 13*mod(hp.startcards,13) + floor(hp.startcards/13) "
+                                 , ",case when floor((hp.startcards-1)/13) >= mod((hp.startcards-1),13) then hp.startcards + 0.1 "
+                                   +    " else 13*mod((hp.startcards-1),13) + floor((hp.startcards-1)/13) + 1 "
                                    +    " end desc ")
         else:
             query = query.replace("<orderbyhgameTypeId>", "")

From bad744fd80ac6092a7d02deda0721157db9e61bf Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Fri, 15 Jan 2010 13:50:46 +0800
Subject: [PATCH 058/320] [NEWIMPORT] setPositions(), fix aggr function

PFR now actually works
---
 pyfpdb/DerivedStats.py | 73 +++++++++++++++++++++++++++++-------------
 1 file changed, 51 insertions(+), 22 deletions(-)

diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py
index 7c50178b..920d60cf 100644
--- a/pyfpdb/DerivedStats.py
+++ b/pyfpdb/DerivedStats.py
@@ -48,6 +48,7 @@ class DerivedStats():
             self.handsplayers[player[1]]['sawShowdown'] = False
             self.handsplayers[player[1]]['wonAtSD']     = 0.0
             self.handsplayers[player[1]]['startCards']  = 0
+            self.handsplayers[player[1]]['position']            = 2
             for i in range(5): 
                 self.handsplayers[player[1]]['street%dCalls' % i] = 0
                 self.handsplayers[player[1]]['street%dBets' % i] = 0
@@ -56,7 +57,6 @@ class DerivedStats():
                 self.handsplayers[player[1]]['street%dCBDone' %i] = False
 
             #FIXME - Everything below this point is incomplete.
-            self.handsplayers[player[1]]['position']            = 2
             self.handsplayers[player[1]]['tourneyTypeId']       = 1
             self.handsplayers[player[1]]['street0_3BChance']    = False
             self.handsplayers[player[1]]['street0_3BDone']      = False
@@ -174,31 +174,41 @@ class DerivedStats():
                 self.handsplayers[player[1]]['card%s' % (i+1)] = Card.encodeCard(card)
             self.handsplayers[player[1]]['startCards'] = Card.calcStartCards(hand, player[1])
 
-        # position,
-            #Stud 3rd street card test
-            # denny501: brings in for $0.02
-            # s0rrow: calls $0.02
-            # TomSludge: folds
-            # Soroka69: calls $0.02
-            # rdiezchang: calls $0.02           (Seat 8)
-            # u.pressure: folds                 (Seat 1)
-            # 123smoothie: calls $0.02
-            # gashpor: calls $0.02
-
+        self.setPositions(hand)
         # Additional stats
         # 3betSB, 3betBB
         # Squeeze, Ratchet?
 
 
-    def getPosition(hand, seat):
-        """Returns position value like 'B', 'S', 0, 1, ..."""
-        # Flop/Draw games with blinds
-        # Need a better system???
-        # -2 BB - B (all)
-        # -1 SB - S (all)
-        #  0 Button 
-        #  1 Cutoff
-        #  2 Hijack
+    def setPositions(self, hand):
+        """Sets the position for each player in HandsPlayers
+            any blinds are negative values, and the last person to act on the
+            first betting round is 0
+            NOTE: HU, both values are negative for non-stud games
+            NOTE2: I've never seen a HU stud match"""
+        # The position calculation must be done differently for Stud and other games as
+        # Stud the 'blind' acts first - in all other games they act last.
+        #
+        #This function is going to get it wrong when there in situations where there
+        # is no small blind. I can live with that.
+        positions = [7, 6, 5, 4, 3, 2, 1, 0, 'S', 'B']
+        actions = hand.actions[hand.holeStreets[0]]
+        players = self.pfbao(actions)
+        seats = len(players)
+        map = []
+        if hand.gametype['base'] == 'stud':
+            # Could posibly change this to be either -2 or -1 depending if they complete or bring-in
+            # First player to act is -1, last player is 0 for 6 players it should look like:
+            # ['S', 4, 3, 2, 1, 0]
+            map = positions[-seats-1:-1] # Copy required positions from postions array anding in -1
+            map = map[-1:] + map[0:-1] # and move the -1 to the start of that array
+        else:
+            # For 6 players is should look like:
+            # [3, 2, 1, 0, 'S', 'B']
+            map = positions[-seats:] # Copy required positions from array ending in -2
+
+        for i, player in enumerate(players):
+            self.handsplayers[player]['position'] = map[i]
 
     def assembleHudCache(self, hand):
         # No real work to be done - HandsPlayers data already contains the correct info
@@ -362,11 +372,13 @@ class DerivedStats():
 
     def aggr(self, hand, i):
         aggrers = set()
-        for act in hand.actions[hand.actionStreets[i]]:
+        # Growl - actionStreets contains 'BLINDSANTES', which isn't actually an action street
+        for act in hand.actions[hand.actionStreets[i+1]]:
             if act[1] in ('completes', 'bets', 'raises'):
                 aggrers.add(act[0])
 
         for player in hand.players:
+            #print "DEBUG: actionStreet[%s]: %s" %(hand.actionStreets[i+1], i)
             if player[1] in aggrers:
                 self.handsplayers[player[1]]['street%sAggr' % i] = True
             else:
@@ -402,6 +414,23 @@ class DerivedStats():
             players.add(action[0])
         return players
 
+    def pfbao(self, actions, f=None, l=None, unique=True):
+        """Helper method. Returns set of PlayersFilteredByActionsOrdered
+
+        f - forbidden actions
+        l - limited to actions
+        """
+        # Note, this is an adaptation of function 5 from:
+        # http://www.peterbe.com/plog/uniqifiers-benchmark
+        seen = {}
+        players = []
+        for action in actions:
+            if l is not None and action[1] not in l: continue
+            if f is not None and action[1] in f: continue
+            if action[0] in seen and unique: continue
+            seen[action[0]] = 1
+            players.append(action[0])
+        return players
 
     def firstsBetOrRaiser(self, actions):
         """Returns player name that placed the first bet or raise.

From 700a68bcc803647251dde8ce53c44b151458bd16 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Fri, 15 Jan 2010 18:29:16 +0800
Subject: [PATCH 059/320] [NEWIMPORT] calcCheckCallRaise()

Modify function from Grigorij to calculate check/call
---
 pyfpdb/DerivedStats.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py
index 920d60cf..fe857ae4 100644
--- a/pyfpdb/DerivedStats.py
+++ b/pyfpdb/DerivedStats.py
@@ -55,6 +55,8 @@ class DerivedStats():
             for i in range(1,5):
                 self.handsplayers[player[1]]['street%dCBChance' %i] = False
                 self.handsplayers[player[1]]['street%dCBDone' %i] = False
+                self.handsplayers[player[1]]['street%dCheckCallRaiseChance' %i] = False
+                self.handsplayers[player[1]]['street%dCheckCallRaiseDone' %i]   = False
 
             #FIXME - Everything below this point is incomplete.
             self.handsplayers[player[1]]['tourneyTypeId']       = 1
@@ -72,8 +74,6 @@ class DerivedStats():
                 self.handsplayers[player[1]]['foldToOtherRaisedStreet%d' %i]    = False
                 self.handsplayers[player[1]]['foldToStreet%dCBChance' %i]       = False
                 self.handsplayers[player[1]]['foldToStreet%dCBDone' %i]         = False
-                self.handsplayers[player[1]]['street%dCheckCallRaiseChance' %i] = False
-                self.handsplayers[player[1]]['street%dCheckCallRaiseDone' %i]   = False
 
         self.assembleHands(self.hand)
         self.assembleHandsPlayers(self.hand)
@@ -175,6 +175,7 @@ class DerivedStats():
             self.handsplayers[player[1]]['startCards'] = Card.calcStartCards(hand, player[1])
 
         self.setPositions(hand)
+        self.calcCheckCallRaise(hand)
         # Additional stats
         # 3betSB, 3betBB
         # Squeeze, Ratchet?
@@ -352,12 +353,11 @@ class DerivedStats():
                 pname, act = action[0], action[1]
                 if act in ('bets', 'raises') and initial_raiser is None:
                     initial_raiser = pname
-                elif act == 'check' and initial_raiser is None:
+                elif act == 'checks' and initial_raiser is None:
                     checkers.add(pname)
                 elif initial_raiser is not None and pname in checkers:
-                    hp = self.handplayers_by_name[pname]
-                    setattr(hp, 'street%dCheckCallRaiseChance' % i, True)
-                    setattr(hp, 'street%dCheckCallRaiseDone' % i, act!='folds')
+                    self.handsplayers[pname]['street%dCheckCallRaiseChance' % i] = True
+                    self.handsplayers[pname]['street%dCheckCallRaiseDone' % i] = act!='folds'
 
     def seen(self, hand, i):
         pas = set()

From ecf1c6b878ebcc02f49c751c6c9228014812f316 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Fri, 15 Jan 2010 19:42:24 +0800
Subject: [PATCH 060/320] [NEWIMPORT] Almost all remaining stats

All conversions from Grigorij

street0_3BChance
street0_3BDone
street0_4BChance
street0_4BDone
stealAttemptChance
stealAttempted
foldBbToStealChance
foldBbToStealChance
foldSbToStealChance
foldedSbToSteal
foldedBbToSteal

3Bet, 4Bet in Stud does appear to work.

Unable to test steal in Stud games, all example hands in micros do not have a chance (I believe)
---
 pyfpdb/DerivedStats.py | 59 +++++++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py
index fe857ae4..8b9af93b 100644
--- a/pyfpdb/DerivedStats.py
+++ b/pyfpdb/DerivedStats.py
@@ -49,6 +49,17 @@ class DerivedStats():
             self.handsplayers[player[1]]['wonAtSD']     = 0.0
             self.handsplayers[player[1]]['startCards']  = 0
             self.handsplayers[player[1]]['position']            = 2
+            self.handsplayers[player[1]]['street0_3BChance']    = False
+            self.handsplayers[player[1]]['street0_3BDone']      = False
+            self.handsplayers[player[1]]['street0_4BChance']    = False
+            self.handsplayers[player[1]]['street0_4BDone']      = False
+            self.handsplayers[player[1]]['stealAttemptChance']  = False
+            self.handsplayers[player[1]]['stealAttempted']      = False
+            self.handsplayers[player[1]]['foldBbToStealChance'] = False
+            self.handsplayers[player[1]]['foldBbToStealChance'] = False
+            self.handsplayers[player[1]]['foldSbToStealChance'] = False
+            self.handsplayers[player[1]]['foldedSbToSteal']     = False
+            self.handsplayers[player[1]]['foldedBbToSteal']     = False
             for i in range(5): 
                 self.handsplayers[player[1]]['street%dCalls' % i] = 0
                 self.handsplayers[player[1]]['street%dBets' % i] = 0
@@ -60,15 +71,6 @@ class DerivedStats():
 
             #FIXME - Everything below this point is incomplete.
             self.handsplayers[player[1]]['tourneyTypeId']       = 1
-            self.handsplayers[player[1]]['street0_3BChance']    = False
-            self.handsplayers[player[1]]['street0_3BDone']      = False
-            self.handsplayers[player[1]]['stealAttemptChance']  = False
-            self.handsplayers[player[1]]['stealAttempted']      = False
-            self.handsplayers[player[1]]['foldBbToStealChance'] = False
-            self.handsplayers[player[1]]['foldBbToStealChance'] = False
-            self.handsplayers[player[1]]['foldSbToStealChance'] = False
-            self.handsplayers[player[1]]['foldedSbToSteal']     = False
-            self.handsplayers[player[1]]['foldedBbToSteal']     = False
             for i in range(1,5):
                 self.handsplayers[player[1]]['otherRaisedStreet%d' %i]          = False
                 self.handsplayers[player[1]]['foldToOtherRaisedStreet%d' %i]    = False
@@ -176,6 +178,8 @@ class DerivedStats():
 
         self.setPositions(hand)
         self.calcCheckCallRaise(hand)
+        self.calc34BetStreet0(hand)
+        self.calcSteals(hand)
         # Additional stats
         # 3betSB, 3betBB
         # Squeeze, Ratchet?
@@ -280,28 +284,29 @@ class DerivedStats():
         Steal attemp - open raise on positions 2 1 0 S - i.e. MP3, CO, BU, SB
         Fold to steal - folding blind after steal attemp wo any other callers or raisers
         """
-        if self.gametype_dict['base'] != 'hold':
-            # FIXME: add support for other games //grindi
-            return
         steal_attemp = False
+        steal_positions = ('2', '1', '0', 'S')
+        if hand.gametype['base'] == 'stud':
+            steal_positions = ('2', '1', '0')
         for action in hand.actions[hand.actionStreets[1]]:
-            hp, act = self.handplayers_by_name[action[0]], action[1]
+            pname, act = action[0], action[1]
             #print action[0], hp.position, steal_attemp, act
-            if hp.position == 'B':
-                hp.foldBbToStealChance = steal_attemp
-                hp.foldBbToSteal = hp.foldBbToStealChance and act == 'folds'
+            if self.handsplayers[pname]['position'] == 'B':
+                #NOTE: Stud games will never hit this section
+                self.handsplayers[pname]['foldBbToStealChance'] = steal_attemp
+                self.handsplayers[pname]['foldBbToSteal'] = self.handsplayers[pname]['foldBbToStealChance'] and act == 'folds'
                 break
-            elif hp.position == 'S':
-                hp.foldSbToStealChance = steal_attemp
-                hp.foldSbToSteal = hp.foldSbToStealChance and act == 'folds'
+            elif self.handsplayers[pname]['position'] == 'S':
+                self.handsplayers[pname]['foldSbToStealChance'] = steal_attemp
+                self.handsplayers[pname]['foldSbToSteal'] = self.handsplayers[pname]['foldSbToStealChance'] and act == 'folds'
 
             if steal_attemp and act != 'folds':
                 break
 
-            if hp.position in ('2', '1', '0', 'S') and not steal_attemp:
-                hp.stealAttemptChance = True
+            if self.handsplayers[pname]['position'] in steal_positions and not steal_attemp:
+                self.handsplayers[pname]['stealAttemptChance'] = True
                 if act in ('bets', 'raises'):
-                    hp.stealAttempted = True
+                    self.handsplayers[pname]['stealAttempted'] = True
                     steal_attemp = True
 
     def calc34BetStreet0(self, hand):
@@ -309,11 +314,11 @@ class DerivedStats():
         bet_level = 1 # bet_level after 3-bet is equal to 3
         for action in hand.actions[hand.actionStreets[1]]:
             # FIXME: fill other(3|4)BStreet0 - i have no idea what does it mean
-            hp, aggr = self.handplayers_by_name[action[0]], action[1] in ('raises', 'bets')
-            hp.street0_3BChance = bet_level == 2
-            hp.street0_4BChance = bet_level == 3
-            hp.street0_3BDone =  aggr and (hp.street0_3BChance)
-            hp.street0_4BDone =  aggr and (hp.street0_4BChance)
+            pname, aggr = action[0], action[1] in ('raises', 'bets')
+            self.handsplayers[pname]['street0_3BChance'] = bet_level == 2
+            self.handsplayers[pname]['street0_4BChance'] = bet_level == 3
+            self.handsplayers[pname]['street0_3BDone'] =  aggr and (self.handsplayers[pname]['street0_3BChance'])
+            self.handsplayers[pname]['street0_4BDone'] =  aggr and (self.handsplayers[pname]['street0_4BChance'])
             if aggr:
                 bet_level += 1
 

From 95aa993903fe075cd89dc43a45c900f0ad19332e Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Fri, 15 Jan 2010 13:50:46 +0800
Subject: [PATCH 061/320] [NEWIMPORT] setPositions(), fix aggr function

PFR now actually works
---
 pyfpdb/DerivedStats.py | 105 ++++++++++++++++++++++++++++-------------
 1 file changed, 73 insertions(+), 32 deletions(-)

diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py
index b65b0d05..bd36f0fb 100644
--- a/pyfpdb/DerivedStats.py
+++ b/pyfpdb/DerivedStats.py
@@ -48,6 +48,7 @@ class DerivedStats():
             self.handsplayers[player[1]]['sawShowdown'] = False
             self.handsplayers[player[1]]['wonAtSD']     = 0.0
             self.handsplayers[player[1]]['startCards']  = 0
+            self.handsplayers[player[1]]['position']            = 2
             for i in range(5): 
                 self.handsplayers[player[1]]['street%dCalls' % i] = 0
                 self.handsplayers[player[1]]['street%dBets' % i] = 0
@@ -56,7 +57,6 @@ class DerivedStats():
                 self.handsplayers[player[1]]['street%dCBDone' %i] = False
 
             #FIXME - Everything below this point is incomplete.
-            self.handsplayers[player[1]]['position']            = 2
             self.handsplayers[player[1]]['tourneyTypeId']       = 1
             self.handsplayers[player[1]]['street0_3BChance']    = False
             self.handsplayers[player[1]]['street0_3BDone']      = False
@@ -174,31 +174,41 @@ class DerivedStats():
                 self.handsplayers[player[1]]['card%s' % (i+1)] = Card.encodeCard(card)
             self.handsplayers[player[1]]['startCards'] = Card.calcStartCards(hand, player[1])
 
-        # position,
-            #Stud 3rd street card test
-            # denny501: brings in for $0.02
-            # s0rrow: calls $0.02
-            # TomSludge: folds
-            # Soroka69: calls $0.02
-            # rdiezchang: calls $0.02           (Seat 8)
-            # u.pressure: folds                 (Seat 1)
-            # 123smoothie: calls $0.02
-            # gashpor: calls $0.02
-
+        self.setPositions(hand)
         # Additional stats
         # 3betSB, 3betBB
         # Squeeze, Ratchet?
 
 
-    def getPosition(hand, seat):
-        """Returns position value like 'B', 'S', 0, 1, ..."""
-        # Flop/Draw games with blinds
-        # Need a better system???
-        # -2 BB - B (all)
-        # -1 SB - S (all)
-        #  0 Button 
-        #  1 Cutoff
-        #  2 Hijack
+    def setPositions(self, hand):
+        """Sets the position for each player in HandsPlayers
+            any blinds are negative values, and the last person to act on the
+            first betting round is 0
+            NOTE: HU, both values are negative for non-stud games
+            NOTE2: I've never seen a HU stud match"""
+        # The position calculation must be done differently for Stud and other games as
+        # Stud the 'blind' acts first - in all other games they act last.
+        #
+        #This function is going to get it wrong when there in situations where there
+        # is no small blind. I can live with that.
+        positions = [7, 6, 5, 4, 3, 2, 1, 0, 'S', 'B']
+        actions = hand.actions[hand.holeStreets[0]]
+        players = self.pfbao(actions)
+        seats = len(players)
+        map = []
+        if hand.gametype['base'] == 'stud':
+            # Could posibly change this to be either -2 or -1 depending if they complete or bring-in
+            # First player to act is -1, last player is 0 for 6 players it should look like:
+            # ['S', 4, 3, 2, 1, 0]
+            map = positions[-seats-1:-1] # Copy required positions from postions array anding in -1
+            map = map[-1:] + map[0:-1] # and move the -1 to the start of that array
+        else:
+            # For 6 players is should look like:
+            # [3, 2, 1, 0, 'S', 'B']
+            map = positions[-seats:] # Copy required positions from array ending in -2
+
+        for i, player in enumerate(players):
+            self.handsplayers[player]['position'] = map[i]
 
     def assembleHudCache(self, hand):
         pass
@@ -293,11 +303,13 @@ class DerivedStats():
 
     def aggr(self, hand, i):
         aggrers = set()
-        for act in hand.actions[hand.actionStreets[i]]:
-            if act[1] in ('completes', 'raises'):
+        # Growl - actionStreets contains 'BLINDSANTES', which isn't actually an action street
+        for act in hand.actions[hand.actionStreets[i+1]]:
+            if act[1] in ('completes', 'bets', 'raises'):
                 aggrers.add(act[0])
 
         for player in hand.players:
+            #print "DEBUG: actionStreet[%s]: %s" %(hand.actionStreets[i+1], i)
             if player[1] in aggrers:
                 self.handsplayers[player[1]]['street%sAggr' % i] = True
             else:
@@ -333,6 +345,44 @@ class DerivedStats():
             players.add(action[0])
         return players
 
+    def pfbao(self, actions, f=None, l=None, unique=True):
+        """Helper method. Returns set of PlayersFilteredByActionsOrdered
+
+        f - forbidden actions
+        l - limited to actions
+        """
+        # Note, this is an adaptation of function 5 from:
+        # http://www.peterbe.com/plog/uniqifiers-benchmark
+        seen = {}
+        players = []
+        for action in actions:
+            if l is not None and action[1] not in l: continue
+            if f is not None and action[1] in f: continue
+            if action[0] in seen and unique: continue
+            seen[action[0]] = 1
+            players.append(action[0])
+        return players
+
+    def firstsBetOrRaiser(self, actions):
+        """Returns player name that placed the first bet or raise.
+
+        None if there were no bets or raises on that street
+        """
+        for act in actions:
+            if act[1] in ('bets', 'raises'):
+                return act[0]
+        return None
+
+    def lastBetOrRaiser(self, street):
+        """Returns player name that placed the last bet or raise for that street.
+            None if there were no bets or raises on that street"""
+        lastbet = None
+        for act in self.hand.actions[street]:
+            if act[1] in ('bets', 'raises'):
+                lastbet = act[0]
+        return lastbet
+
+
     def noBetsBefore(self, street, player):
         """Returns true if there were no bets before the specified players turn, false otherwise"""
         betOrRaise = False
@@ -355,12 +405,3 @@ class DerivedStats():
                 break
         return betOrRaise
 
-
-    def lastBetOrRaiser(self, street):
-        """Returns player name that placed the last bet or raise for that street.
-            None if there were no bets or raises on that street"""
-        lastbet = None
-        for act in self.hand.actions[street]:
-            if act[1] in ('bets', 'raises'):
-                lastbet = act[0]
-        return lastbet

From 150b1891d63ad0d557add7f6beb891942c197453 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Fri, 15 Jan 2010 13:50:46 +0800
Subject: [PATCH 062/320] [NEWIMPORT] setPositions(), fix aggr function

PFR now actually works
---
 pyfpdb/DerivedStats.py | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py
index bd36f0fb..e064f6be 100644
--- a/pyfpdb/DerivedStats.py
+++ b/pyfpdb/DerivedStats.py
@@ -55,6 +55,8 @@ class DerivedStats():
             for i in range(1,5):
                 self.handsplayers[player[1]]['street%dCBChance' %i] = False
                 self.handsplayers[player[1]]['street%dCBDone' %i] = False
+                self.handsplayers[player[1]]['street%dCheckCallRaiseChance' %i] = False
+                self.handsplayers[player[1]]['street%dCheckCallRaiseDone' %i]   = False
 
             #FIXME - Everything below this point is incomplete.
             self.handsplayers[player[1]]['tourneyTypeId']       = 1
@@ -72,8 +74,6 @@ class DerivedStats():
                 self.handsplayers[player[1]]['foldToOtherRaisedStreet%d' %i]    = False
                 self.handsplayers[player[1]]['foldToStreet%dCBChance' %i]       = False
                 self.handsplayers[player[1]]['foldToStreet%dCBDone' %i]         = False
-                self.handsplayers[player[1]]['street%dCheckCallRaiseChance' %i] = False
-                self.handsplayers[player[1]]['street%dCheckCallRaiseDone' %i]   = False
 
         self.assembleHands(self.hand)
         self.assembleHandsPlayers(self.hand)
@@ -175,6 +175,7 @@ class DerivedStats():
             self.handsplayers[player[1]]['startCards'] = Card.calcStartCards(hand, player[1])
 
         self.setPositions(hand)
+        self.calcCheckCallRaise(hand)
         # Additional stats
         # 3betSB, 3betBB
         # Squeeze, Ratchet?
@@ -290,6 +291,28 @@ class DerivedStats():
                 if chance == True:
                     self.handsplayers[name]['street%dCBDone' % (i+1)] = self.betStreet(hand.actionStreets[i+2], name)
 
+    def calcCheckCallRaise(self, hand):
+        """Fill streetXCheckCallRaiseChance, streetXCheckCallRaiseDone
+
+        streetXCheckCallRaiseChance = got raise/bet after check
+        streetXCheckCallRaiseDone = checked. got raise/bet. didn't fold
+
+        CG: CheckCall would be a much better name for this.
+        """
+        for i, street in enumerate(hand.actionStreets[2:], start=1):
+            actions = hand.actions[hand.actionStreets[i]]
+            checkers = set()
+            initial_raiser = None
+            for action in actions:
+                pname, act = action[0], action[1]
+                if act in ('bets', 'raises') and initial_raiser is None:
+                    initial_raiser = pname
+                elif act == 'checks' and initial_raiser is None:
+                    checkers.add(pname)
+                elif initial_raiser is not None and pname in checkers:
+                    self.handsplayers[pname]['street%dCheckCallRaiseChance' % i] = True
+                    self.handsplayers[pname]['street%dCheckCallRaiseDone' % i] = act!='folds'
+
     def seen(self, hand, i):
         pas = set()
         for act in hand.actions[hand.actionStreets[i+1]]:

From 5c0d695055fcfbdbaf64a82e7cde2e62bbe5d065 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Fri, 15 Jan 2010 19:42:24 +0800
Subject: [PATCH 063/320] [NEWIMPORT] Almost all remaining stats

All conversions from Grigorij

street0_3BChance
street0_3BDone
street0_4BChance
street0_4BDone
stealAttemptChance
stealAttempted
foldBbToStealChance
foldBbToStealChance
foldSbToStealChance
foldedSbToSteal
foldedBbToSteal

3Bet, 4Bet in Stud does appear to work.

Unable to test steal in Stud games, all example hands in micros do not have a chance (I believe)
---
 pyfpdb/DerivedStats.py | 80 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 65 insertions(+), 15 deletions(-)

diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py
index e064f6be..f96b6af7 100644
--- a/pyfpdb/DerivedStats.py
+++ b/pyfpdb/DerivedStats.py
@@ -49,6 +49,17 @@ class DerivedStats():
             self.handsplayers[player[1]]['wonAtSD']     = 0.0
             self.handsplayers[player[1]]['startCards']  = 0
             self.handsplayers[player[1]]['position']            = 2
+            self.handsplayers[player[1]]['street0_3BChance']    = False
+            self.handsplayers[player[1]]['street0_3BDone']      = False
+            self.handsplayers[player[1]]['street0_4BChance']    = False
+            self.handsplayers[player[1]]['street0_4BDone']      = False
+            self.handsplayers[player[1]]['stealAttemptChance']  = False
+            self.handsplayers[player[1]]['stealAttempted']      = False
+            self.handsplayers[player[1]]['foldBbToStealChance'] = False
+            self.handsplayers[player[1]]['foldBbToStealChance'] = False
+            self.handsplayers[player[1]]['foldSbToStealChance'] = False
+            self.handsplayers[player[1]]['foldedSbToSteal']     = False
+            self.handsplayers[player[1]]['foldedBbToSteal']     = False
             for i in range(5): 
                 self.handsplayers[player[1]]['street%dCalls' % i] = 0
                 self.handsplayers[player[1]]['street%dBets' % i] = 0
@@ -60,15 +71,6 @@ class DerivedStats():
 
             #FIXME - Everything below this point is incomplete.
             self.handsplayers[player[1]]['tourneyTypeId']       = 1
-            self.handsplayers[player[1]]['street0_3BChance']    = False
-            self.handsplayers[player[1]]['street0_3BDone']      = False
-            self.handsplayers[player[1]]['stealAttemptChance']  = False
-            self.handsplayers[player[1]]['stealAttempted']      = False
-            self.handsplayers[player[1]]['foldBbToStealChance'] = False
-            self.handsplayers[player[1]]['foldBbToStealChance'] = False
-            self.handsplayers[player[1]]['foldSbToStealChance'] = False
-            self.handsplayers[player[1]]['foldedSbToSteal']     = False
-            self.handsplayers[player[1]]['foldedBbToSteal']     = False
             for i in range(1,5):
                 self.handsplayers[player[1]]['otherRaisedStreet%d' %i]          = False
                 self.handsplayers[player[1]]['foldToOtherRaisedStreet%d' %i]    = False
@@ -176,6 +178,8 @@ class DerivedStats():
 
         self.setPositions(hand)
         self.calcCheckCallRaise(hand)
+        self.calc34BetStreet0(hand)
+        self.calcSteals(hand)
         # Additional stats
         # 3betSB, 3betBB
         # Squeeze, Ratchet?
@@ -273,13 +277,59 @@ class DerivedStats():
         for (i, street) in enumerate(hand.actionStreets[1:]):
             self.hands['street%dRaises' % i] = len(filter( lambda action: action[1] in ('raises','bets'), hand.actions[street]))
 
-    def calcCBets(self, hand):
-        # Continuation Bet chance, action:
-        # Had the last bet (initiative) on previous street, got called, close street action
-        #   Then no bets before the player with initiatives first action on current street
-        # ie. if player on street-1 had initiative
-        #                and no donkbets occurred
+    def calcSteals(self, hand):
+        """Fills stealAttempt(Chance|ed, fold(Bb|Sb)ToSteal(Chance|)
 
+        Steal attemp - open raise on positions 2 1 0 S - i.e. MP3, CO, BU, SB
+        Fold to steal - folding blind after steal attemp wo any other callers or raisers
+        """
+        steal_attemp = False
+        steal_positions = ('2', '1', '0', 'S')
+        if hand.gametype['base'] == 'stud':
+            steal_positions = ('2', '1', '0')
+        for action in hand.actions[hand.actionStreets[1]]:
+            pname, act = action[0], action[1]
+            #print action[0], hp.position, steal_attemp, act
+            if self.handsplayers[pname]['position'] == 'B':
+                #NOTE: Stud games will never hit this section
+                self.handsplayers[pname]['foldBbToStealChance'] = steal_attemp
+                self.handsplayers[pname]['foldBbToSteal'] = self.handsplayers[pname]['foldBbToStealChance'] and act == 'folds'
+                break
+            elif self.handsplayers[pname]['position'] == 'S':
+                self.handsplayers[pname]['foldSbToStealChance'] = steal_attemp
+                self.handsplayers[pname]['foldSbToSteal'] = self.handsplayers[pname]['foldSbToStealChance'] and act == 'folds'
+
+            if steal_attemp and act != 'folds':
+                break
+
+            if self.handsplayers[pname]['position'] in steal_positions and not steal_attemp:
+                self.handsplayers[pname]['stealAttemptChance'] = True
+                if act in ('bets', 'raises'):
+                    self.handsplayers[pname]['stealAttempted'] = True
+                    steal_attemp = True
+
+    def calc34BetStreet0(self, hand):
+        """Fills street0_(3|4)B(Chance|Done), other(3|4)BStreet0"""
+        bet_level = 1 # bet_level after 3-bet is equal to 3
+        for action in hand.actions[hand.actionStreets[1]]:
+            # FIXME: fill other(3|4)BStreet0 - i have no idea what does it mean
+            pname, aggr = action[0], action[1] in ('raises', 'bets')
+            self.handsplayers[pname]['street0_3BChance'] = bet_level == 2
+            self.handsplayers[pname]['street0_4BChance'] = bet_level == 3
+            self.handsplayers[pname]['street0_3BDone'] =  aggr and (self.handsplayers[pname]['street0_3BChance'])
+            self.handsplayers[pname]['street0_4BDone'] =  aggr and (self.handsplayers[pname]['street0_4BChance'])
+            if aggr:
+                bet_level += 1
+
+
+    def calcCBets(self, hand):
+        """Fill streetXCBChance, streetXCBDone, foldToStreetXCBDone, foldToStreetXCBChance
+
+        Continuation Bet chance, action:
+        Had the last bet (initiative) on previous street, got called, close street action
+        Then no bets before the player with initiatives first action on current street
+        ie. if player on street-1 had initiative and no donkbets occurred
+        """
         # XXX: enumerate(list, start=x) is python 2.6 syntax; 'start'
         # came there
         #for i, street in enumerate(hand.actionStreets[2:], start=1):

From 776405982b526f36fbd502ec43da5261ed4624aa Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Fri, 15 Jan 2010 21:24:37 +0800
Subject: [PATCH 064/320] Quick fix for hud

---
 pyfpdb/Database.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index 63e9a0a5..c7b3e3b8 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -1508,7 +1508,7 @@ class Database:
             line[55] = gid    # gametypeId
             line[56] = pids[p]    # playerId
             line[57] = len(pids)    # activeSeats
-            pos = {-2:'B', -1:'S', 0:'D', 1:'C', 2:'M', 3:'M', 4:'M', 5:'E', 6:'E', 7:'E', 8:'E', 9:'E' }
+            pos = {'B':'B', 'S':'S', 0:'D', 1:'C', 2:'M', 3:'M', 4:'M', 5:'E', 6:'E', 7:'E', 8:'E', 9:'E' }
             line[58] = pos[pdata[p]['position']]
             line[59] = pdata[p]['tourneyTypeId']
             line[60] = styleKey    # styleKey

From 3f0dfd2b2614ca5de2e807f71f2b3eff9703198a Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sat, 16 Jan 2010 13:55:01 +0800
Subject: [PATCH 065/320] Fix enumerate()

---
 pyfpdb/DerivedStats.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py
index 8b9af93b..88bb6407 100644
--- a/pyfpdb/DerivedStats.py
+++ b/pyfpdb/DerivedStats.py
@@ -350,8 +350,9 @@ class DerivedStats():
 
         CG: CheckCall would be a much better name for this.
         """
-        for i, street in enumerate(hand.actionStreets[2:], start=1):
-            actions = hand.actions[hand.actionStreets[i]]
+        #for i, street in enumerate(hand.actionStreets[2:], start=1):
+        for i, street in enumerate(hand.actionStreets[2:]):
+            actions = hand.actions[hand.actionStreets[i+1]]
             checkers = set()
             initial_raiser = None
             for action in actions:
@@ -361,8 +362,8 @@ class DerivedStats():
                 elif act == 'checks' and initial_raiser is None:
                     checkers.add(pname)
                 elif initial_raiser is not None and pname in checkers:
-                    self.handsplayers[pname]['street%dCheckCallRaiseChance' % i] = True
-                    self.handsplayers[pname]['street%dCheckCallRaiseDone' % i] = act!='folds'
+                    self.handsplayers[pname]['street%dCheckCallRaiseChance' % (i+1)] = True
+                    self.handsplayers[pname]['street%dCheckCallRaiseDone' % (i+1)] = act!='folds'
 
     def seen(self, hand, i):
         pas = set()

From cb172e15ae088a531f88d7a1701ae29c33ac2599 Mon Sep 17 00:00:00 2001
From: Mika Bostrom <bostik@odin.bostik.iki.fi>
Date: Tue, 19 Jan 2010 19:25:36 +0200
Subject: [PATCH 066/320] Fix name display in HUD popup

The names are stored in UTF-8, so simply converting the name from UTF-8
to Configuration.LOCALE_ENCODING before putting the string in tooltip is
enough. Neat.
---
 pyfpdb/Stats.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/Stats.py b/pyfpdb/Stats.py
index 86caaea5..18913eed 100755
--- a/pyfpdb/Stats.py
+++ b/pyfpdb/Stats.py
@@ -62,9 +62,13 @@ import Database
 re_Places = re.compile("_[0-9]$")
 re_Percent = re.compile("%$")
 
+# String manipulation
+import codecs
+encoder = codecs.lookup(Configuration.LOCALE_ENCODING)
 
 def do_tip(widget, tip):
-    widget.set_tooltip_text(tip)
+    (_tip, _len) = encoder.encode(tip)
+    widget.set_tooltip_text(_tip)
 
 def do_stat(stat_dict, player = 24, stat = 'vpip'):
     match = re_Places.search(stat)

From 7ec58ad5c2789c69bcc97d113b7fb51378a0499c Mon Sep 17 00:00:00 2001
From: Mika Bostrom <bostik@odin.bostik.iki.fi>
Date: Tue, 19 Jan 2010 19:25:36 +0200
Subject: [PATCH 067/320] Fix name display in HUD popup

The names are stored in UTF-8, so simply converting the name from UTF-8
to Configuration.LOCALE_ENCODING before putting the string in tooltip is
enough. Neat.
---
 pyfpdb/Stats.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/Stats.py b/pyfpdb/Stats.py
index 86caaea5..18913eed 100755
--- a/pyfpdb/Stats.py
+++ b/pyfpdb/Stats.py
@@ -62,9 +62,13 @@ import Database
 re_Places = re.compile("_[0-9]$")
 re_Percent = re.compile("%$")
 
+# String manipulation
+import codecs
+encoder = codecs.lookup(Configuration.LOCALE_ENCODING)
 
 def do_tip(widget, tip):
-    widget.set_tooltip_text(tip)
+    (_tip, _len) = encoder.encode(tip)
+    widget.set_tooltip_text(_tip)
 
 def do_stat(stat_dict, player = 24, stat = 'vpip'):
     match = re_Places.search(stat)

From 41877097c999079b4c58221df13d301cfcee04a5 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Tue, 12 Jan 2010 22:10:59 +0000
Subject: [PATCH 068/320] fix twostartcards to handle 22 and unknowns properly

---
 pyfpdb/Card.py           | 35 ++++++++++++++++++++++++-----------
 pyfpdb/GuiPlayerStats.py |  4 ++--
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/pyfpdb/Card.py b/pyfpdb/Card.py
index 8639fd35..22eab979 100755
--- a/pyfpdb/Card.py
+++ b/pyfpdb/Card.py
@@ -39,23 +39,36 @@ def calcStartCards(hand, player):
 
 def twoStartCards(value1, suit1, value2, suit2):
     """ Function to convert 2 value,suit pairs into a Holdem style starting hand e.g. AQo
-        Hand is stored as an int 13 * x + y where (x+2) represents rank of 1st card and
+        Incoming values should be ints 2-14 (2,3,...K,A), suits are 'd'/'h'/'c'/'s'
+        Hand is stored as an int 13 * x + y + 1 where (x+2) represents rank of 1st card and
         (y+2) represents rank of second card (2=2 .. 14=Ace)
-        If x > y then pair is suited, if x < y then unsuited"""
-    if value1 < 2 or value2 < 2:
+        If x > y then pair is suited, if x < y then unsuited
+        Examples:
+           0  Unknown / Illegal cards
+           1  22
+           2  32o
+           3  42o
+              ...
+          14  32s
+          15  33
+          16  42o
+              ...
+         170  AA
+    """
+    if value1 is None or value1 < 2 or value1 > 14 or value2 is None or value2 < 2 or value2 > 14:
         ret = 0
-    if value1 == value2: # pairs
-        ret = (13 * (value2-2) + (value2-2) )
+    elif value1 == value2: # pairs
+        ret = (13 * (value2-2) + (value2-2) ) + 1
     elif suit1 == suit2:
         if value1 > value2:
-            ret = 13 * (value1-2) + (value2-2)
+            ret = 13 * (value1-2) + (value2-2) + 1
         else:
-            ret = 13 * (value2-2) + (value1-2)
+            ret = 13 * (value2-2) + (value1-2) + 1
     else:
         if value1 > value2:
-            ret = 13 * (value2-2) + (value1-2)
+            ret = 13 * (value2-2) + (value1-2) + 1
         else:
-            ret = 13 * (value1-2) + (value2-2)
+            ret = 13 * (value1-2) + (value2-2) + 1
             
 #    print "twoStartCards(", value1, suit1, value2, suit2, ")=", ret
     return ret
@@ -66,8 +79,8 @@ def twoStartCardString(card):
     ret = 'xx'
     if card > 0:
         s = ('2', '3', '4', '5', '6', '7', '8', '9', 'T', 'J', 'Q', 'K', 'A')
-        x = card / 13
-        y = card - 13 * x
+        x = (card-1) / 13
+        y = (card-1) - 13 * x
         if x == y:  ret = s[x] + s[y]
         elif x > y: ret = s[x] + s[y] + 's'
         else:       ret = s[y] + s[x] + 'o'
diff --git a/pyfpdb/GuiPlayerStats.py b/pyfpdb/GuiPlayerStats.py
index d65b9ab6..889988c5 100644
--- a/pyfpdb/GuiPlayerStats.py
+++ b/pyfpdb/GuiPlayerStats.py
@@ -516,8 +516,8 @@ class GuiPlayerStats (threading.Thread):
         if holecards:  # re-use level variables for hole card query
             query = query.replace("<hgameTypeId>", "hp.startcards")
             query = query.replace("<orderbyhgameTypeId>"
-                                 , ",case when floor(hp.startcards/13) >= mod(hp.startcards,13) then hp.startcards + 0.1 "
-                                   +    " else 13*mod(hp.startcards,13) + floor(hp.startcards/13) "
+                                 , ",case when floor((hp.startcards-1)/13) >= mod((hp.startcards-1),13) then hp.startcards + 0.1 "
+                                   +    " else 13*mod((hp.startcards-1),13) + floor((hp.startcards-1)/13) + 1 "
                                    +    " end desc ")
         else:
             query = query.replace("<orderbyhgameTypeId>", "")

From cd7177897562379fe799ac7238fb0e690bf4ccc4 Mon Sep 17 00:00:00 2001
From: Mika Bostrom <bostik@odin.bostik.iki.fi>
Date: Tue, 19 Jan 2010 19:25:36 +0200
Subject: [PATCH 069/320] Fix name display in HUD popup

The names are stored in UTF-8, so simply converting the name from UTF-8
to Configuration.LOCALE_ENCODING before putting the string in tooltip is
enough. Neat.
---
 pyfpdb/Stats.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/Stats.py b/pyfpdb/Stats.py
index 86caaea5..18913eed 100755
--- a/pyfpdb/Stats.py
+++ b/pyfpdb/Stats.py
@@ -62,9 +62,13 @@ import Database
 re_Places = re.compile("_[0-9]$")
 re_Percent = re.compile("%$")
 
+# String manipulation
+import codecs
+encoder = codecs.lookup(Configuration.LOCALE_ENCODING)
 
 def do_tip(widget, tip):
-    widget.set_tooltip_text(tip)
+    (_tip, _len) = encoder.encode(tip)
+    widget.set_tooltip_text(_tip)
 
 def do_stat(stat_dict, player = 24, stat = 'vpip'):
     match = re_Places.search(stat)

From ef4f5289bb8ea8b8ce7fa301d2146d091b31b7e7 Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Sun, 17 Jan 2010 19:54:40 +0100
Subject: [PATCH 070/320] Solved some merge issues --> Cards.py Issues
 Pokerstars when playing heads-up on ring games,    being both on button and
 small blind now supported    !!if not solved the winnings of the (button,
 small blind) is stored as rake!! Post both small and big blind when
 re-entering ring games solved

---
 pyfpdb/Card.py             |  2 +-
 pyfpdb/PokerStarsToFpdb.py | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pyfpdb/Card.py b/pyfpdb/Card.py
index 22eab979..f33f08ed 100755
--- a/pyfpdb/Card.py
+++ b/pyfpdb/Card.py
@@ -61,7 +61,7 @@ def twoStartCards(value1, suit1, value2, suit2):
         ret = (13 * (value2-2) + (value2-2) ) + 1
     elif suit1 == suit2:
         if value1 > value2:
-            ret = 13 * (value1-2) + (value2-2) + 1
+            ret = 13 * (value1-2) + (value2-2) + 1 
         else:
             ret = 13 * (value2-2) + (value1-2) + 1
     else:
diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
index 5e2f9c21..09bd0390 100755
--- a/pyfpdb/PokerStarsToFpdb.py
+++ b/pyfpdb/PokerStarsToFpdb.py
@@ -81,6 +81,7 @@ class PokerStars(HandHistoryConverter):
     re_Board        = re.compile(r"\[(?P<CARDS>.+)\]")
 #        self.re_setHandInfoRegex('.*#(?P<HID>[0-9]+): Table (?P<TABLE>[ a-zA-Z]+) - \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) - (?P<GAMETYPE>.*) - (?P<HR>[0-9]+):(?P<MIN>[0-9]+) ET - (?P<YEAR>[0-9]+)/(?P<MON>[0-9]+)/(?P<DAY>[0-9]+)Table (?P<TABLE>[ a-zA-Z]+)\nSeat (?P<BUTTON>[0-9]+)')    
 
+    re_DateTime     = re.compile("""(?P<Y>[0-9]{4})\/(?P<M>[0-9]{2})\/(?P<D>[0-9]{2})[\- ]+(?P<H>[0-9]+):(?P<MIN>[0-9]+):(?P<S>[0-9]+)""", re.MULTILINE)
 
     def compilePlayerRegexs(self,  hand):
         players = set([player[1] for player in hand.players])
@@ -97,7 +98,7 @@ class PokerStars(HandHistoryConverter):
             self.re_PostBB           = re.compile(r"^%(PLYR)s: posts big blind %(CUR)s(?P<BB>[.0-9]+)" %  subst, re.MULTILINE)
             self.re_Antes            = re.compile(r"^%(PLYR)s: posts the ante %(CUR)s(?P<ANTE>[.0-9]+)" % subst, re.MULTILINE)
             self.re_BringIn          = re.compile(r"^%(PLYR)s: brings[- ]in( low|) for %(CUR)s(?P<BRINGIN>[.0-9]+)" % subst, re.MULTILINE)
-            self.re_PostBoth         = re.compile(r"^%(PLYR)s: posts small \& big blinds \[%(CUR)s (?P<SBBB>[.0-9]+)" %  subst, re.MULTILINE)
+            self.re_PostBoth         = re.compile(r"^%(PLYR)s: posts small \& big blinds %(CUR)s(?P<SBBB>[.0-9]+)" %  subst, re.MULTILINE)
             self.re_HeroCards        = re.compile(r"^Dealt to %(PLYR)s(?: \[(?P<OLDCARDS>.+?)\])?( \[(?P<NEWCARDS>.+?)\])" % subst, re.MULTILINE)
             self.re_Action           = re.compile(r"""
                         ^%(PLYR)s:(?P<ATYPE>\sbets|\schecks|\sraises|\scalls|\sfolds|\sdiscards|\sstands\spat)
@@ -105,7 +106,7 @@ class PokerStars(HandHistoryConverter):
                         (\scards?(\s\[(?P<DISCARDED>.+?)\])?)?"""
                          %  subst, re.MULTILINE|re.VERBOSE)
             self.re_ShowdownAction   = re.compile(r"^%s: shows \[(?P<CARDS>.*)\]" %  player_re, re.MULTILINE)
-            self.re_CollectPot       = re.compile(r"Seat (?P<SEAT>[0-9]+): %(PLYR)s (\(button\) |\(small blind\) |\(big blind\) )?(collected|showed \[.*\] and won) \(%(CUR)s(?P<POT>[.\d]+)\)(, mucked| with.*|)" %  subst, re.MULTILINE)
+            self.re_CollectPot       = re.compile(r"Seat (?P<SEAT>[0-9]+): %(PLYR)s (\(button\) |\(small blind\) |\(big blind\) |\(button\) \(small blind\) )?(collected|showed \[.*\] and won) \(%(CUR)s(?P<POT>[.\d]+)\)(, mucked| with.*|)" %  subst, re.MULTILINE)
             self.re_sitsOut          = re.compile("^%s sits out" %  player_re, re.MULTILINE)
             self.re_ShownCards       = re.compile("^Seat (?P<SEAT>[0-9]+): %s (\(.*\) )?(?P<SHOWED>showed|mucked) \[(?P<CARDS>.*)\].*" %  player_re, re.MULTILINE)
 
@@ -194,12 +195,13 @@ class PokerStars(HandHistoryConverter):
                 #2008/11/12 10:00:48 CET [2008/11/12 4:00:48 ET]
                 #2008/08/17 - 01:14:43 (ET)
                 #2008/09/07 06:23:14 ET
-                m2 = re.search("(?P<Y>[0-9]{4})\/(?P<M>[0-9]{2})\/(?P<D>[0-9]{2})[\- ]+(?P<H>[0-9]+):(?P<MIN>[0-9]+):(?P<S>[0-9]+)", info[key])
-                datetimestr = "%s/%s/%s %s:%s:%s" % (m2.group('Y'), m2.group('M'),m2.group('D'),m2.group('H'),m2.group('MIN'),m2.group('S'))
+                m1 = self.re_DateTime.finditer(info[key])
+                # m2 = re.search("(?P<Y>[0-9]{4})\/(?P<M>[0-9]{2})\/(?P<D>[0-9]{2})[\- ]+(?P<H>[0-9]+):(?P<MIN>[0-9]+):(?P<S>[0-9]+)", info[key])
+                for a in m1:
+                    datetimestr = "%s/%s/%s %s:%s:%s" % (a.group('Y'), a.group('M'),a.group('D'),a.group('H'),a.group('MIN'),a.group('S'))
                 hand.starttime = datetime.datetime.strptime(datetimestr, "%Y/%m/%d %H:%M:%S")
             if key == 'HID':
                 hand.handid = info[key]
-
             if key == 'TOURNO':
                 hand.tourNo = info[key]
             if key == 'BUYIN':

From 4187561e663a96d825fd6abc2c315ce9db8b5353 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 21 Jan 2010 14:12:17 +0800
Subject: [PATCH 071/320] Whitespace fixes to Card.py

---
 pyfpdb/Card.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pyfpdb/Card.py b/pyfpdb/Card.py
index f33f08ed..23a0b7c4 100755
--- a/pyfpdb/Card.py
+++ b/pyfpdb/Card.py
@@ -4,12 +4,12 @@
 #This program is free software: you can redistribute it and/or modify
 #it under the terms of the GNU Affero General Public License as published by
 #the Free Software Foundation, version 3 of the License.
-#   
+#
 #This program is distributed in the hope that it will be useful,
 #but WITHOUT ANY WARRANTY; without even the implied warranty of
 #MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 #GNU General Public License for more details.
-#       
+#
 #You should have received a copy of the GNU Affero General Public License
 #along with this program. If not, see <http://www.gnu.org/licenses/>.
 #In the "official" distribution you can find the license in
@@ -61,7 +61,7 @@ def twoStartCards(value1, suit1, value2, suit2):
         ret = (13 * (value2-2) + (value2-2) ) + 1
     elif suit1 == suit2:
         if value1 > value2:
-            ret = 13 * (value1-2) + (value2-2) + 1 
+            ret = 13 * (value1-2) + (value2-2) + 1
         else:
             ret = 13 * (value2-2) + (value1-2) + 1
     else:
@@ -69,7 +69,7 @@ def twoStartCards(value1, suit1, value2, suit2):
             ret = 13 * (value2-2) + (value1-2) + 1
         else:
             ret = 13 * (value1-2) + (value2-2) + 1
-            
+
 #    print "twoStartCards(", value1, suit1, value2, suit2, ")=", ret
     return ret
 
@@ -108,7 +108,7 @@ def fourStartCards(value1, suit1, value2, suit2, value3, suit3, value4, suit4):
         # SSSS (K, J, 6, 3)
         # - 13C4 = 715 possibilities
         # SSSx (K, J, 6),(3)
-        # - 13C3 * 13 = 3718 possibilities 
+        # - 13C3 * 13 = 3718 possibilities
         # SSxy (K, J),(6),(3)
         # - 13C2 * 13*13 = 13182 possibilities
         # SSHH (K, J),(6, 3)
@@ -131,7 +131,7 @@ suitFromCardList = ['', '2h', '3h', '4h', '5h', '6h', '7h', '8h', '9h', 'Th', 'J
                      , '2s', '3s', '4s', '5s', '6s', '7s', '8s', '9s', 'Ts', 'Js', 'Qs', 'Ks', 'As'
                 ]
 def valueSuitFromCard(card):
-    """ Function to convert a card stored in the database (int 0-52) into value 
+    """ Function to convert a card stored in the database (int 0-52) into value
         and suit like 9s, 4c etc """
     global suitFromCardList
     if card < 0 or card > 52 or not card:
@@ -158,5 +158,5 @@ if __name__ == '__main__':
         print "card %2d = %s    card %2d = %s    card %2d = %s    card %2d = %s" % \
             (i, valueSuitFromCard(i), i+13, valueSuitFromCard(i+13), i+26, valueSuitFromCard(i+26), i+39, valueSuitFromCard(i+39))
 
-        print 
+        print
     print encodeCard('7c')

From ea423f6b2c4808b2231b203c92857253827c3c45 Mon Sep 17 00:00:00 2001
From: unknown <gerko@.(none)>
Date: Wed, 20 Jan 2010 18:27:11 +0100
Subject: [PATCH 072/320] added a game selector to the player stats.

---
 pyfpdb/Filters.py        | 66 ++++++++++++++++++++++++++++++++--------
 pyfpdb/GuiPlayerStats.py | 31 ++++++++++++++-----
 pyfpdb/SQL.py            |  3 ++
 3 files changed, 80 insertions(+), 20 deletions(-)

diff --git a/pyfpdb/Filters.py b/pyfpdb/Filters.py
index dc2e4859..9ebeb0c5 100644
--- a/pyfpdb/Filters.py
+++ b/pyfpdb/Filters.py
@@ -56,7 +56,7 @@ class Filters(threading.Thread):
                           ,'limitstitle':'Limits:', 'seatstitle':'Number of Players:'
                           ,'groupstitle':'Grouping:', 'posnshow':'Show Position Stats:'
                           ,'groupsall':'All Players'
-                          ,'limitsFL':'FL', 'limitsNL':'NL', 'ring':'Ring', 'tour':'Tourney'
+                          ,'limitsFL':'FL', 'limitsNL':'NL', 'limitsPL':'PL', 'ring':'Ring', 'tour':'Tourney'
                           }
 
         # For use in date ranges.
@@ -107,6 +107,7 @@ class Filters(threading.Thread):
         self.cbAllLimits = None
         self.cbFL = None
         self.cbNL = None
+        self.cbPL = None
         self.rb = {}     # radio buttons for ring/tour
         self.type = None # ring/tour
         self.types = {}  # list of all ring/tour values
@@ -191,6 +192,9 @@ class Filters(threading.Thread):
     def getSites(self):
         return self.sites
 
+    def getGames(self):
+        return self.games
+
     def getSiteIds(self):
         return self.siteid
 
@@ -303,7 +307,7 @@ class Filters(threading.Thread):
         #print w.get_active()
         self.limits[limit] = w.get_active()
         print "self.limit[%s] set to %s" %(limit, self.limits[limit])
-        if limit.isdigit() or (len(limit) > 2 and limit[-2:] == 'nl'):
+        if limit.isdigit() or (len(limit) > 2 and (limit[-2:] == 'nl' or limit[-2:] == 'fl' or limit[-2:] == 'pl')):
             if self.limits[limit]:
                 if self.cbNoLimits is not None:
                     self.cbNoLimits.set_active(False)
@@ -314,9 +318,12 @@ class Filters(threading.Thread):
                 if limit.isdigit():
                     if self.cbFL is not None:
                         self.cbFL.set_active(False)
-                else:
+                elif (len(limit) > 2 and (limit[-2:] == 'nl')):
                     if self.cbNL is not None:
                         self.cbNL.set_active(False)
+                else:
+                    if self.cbPL is not None:
+                        self.cbPL.set_active(False)
         elif limit == "all":
             if self.limits[limit]:
                 #for cb in self.cbLimits.values():
@@ -325,6 +332,8 @@ class Filters(threading.Thread):
                     self.cbFL.set_active(True)
                 if self.cbNL is not None:
                     self.cbNL.set_active(True)
+                if self.cbPL is not None:
+                    self.cbPL.set_active(True)
         elif limit == "none":
             if self.limits[limit]:
                 for cb in self.cbLimits.values():
@@ -333,6 +342,8 @@ class Filters(threading.Thread):
                     self.cbNL.set_active(False)
                 if self.cbFL is not None:
                     self.cbFL.set_active(False)
+                if self.cbPL is not None:
+                    self.cbPL.set_active(False)
         elif limit == "fl":
             if not self.limits[limit]:
                 # only toggle all fl limits off if they are all currently on
@@ -384,6 +395,30 @@ class Filters(threading.Thread):
                         self.rb['tour'].set_active(True)
                     elif self.type == 'tour':
                         self.rb['ring'].set_active(True)
+        elif limit == "pl":
+            if not self.limits[limit]:
+                # only toggle all nl limits off if they are all currently on
+                # this stops turning one off from cascading into 'nl' box off
+                # and then all nl limits being turned off
+                all_nl_on = True
+                for cb in self.cbLimits.values():
+                    t = cb.get_children()[0].get_text()
+                    if "pl" in t and len(t) > 2:
+                        if not cb.get_active():
+                            all_nl_on = False
+            found = {'ring':False, 'tour':False}
+            for cb in self.cbLimits.values():
+                t = cb.get_children()[0].get_text()
+                if "pl" in t and len(t) > 2:
+                    if self.limits[limit] or all_nl_on:
+                        cb.set_active(self.limits[limit])
+                    found[self.types[t]] = True
+            if self.limits[limit]:
+                if not found[self.type]:
+                    if self.type == 'ring':
+                        self.rb['tour'].set_active(True)
+                    elif self.type == 'tour':
+                        self.rb['ring'].set_active(True)
         elif limit == "ring":
             print "set", limit, "to", self.limits[limit]
             if self.limits[limit]:
@@ -479,7 +514,7 @@ class Filters(threading.Thread):
         self.cursor.execute(self.sql.query['getLimits2'])
         # selects  limitType, bigBlind
         result = self.db.cursor.fetchall()
-        found = {'nl':False, 'fl':False, 'ring':False, 'tour':False}
+        found = {'nl':False, 'fl':False, 'pl':False, 'ring':False, 'tour':False}
 
         if len(result) >= 1:
             hbox = gtk.HBox(True, 0)
@@ -497,14 +532,18 @@ class Filters(threading.Thread):
                     vbox2.pack_start(hbox, False, False, 0)
                 else:
                     vbox3.pack_start(hbox, False, False, 0)
-                if line[1] == 'fl':
-                    name = str(line[2])
-                    found['fl'] = True
-                else:
-                    name = str(line[2])+line[1]
-                    found['nl'] = True
-                self.cbLimits[name] = self.createLimitLine(hbox, name, name)
-                self.types[name] = line[0]
+                if line[0] == 'ring':
+                    if line[1] == 'fl':
+                        name = str(line[2])
+                        found['fl'] = True
+                    elif line[1] == 'pl':
+                        name = str(line[2])+line[1]
+                        found['pl'] = True
+                    else:
+                        name = str(line[2])+line[1]
+                        found['nl'] = True
+                    self.cbLimits[name] = self.createLimitLine(hbox, name, name)
+                    self.types[name] = line[0]
                 found[line[0]] = True      # type is ring/tour
                 self.type = line[0]        # if only one type, set it now
             if "LimitSep" in display and display["LimitSep"] == True and len(result) >= 2:
@@ -532,6 +571,9 @@ class Filters(threading.Thread):
                     hbox = gtk.HBox(False, 0)
                     vbox3.pack_start(hbox, False, False, 0)
                     self.cbNL = self.createLimitLine(hbox, 'nl', self.filterText['limitsNL'])
+                    hbox = gtk.HBox(False, 0)
+                    vbox3.pack_start(hbox, False, False, 0)
+                    self.cbPL = self.createLimitLine(hbox, 'pl', self.filterText['limitsPL'])
                     dest = vbox2  # for ring/tour buttons
         else:
             print "INFO: No games returned from database"
diff --git a/pyfpdb/GuiPlayerStats.py b/pyfpdb/GuiPlayerStats.py
index 889988c5..1da08fbc 100644
--- a/pyfpdb/GuiPlayerStats.py
+++ b/pyfpdb/GuiPlayerStats.py
@@ -64,7 +64,7 @@ class GuiPlayerStats (threading.Thread):
 
         filters_display = { "Heroes"    : True,
                             "Sites"     : True,
-                            "Games"     : False,
+                            "Games"     : True,
                             "Limits"    : True,
                             "LimitSep"  : True,
                             "LimitType" : True,
@@ -180,6 +180,7 @@ class GuiPlayerStats (threading.Thread):
         seats  = self.filters.getSeats()
         groups = self.filters.getGroups()
         dates = self.filters.getDates()
+        games = self.filters.getGames()
         sitenos = []
         playerids = []
 
@@ -205,9 +206,9 @@ class GuiPlayerStats (threading.Thread):
             print "No limits found"
             return
 
-        self.createStatsTable(vbox, playerids, sitenos, limits, type, seats, groups, dates)
+        self.createStatsTable(vbox, playerids, sitenos, limits, type, seats, groups, dates, games)
 
-    def createStatsTable(self, vbox, playerids, sitenos, limits, type, seats, groups, dates):
+    def createStatsTable(self, vbox, playerids, sitenos, limits, type, seats, groups, dates, games):
         starttime = time()
 
         # Scrolled window for summary table
@@ -223,7 +224,7 @@ class GuiPlayerStats (threading.Thread):
         #   gridnum   - index for grid data structures
         flags = [False, self.filters.getNumHands(), 0]
         self.addGrid(swin, 'playerDetailedStats', flags, playerids
-                    ,sitenos, limits, type, seats, groups, dates)
+                    ,sitenos, limits, type, seats, groups, dates, games)
 
         # Separator
         vbox2 = gtk.VBox(False, 0)
@@ -243,7 +244,7 @@ class GuiPlayerStats (threading.Thread):
         flags[0] = True
         flags[2] = 1
         self.addGrid(swin, 'playerDetailedStats', flags, playerids
-                    ,sitenos, limits, type, seats, groups, dates)
+                    ,sitenos, limits, type, seats, groups, dates, games)
 
         self.db.rollback()
         print "Stats page displayed in %4.2f seconds" % (time() - starttime)
@@ -317,7 +318,7 @@ class GuiPlayerStats (threading.Thread):
             print "***sortcols error: " + str(sys.exc_info()[1])
             print "\n".join( [e[0]+':'+str(e[1])+" "+e[2] for e in err] )
 
-    def addGrid(self, vbox, query, flags, playerids, sitenos, limits, type, seats, groups, dates):
+    def addGrid(self, vbox, query, flags, playerids, sitenos, limits, type, seats, groups, dates, games):
         counter = 0
         row = 0
         sqlrow = 0
@@ -325,7 +326,7 @@ class GuiPlayerStats (threading.Thread):
         else:          holecards,grid = flags[0],flags[2]
 
         tmp = self.sql.query[query]
-        tmp = self.refineQuery(tmp, flags, playerids, sitenos, limits, type, seats, groups, dates)
+        tmp = self.refineQuery(tmp, flags, playerids, sitenos, limits, type, seats, groups, dates, games)
         self.cursor.execute(tmp)
         result = self.cursor.fetchall()
         colnames = [desc[0].lower() for desc in self.cursor.description]
@@ -428,7 +429,7 @@ class GuiPlayerStats (threading.Thread):
         
     #end def addGrid(self, query, vars, playerids, sitenos, limits, type, seats, groups, dates):
 
-    def refineQuery(self, query, flags, playerids, sitenos, limits, type, seats, groups, dates):
+    def refineQuery(self, query, flags, playerids, sitenos, limits, type, seats, groups, dates, games):
         having = ''
         if not flags:
             holecards = False
@@ -466,6 +467,20 @@ class GuiPlayerStats (threading.Thread):
         query = query.replace("<playerName>", pname)
         query = query.replace("<havingclause>", having)
 
+        gametest = ""
+        q = []
+        for m in self.filters.display.items():
+            if m[0] == 'Games' and m[1]:
+                for n in games:
+                    if games[n]:
+                        q.append(n)
+                gametest = str(tuple(q))
+                gametest = gametest.replace("L", "")
+                gametest = gametest.replace(",)",")")
+                gametest = gametest.replace("u'","'")
+                gametest = "and gt.category in %s" % gametest
+        query = query.replace("<game_test>", gametest)
+
         if seats:
             query = query.replace('<seats_test>', 'between ' + str(seats['from']) + ' and ' + str(seats['to']))
             if 'show' in seats and seats['show']:
diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py
index 2b19b04a..c377c7b6 100644
--- a/pyfpdb/SQL.py
+++ b/pyfpdb/SQL.py
@@ -1881,6 +1881,7 @@ class Sql:
                            inner join Sites s       on  (s.Id = gt.siteId)
                            inner join Players p     on  (p.Id = hp.playerId)
                       where hp.playerId in <player_test>
+                      <game_test>
                       /*and   hp.tourneysPlayersId IS NULL*/
                       and   h.seats <seats_test>
                       <flagtest>
@@ -1964,6 +1965,7 @@ class Sql:
                            inner join Sites s       on  (s.Id = gt.siteId)
                            inner join Players p     on  (p.Id = hp.playerId)
                       where hp.playerId in <player_test>
+                      <game_test>
                       /*and   hp.tourneysPlayersId IS NULL*/
                       and   h.seats <seats_test>
                       <flagtest>
@@ -2047,6 +2049,7 @@ class Sql:
                            inner join Gametypes gt  on  (gt.Id = h.gameTypeId)
                            inner join Sites s       on  (s.Id = gt.siteId)
                       where hp.playerId in <player_test>
+                      <game_test>
                       /*and   hp.tourneysPlayersId IS NULL*/
                       and   h.seats <seats_test>
                       <flagtest>

From 34bf2bd8e9e41a7dd4cb04ed73c67c12aa0a40ba Mon Sep 17 00:00:00 2001
From: Mika Bostrom <bostik@odin.bostik.iki.fi>
Date: Thu, 21 Jan 2010 18:12:45 +0200
Subject: [PATCH 073/320] Use better function name

---
 pyfpdb/Charset.py | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 pyfpdb/Charset.py

diff --git a/pyfpdb/Charset.py b/pyfpdb/Charset.py
new file mode 100644
index 00000000..2c6f78c3
--- /dev/null
+++ b/pyfpdb/Charset.py
@@ -0,0 +1,34 @@
+#!/usr/bin/python
+
+#Copyright 2010 Mika Bostrom
+#This program is free software: you can redistribute it and/or modify
+#it under the terms of the GNU Affero General Public License as published by
+#the Free Software Foundation, version 3 of the License.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU Affero General Public License
+#along with this program. If not, see <http://www.gnu.org/licenses/>.
+#In the "official" distribution you can find the license in
+#agpl-3.0.txt in the docs folder of the package.
+
+# String manipulation
+import codecs
+
+# Settings
+import Configuration
+
+encoder_to_utf = codecs.lookup('utf-8')
+encoder_to_sys = codecs.lookup(Configuration.LOCALE_ENCODING)
+
+def to_utf8(s):
+    (_out, _len) = encoder_to_utf.encode(s)
+    return _out
+
+def to_gui(s):
+    (_out, _len) = encoder_to_sys.encode(s)
+    return _out
+

From eb6e60f5788b8718987e6e476edd7f5de1842717 Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Thu, 21 Jan 2010 19:15:25 +0100
Subject: [PATCH 074/320] New 'master' clone of
 git://git.assembla.com/fpdboz.git

---
 ...HE-6max-USD-0.05-0.10-200912.Allin-pre.txt |   82 +-
 .../Flop/PLO8-6max-USD-0.01-0.02-200911.txt   | 1204 ++++++++---------
 ...7-StudHL-USD-0.04-0.08-200911.Cardtest.txt |  192 +--
 pyfpdb/test1.py                               |   58 +-
 pyfpdb/test2.py                               |  114 +-
 5 files changed, 825 insertions(+), 825 deletions(-)

diff --git a/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Allin-pre.txt b/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Allin-pre.txt
index b876c42a..6c3ba7d3 100644
--- a/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Allin-pre.txt
+++ b/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Allin-pre.txt
@@ -1,41 +1,41 @@
-PokerStars Game #37165169101:  Hold'em No Limit ($0.10/$0.25 USD) - 2009/12/25 9:50:09 ET
-Table 'Lucretia IV' 6-max Seat #2 is the button
-Seat 1: Blåveis ($55.10 in chips) 
-Seat 2: Kinewma ($31.40 in chips) 
-Seat 3: AAALISAAAA ($20.20 in chips) 
-Seat 4: Arbaz ($25 in chips) 
-Seat 5: s0rrow ($29.85 in chips) 
-Seat 6: bys7 ($41.35 in chips) 
-AAALISAAAA: posts small blind $0.10
-Arbaz: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to s0rrow [Ac As]
-s0rrow: raises $0.50 to $0.75
-bys7: calls $0.75
-Blåveis: folds 
-Kinewma: folds 
-AAALISAAAA: raises $1.50 to $2.25
-Arbaz: folds 
-s0rrow: raises $3.50 to $5.75
-bys7: folds 
-AAALISAAAA: raises $14.45 to $20.20 and is all-in
-s0rrow: calls $14.45
-*** FLOP *** [3d 7h Kh]
-*** TURN *** [3d 7h Kh] [Ts]
-*** RIVER *** [3d 7h Kh Ts] [5c]
-*** SHOW DOWN ***
-AAALISAAAA: shows [Kd 5d] (two pair, Kings and Fives)
-s0rrow: shows [Ac As] (a pair of Aces)
-AAALISAAAA collected $39.35 from pot
-*** SUMMARY ***
-Total pot $41.40 | Rake $2.05 
-Board [3d 7h Kh Ts 5c]
-Seat 1: Blåveis folded before Flop (didn't bet)
-Seat 2: Kinewma (button) folded before Flop (didn't bet)
-Seat 3: AAALISAAAA (small blind) showed [Kd 5d] and won ($39.35) with two pair, Kings and Fives
-Seat 4: Arbaz (big blind) folded before Flop
-Seat 5: s0rrow showed [Ac As] and lost with a pair of Aces
-Seat 6: bys7 folded before Flop
-
-
-
+PokerStars Game #37165169101:  Hold'em No Limit ($0.10/$0.25 USD) - 2009/12/25 9:50:09 ET
+Table 'Lucretia IV' 6-max Seat #2 is the button
+Seat 1: Blåveis ($55.10 in chips) 
+Seat 2: Kinewma ($31.40 in chips) 
+Seat 3: AAALISAAAA ($20.20 in chips) 
+Seat 4: Arbaz ($25 in chips) 
+Seat 5: s0rrow ($29.85 in chips) 
+Seat 6: bys7 ($41.35 in chips) 
+AAALISAAAA: posts small blind $0.10
+Arbaz: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to s0rrow [Ac As]
+s0rrow: raises $0.50 to $0.75
+bys7: calls $0.75
+Blåveis: folds 
+Kinewma: folds 
+AAALISAAAA: raises $1.50 to $2.25
+Arbaz: folds 
+s0rrow: raises $3.50 to $5.75
+bys7: folds 
+AAALISAAAA: raises $14.45 to $20.20 and is all-in
+s0rrow: calls $14.45
+*** FLOP *** [3d 7h Kh]
+*** TURN *** [3d 7h Kh] [Ts]
+*** RIVER *** [3d 7h Kh Ts] [5c]
+*** SHOW DOWN ***
+AAALISAAAA: shows [Kd 5d] (two pair, Kings and Fives)
+s0rrow: shows [Ac As] (a pair of Aces)
+AAALISAAAA collected $39.35 from pot
+*** SUMMARY ***
+Total pot $41.40 | Rake $2.05 
+Board [3d 7h Kh Ts 5c]
+Seat 1: Blåveis folded before Flop (didn't bet)
+Seat 2: Kinewma (button) folded before Flop (didn't bet)
+Seat 3: AAALISAAAA (small blind) showed [Kd 5d] and won ($39.35) with two pair, Kings and Fives
+Seat 4: Arbaz (big blind) folded before Flop
+Seat 5: s0rrow showed [Ac As] and lost with a pair of Aces
+Seat 6: bys7 folded before Flop
+
+
+
diff --git a/pyfpdb/regression-test-files/cash/Stars/Flop/PLO8-6max-USD-0.01-0.02-200911.txt b/pyfpdb/regression-test-files/cash/Stars/Flop/PLO8-6max-USD-0.01-0.02-200911.txt
index fb96f3f9..dbe2a5bf 100644
--- a/pyfpdb/regression-test-files/cash/Stars/Flop/PLO8-6max-USD-0.01-0.02-200911.txt
+++ b/pyfpdb/regression-test-files/cash/Stars/Flop/PLO8-6max-USD-0.01-0.02-200911.txt
@@ -1,602 +1,602 @@
-PokerStars Game #35874998500:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:36:51 ET
-Table 'Gaby II' 6-max Seat #3 is the button
-Seat 1: EricSteph261 ($11.27 in chips) 
-Seat 2: UnderMeSensi ($3.33 in chips) 
-Seat 3: supermeXXX ($1.19 in chips) 
-Seat 4: xgz520 ($1.81 in chips) 
-Seat 5: s0rrow ($3 in chips) 
-Seat 6: tiger48475 ($5 in chips) 
-xgz520: posts small blind $0.01
-s0rrow: posts big blind $0.02
-*** HOLE CARDS ***
-Dealt to s0rrow [2h 2c 3s 9h]
-tiger48475: folds 
-EricSteph261: folds 
-UnderMeSensi: raises $0.05 to $0.07
-supermeXXX: folds 
-xgz520: folds 
-s0rrow: calls $0.05
-*** FLOP *** [Jd 5c Kc]
-s0rrow: checks 
-UnderMeSensi: checks 
-*** TURN *** [Jd 5c Kc] [4c]
-s0rrow: checks 
-UnderMeSensi: bets $0.08
-s0rrow: calls $0.08
-*** RIVER *** [Jd 5c Kc 4c] [Th]
-s0rrow: checks 
-UnderMeSensi: bets $0.31
-EricSteph261 is sitting out
-s0rrow: folds 
-Uncalled bet ($0.31) returned to UnderMeSensi
-UnderMeSensi collected $0.31 from pot
-UnderMeSensi: doesn't show hand 
-*** SUMMARY ***
-Total pot $0.31 | Rake $0 
-Board [Jd 5c Kc 4c Th]
-Seat 1: EricSteph261 folded before Flop (didn't bet)
-Seat 2: UnderMeSensi collected ($0.31)
-Seat 3: supermeXXX (button) folded before Flop (didn't bet)
-Seat 4: xgz520 (small blind) folded before Flop
-Seat 5: s0rrow (big blind) folded on the River
-Seat 6: tiger48475 folded before Flop (didn't bet)
-
-
-
-PokerStars Game #35875026976:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:37:39 ET
-Table 'Gaby II' 6-max Seat #4 is the button
-Seat 2: UnderMeSensi ($3.49 in chips) 
-Seat 3: supermeXXX ($1.19 in chips) 
-Seat 4: xgz520 ($1.80 in chips) 
-Seat 5: s0rrow ($2.85 in chips) 
-Seat 6: tiger48475 ($5 in chips) 
-s0rrow: posts small blind $0.01
-tiger48475: posts big blind $0.02
-*** HOLE CARDS ***
-Dealt to s0rrow [4d 3s 8d Jd]
-UnderMeSensi: raises $0.05 to $0.07
-supermeXXX: folds 
-xgz520: folds 
-s0rrow: folds 
-tiger48475: folds 
-Uncalled bet ($0.05) returned to UnderMeSensi
-xgz520 leaves the table
-UnderMeSensi collected $0.05 from pot
-UnderMeSensi: doesn't show hand 
-*** SUMMARY ***
-Total pot $0.05 | Rake $0 
-Seat 2: UnderMeSensi collected ($0.05)
-Seat 3: supermeXXX folded before Flop (didn't bet)
-Seat 4: xgz520 (button) folded before Flop (didn't bet)
-Seat 5: s0rrow (small blind) folded before Flop
-Seat 6: tiger48475 (big blind) folded before Flop
-
-
-
-PokerStars Game #35875034981:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:37:53 ET
-Table 'Gaby II' 6-max Seat #5 is the button
-Seat 2: UnderMeSensi ($3.52 in chips) 
-Seat 3: supermeXXX ($1.19 in chips) 
-Seat 5: s0rrow ($2.84 in chips) 
-Seat 6: tiger48475 ($5 in chips) 
-tiger48475: posts small blind $0.01
-UnderMeSensi: posts big blind $0.02
-*** HOLE CARDS ***
-Dealt to s0rrow [Qh 6c Th 9c]
-supermeXXX: raises $0.04 to $0.06
-s0rrow: calls $0.06
-tiger48475: folds 
-UnderMeSensi: calls $0.04
-*** FLOP *** [5h 4d 2d]
-UnderMeSensi: checks 
-supermeXXX: bets $0.10
-s0rrow: folds 
-UnderMeSensi: calls $0.10
-*** TURN *** [5h 4d 2d] [Jd]
-UnderMeSensi: checks 
-supermeXXX: checks 
-*** RIVER *** [5h 4d 2d Jd] [6h]
-UnderMeSensi: checks 
-supermeXXX: checks 
-*** SHOW DOWN ***
-UnderMeSensi: shows [7c 6s 7h As] (HI: a pair of Sevens; LO: 6,5,4,2,A)
-supermeXXX: shows [Ah 2h Kh 2s] (HI: three of a kind, Deuces; LO: 6,5,4,2,A)
-supermeXXX collected $0.20 from pot
-UnderMeSensi collected $0.10 from pot
-supermeXXX collected $0.09 from pot
-*** SUMMARY ***
-Total pot $0.39 | Rake $0 
-Board [5h 4d 2d Jd 6h]
-Seat 2: UnderMeSensi (big blind) showed [7c 6s 7h As] and won ($0.10) with HI: a pair of Sevens; LO: 6,5,4,2,A
-Seat 3: supermeXXX showed [Ah 2h Kh 2s] and won ($0.29) with HI: three of a kind, Deuces; LO: 6,5,4,2,A
-Seat 5: s0rrow (button) folded on the Flop
-Seat 6: tiger48475 (small blind) folded before Flop
-
-
-
-PokerStars Game #35875059163:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:38:34 ET
-Table 'Gaby II' 6-max Seat #6 is the button
-Seat 2: UnderMeSensi ($3.46 in chips) 
-Seat 3: supermeXXX ($1.32 in chips) 
-Seat 5: s0rrow ($2.78 in chips) 
-Seat 6: tiger48475 ($5 in chips) 
-UnderMeSensi: posts small blind $0.01
-supermeXXX: posts big blind $0.02
-*** HOLE CARDS ***
-Dealt to s0rrow [Ts Qs 9d 7c]
-s0rrow: raises $0.04 to $0.06
-tiger48475: folds 
-UnderMeSensi: calls $0.05
-diyi69 joins the table at seat #4 
-supermeXXX: folds 
-*** FLOP *** [3h Ah 5d]
-UnderMeSensi: checks 
-s0rrow: checks 
-*** TURN *** [3h Ah 5d] [Kc]
-UnderMeSensi: checks 
-s0rrow: bets $0.14
-UnderMeSensi: folds 
-Uncalled bet ($0.14) returned to s0rrow
-s0rrow collected $0.14 from pot
-*** SUMMARY ***
-Total pot $0.14 | Rake $0 
-Board [3h Ah 5d Kc]
-Seat 2: UnderMeSensi (small blind) folded on the Turn
-Seat 3: supermeXXX (big blind) folded before Flop
-Seat 5: s0rrow collected ($0.14)
-Seat 6: tiger48475 (button) folded before Flop (didn't bet)
-
-
-
-PokerStars Game #35875079294:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:39:09 ET
-Table 'Gaby II' 6-max Seat #2 is the button
-Seat 2: UnderMeSensi ($3.40 in chips) 
-Seat 3: supermeXXX ($1.30 in chips) 
-Seat 4: diyi69 ($1 in chips) 
-Seat 5: s0rrow ($2.86 in chips) 
-Seat 6: tiger48475 ($5 in chips) 
-supermeXXX: posts small blind $0.01
-diyi69: posts big blind $0.02
-*** HOLE CARDS ***
-Dealt to s0rrow [8s 6d 7s 2s]
-s0rrow: folds 
-tiger48475: folds 
-UnderMeSensi: folds 
-supermeXXX: calls $0.01
-diyi69 has timed out
-diyi69: checks 
-*** FLOP *** [As Js 5h]
-supermeXXX: bets $0.04
-diyi69 has timed out
-diyi69: folds 
-Uncalled bet ($0.04) returned to supermeXXX
-diyi69 is sitting out
-supermeXXX collected $0.04 from pot
-*** SUMMARY ***
-Total pot $0.04 | Rake $0 
-Board [As Js 5h]
-Seat 2: UnderMeSensi (button) folded before Flop (didn't bet)
-Seat 3: supermeXXX (small blind) collected ($0.04)
-Seat 4: diyi69 (big blind) folded on the Flop
-Seat 5: s0rrow folded before Flop (didn't bet)
-Seat 6: tiger48475 folded before Flop (didn't bet)
-
-
-
-PokerStars Game #35875131707:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:40:40 ET
-Table 'Gaby II' 6-max Seat #3 is the button
-Seat 2: UnderMeSensi ($3.40 in chips) 
-Seat 3: supermeXXX ($1.32 in chips) 
-Seat 5: s0rrow ($2.86 in chips) 
-Seat 6: tiger48475 ($5 in chips) 
-s0rrow: posts small blind $0.01
-tiger48475: posts big blind $0.02
-*** HOLE CARDS ***
-Dealt to s0rrow [7c As 4d 4h]
-UnderMeSensi: calls $0.02
-supermeXXX: folds 
-s0rrow: calls $0.01
-tiger48475: checks 
-*** FLOP *** [Ks 9d Ts]
-s0rrow: checks 
-tiger48475: bets $0.06
-UnderMeSensi: calls $0.06
-s0rrow: folds 
-*** TURN *** [Ks 9d Ts] [7h]
-tiger48475: checks 
-EricSteph261 has returned
-UnderMeSensi: checks 
-*** RIVER *** [Ks 9d Ts 7h] [4s]
-tiger48475: checks 
-UnderMeSensi: bets $0.10
-tiger48475: folds 
-Uncalled bet ($0.10) returned to UnderMeSensi
-UnderMeSensi collected $0.18 from pot
-UnderMeSensi: doesn't show hand 
-*** SUMMARY ***
-Total pot $0.18 | Rake $0 
-Board [Ks 9d Ts 7h 4s]
-Seat 2: UnderMeSensi collected ($0.18)
-Seat 3: supermeXXX (button) folded before Flop (didn't bet)
-Seat 5: s0rrow (small blind) folded on the Flop
-Seat 6: tiger48475 (big blind) folded on the River
-
-
-
-PokerStars Game #35875159084:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:41:27 ET
-Table 'Gaby II' 6-max Seat #5 is the button
-Seat 1: EricSteph261 ($11.27 in chips) 
-Seat 2: UnderMeSensi ($3.50 in chips) 
-Seat 3: supermeXXX ($1.32 in chips) 
-Seat 5: s0rrow ($2.84 in chips) 
-Seat 6: tiger48475 ($5 in chips) 
-tiger48475: posts small blind $0.01
-EricSteph261: posts big blind $0.02
-*** HOLE CARDS ***
-Dealt to s0rrow [Jc 3h 2s Qc]
-UnderMeSensi: calls $0.02
-supermeXXX: calls $0.02
-s0rrow: raises $0.08 to $0.10
-tiger48475: folds 
-EricSteph261: folds 
-UnderMeSensi: calls $0.08
-supermeXXX: folds 
-*** FLOP *** [Ac 5s Js]
-UnderMeSensi: checks 
-s0rrow: bets $0.20
-UnderMeSensi: calls $0.20
-*** TURN *** [Ac 5s Js] [8c]
-UnderMeSensi: checks 
-s0rrow: bets $0.50
-UnderMeSensi: calls $0.50
-*** RIVER *** [Ac 5s Js 8c] [Jd]
-UnderMeSensi: bets $1.60
-s0rrow: calls $1.60
-*** SHOW DOWN ***
-UnderMeSensi: shows [7s 9s Jh 3c] (HI: three of a kind, Jacks; LO: 8,7,5,3,A)
-s0rrow: shows [Jc 3h 2s Qc] (HI: three of a kind, Jacks - Ace+Queen kicker; LO: 8,5,3,2,A)
-s0rrow collected $2.33 from pot
-s0rrow collected $2.32 from pot
-*** SUMMARY ***
-Total pot $4.85 | Rake $0.20 
-Board [Ac 5s Js 8c Jd]
-Seat 1: EricSteph261 (big blind) folded before Flop
-Seat 2: UnderMeSensi showed [7s 9s Jh 3c] and lost with HI: three of a kind, Jacks; LO: 8,7,5,3,A
-Seat 3: supermeXXX folded before Flop
-Seat 5: s0rrow (button) showed [Jc 3h 2s Qc] and won ($4.65) with HI: three of a kind, Jacks; LO: 8,5,3,2,A
-Seat 6: tiger48475 (small blind) folded before Flop
-
-
-
-PokerStars Game #35875194885:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:42:28 ET
-Table 'Gaby II' 6-max Seat #6 is the button
-Seat 1: EricSteph261 ($11.25 in chips) 
-Seat 2: UnderMeSensi ($1.10 in chips) 
-Seat 3: supermeXXX ($1.30 in chips) 
-Seat 5: s0rrow ($5.09 in chips) 
-Seat 6: tiger48475 ($5 in chips) 
-EricSteph261: posts small blind $0.01
-UnderMeSensi: posts big blind $0.02
-*** HOLE CARDS ***
-Dealt to s0rrow [7s 3c 3h 8d]
-supermeXXX: folds 
-s0rrow: raises $0.02 to $0.04
-tiger48475: calls $0.04
-EricSteph261: calls $0.03
-UnderMeSensi: calls $0.02
-*** FLOP *** [8c 3s 4s]
-EricSteph261: checks 
-UnderMeSensi: checks 
-s0rrow: bets $0.14
-tiger48475: folds 
-EricSteph261: folds 
-UnderMeSensi: folds 
-Uncalled bet ($0.14) returned to s0rrow
-s0rrow collected $0.16 from pot
-*** SUMMARY ***
-Total pot $0.16 | Rake $0 
-Board [8c 3s 4s]
-Seat 1: EricSteph261 (small blind) folded on the Flop
-Seat 2: UnderMeSensi (big blind) folded on the Flop
-Seat 3: supermeXXX folded before Flop (didn't bet)
-Seat 5: s0rrow collected ($0.16)
-Seat 6: tiger48475 (button) folded on the Flop
-
-
-
-PokerStars Game #35875219121:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:43:08 ET
-Table 'Gaby II' 6-max Seat #1 is the button
-Seat 1: EricSteph261 ($11.21 in chips) 
-Seat 2: UnderMeSensi ($1.06 in chips) 
-Seat 3: supermeXXX ($1.30 in chips) 
-Seat 5: s0rrow ($5.21 in chips) 
-Seat 6: tiger48475 ($5 in chips) 
-UnderMeSensi: posts small blind $0.01
-supermeXXX: posts big blind $0.02
-*** HOLE CARDS ***
-Dealt to s0rrow [Ks Qd Kd Kc]
-s0rrow: raises $0.04 to $0.06
-tiger48475: folds 
-EricSteph261: calls $0.06
-UnderMeSensi: calls $0.05
-supermeXXX: calls $0.04
-*** FLOP *** [2d Jh 5h]
-UnderMeSensi: checks 
-supermeXXX: checks 
-s0rrow: checks 
-EricSteph261: checks 
-*** TURN *** [2d Jh 5h] [Js]
-UnderMeSensi: checks 
-supermeXXX: checks 
-s0rrow: checks 
-EricSteph261: checks 
-*** RIVER *** [2d Jh 5h Js] [7s]
-UnderMeSensi: checks 
-supermeXXX: checks 
-s0rrow: checks 
-EricSteph261: checks 
-*** SHOW DOWN ***
-UnderMeSensi: shows [5d 6c As 9d] (HI: two pair, Jacks and Fives; LO: 7,6,5,2,A)
-supermeXXX: shows [6s Th 7c Ac] (HI: two pair, Jacks and Sevens; LO: 7,6,5,2,A)
-s0rrow: shows [Ks Qd Kd Kc] (HI: two pair, Kings and Jacks)
-EricSteph261: shows [4s 9c 3d 2c] (HI: two pair, Jacks and Deuces; LO: 7,5,4,3,2)
-s0rrow collected $0.12 from pot
-EricSteph261 collected $0.12 from pot
-*** SUMMARY ***
-Total pot $0.24 | Rake $0 
-Board [2d Jh 5h Js 7s]
-Seat 1: EricSteph261 (button) showed [4s 9c 3d 2c] and won ($0.12) with HI: two pair, Jacks and Deuces; LO: 7,5,4,3,2
-Seat 2: UnderMeSensi (small blind) showed [5d 6c As 9d] and lost with HI: two pair, Jacks and Fives; LO: 7,6,5,2,A
-Seat 3: supermeXXX (big blind) showed [6s Th 7c Ac] and lost with HI: two pair, Jacks and Sevens; LO: 7,6,5,2,A
-Seat 5: s0rrow showed [Ks Qd Kd Kc] and won ($0.12) with HI: two pair, Kings and Jacks
-Seat 6: tiger48475 folded before Flop (didn't bet)
-
-
-
-PokerStars Game #35875246335:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:43:54 ET
-Table 'Gaby II' 6-max Seat #2 is the button
-Seat 1: EricSteph261 ($11.27 in chips) 
-Seat 2: UnderMeSensi ($1 in chips) 
-Seat 3: supermeXXX ($1.24 in chips) 
-Seat 5: s0rrow ($5.27 in chips) 
-Seat 6: tiger48475 ($5 in chips) 
-supermeXXX: posts small blind $0.01
-s0rrow: posts big blind $0.02
-*** HOLE CARDS ***
-Dealt to s0rrow [Jd Kc 6h Jc]
-tiger48475: folds 
-EricSteph261: calls $0.02
-UnderMeSensi is disconnected 
-UnderMeSensi has timed out while disconnected
-UnderMeSensi: folds 
-UnderMeSensi is sitting out
-supermeXXX: calls $0.01
-s0rrow: checks 
-*** FLOP *** [8d 7s Qh]
-supermeXXX: bets $0.02
-s0rrow: folds 
-EricSteph261: calls $0.02
-*** TURN *** [8d 7s Qh] [As]
-supermeXXX: bets $0.04
-EricSteph261: calls $0.04
-*** RIVER *** [8d 7s Qh As] [5d]
-supermeXXX: checks 
-EricSteph261: checks 
-*** SHOW DOWN ***
-supermeXXX: shows [Kh Qd 9s Th] (HI: a pair of Queens)
-EricSteph261: shows [Jh 2d 5s 6c] (HI: a pair of Fives; LO: 7,6,5,2,A)
-supermeXXX collected $0.09 from pot
-EricSteph261 collected $0.09 from pot
-*** SUMMARY ***
-Total pot $0.18 | Rake $0 
-Board [8d 7s Qh As 5d]
-Seat 1: EricSteph261 showed [Jh 2d 5s 6c] and won ($0.09) with HI: a pair of Fives; LO: 7,6,5,2,A
-Seat 2: UnderMeSensi (button) folded before Flop (didn't bet)
-Seat 3: supermeXXX (small blind) showed [Kh Qd 9s Th] and won ($0.09) with HI: a pair of Queens
-Seat 5: s0rrow (big blind) folded on the Flop
-Seat 6: tiger48475 folded before Flop (didn't bet)
-
-
-
-PokerStars Game #35875293439:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:45:14 ET
-Table 'Gaby II' 6-max Seat #3 is the button
-Seat 1: EricSteph261 ($11.28 in chips) 
-Seat 3: supermeXXX ($1.25 in chips) 
-Seat 5: s0rrow ($5.25 in chips) 
-Seat 6: tiger48475 ($5 in chips) 
-s0rrow: posts small blind $0.01
-tiger48475: posts big blind $0.02
-*** HOLE CARDS ***
-Dealt to s0rrow [9c 8h 8s 3c]
-EricSteph261: calls $0.02
-supermeXXX: calls $0.02
-s0rrow: calls $0.01
-tiger48475: checks 
-*** FLOP *** [Ah 2d Qc]
-s0rrow: checks 
-tiger48475: checks 
-EricSteph261: checks 
-supermeXXX: checks 
-*** TURN *** [Ah 2d Qc] [3d]
-s0rrow: checks 
-tiger48475: checks 
-EricSteph261: checks 
-supermeXXX: checks 
-*** RIVER *** [Ah 2d Qc 3d] [6s]
-s0rrow: checks 
-tiger48475: checks 
-EricSteph261: checks 
-supermeXXX: checks 
-*** SHOW DOWN ***
-s0rrow: shows [9c 8h 8s 3c] (HI: a pair of Eights; LO: 8,6,3,2,A)
-tiger48475: shows [3s 5s Ts Th] (HI: a pair of Tens; LO: 6,5,3,2,A)
-EricSteph261: shows [As Ks Jh 7h] (HI: a pair of Aces; LO: 7,6,3,2,A)
-supermeXXX: mucks hand 
-EricSteph261 collected $0.04 from pot
-tiger48475 collected $0.04 from pot
-*** SUMMARY ***
-Total pot $0.08 | Rake $0 
-Board [Ah 2d Qc 3d 6s]
-Seat 1: EricSteph261 showed [As Ks Jh 7h] and won ($0.04) with HI: a pair of Aces; LO: 7,6,3,2,A
-Seat 3: supermeXXX (button) mucked [9h 9s 4c Kc]
-Seat 5: s0rrow (small blind) showed [9c 8h 8s 3c] and lost with HI: a pair of Eights; LO: 8,6,3,2,A
-Seat 6: tiger48475 (big blind) showed [3s 5s Ts Th] and won ($0.04) with HI: a pair of Tens; LO: 6,5,3,2,A
-
-
-
-PokerStars Game #35875328026:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:46:13 ET
-Table 'Gaby II' 6-max Seat #5 is the button
-Seat 1: EricSteph261 ($11.30 in chips) 
-Seat 3: supermeXXX ($1.23 in chips) 
-Seat 5: s0rrow ($5.23 in chips) 
-Seat 6: tiger48475 ($5.02 in chips) 
-tiger48475: posts small blind $0.01
-EricSteph261: posts big blind $0.02
-*** HOLE CARDS ***
-Dealt to s0rrow [Qd 6h 8s 6c]
-supermeXXX: calls $0.02
-s0rrow: folds 
-tiger48475: calls $0.01
-EricSteph261: checks 
-*** FLOP *** [Kc Ac 5s]
-tiger48475: checks 
-EricSteph261: checks 
-supermeXXX: checks 
-*** TURN *** [Kc Ac 5s] [3h]
-tiger48475: checks 
-EricSteph261: checks 
-supermeXXX: checks 
-*** RIVER *** [Kc Ac 5s 3h] [Qh]
-tiger48475: bets $0.06
-EricSteph261: folds 
-EricSteph261 is sitting out
-supermeXXX: folds 
-Uncalled bet ($0.06) returned to tiger48475
-tiger48475 collected $0.06 from pot
-*** SUMMARY ***
-Total pot $0.06 | Rake $0 
-Board [Kc Ac 5s 3h Qh]
-Seat 1: EricSteph261 (big blind) folded on the River
-Seat 3: supermeXXX folded on the River
-Seat 5: s0rrow (button) folded before Flop (didn't bet)
-Seat 6: tiger48475 (small blind) collected ($0.06)
-
-
-
-PokerStars Game #35875356253:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:47:00 ET
-Table 'Gaby II' 6-max Seat #6 is the button
-Seat 3: supermeXXX ($1.21 in chips) 
-Seat 5: s0rrow ($5.23 in chips) 
-Seat 6: tiger48475 ($5.06 in chips) 
-supermeXXX: posts small blind $0.01
-s0rrow: posts big blind $0.02
-*** HOLE CARDS ***
-Dealt to s0rrow [8h Jd 5d 8d]
-tiger48475: folds 
-supermeXXX: calls $0.01
-s0rrow: checks 
-*** FLOP *** [Ks 9s 6c]
-supermeXXX: bets $0.02
-s0rrow: calls $0.02
-*** TURN *** [Ks 9s 6c] [Qc]
-supermeXXX: bets $0.02
-s0rrow: calls $0.02
-*** RIVER *** [Ks 9s 6c Qc] [Ad]
-supermeXXX: checks 
-s0rrow: checks 
-*** SHOW DOWN ***
-supermeXXX: shows [Tc 7d 8c 3s] (HI: high card Ace)
-s0rrow: shows [8h Jd 5d 8d] (HI: a pair of Eights)
-s0rrow collected $0.12 from pot
-No low hand qualified
-*** SUMMARY ***
-Total pot $0.12 | Rake $0 
-Board [Ks 9s 6c Qc Ad]
-Seat 3: supermeXXX (small blind) showed [Tc 7d 8c 3s] and lost with HI: high card Ace
-Seat 5: s0rrow (big blind) showed [8h Jd 5d 8d] and won ($0.12) with HI: a pair of Eights
-Seat 6: tiger48475 (button) folded before Flop (didn't bet)
-
-
-
-PokerStars Game #35875379792:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:47:39 ET
-Table 'Gaby II' 6-max Seat #3 is the button
-Seat 3: supermeXXX ($1.15 in chips) 
-Seat 5: s0rrow ($5.29 in chips) 
-Seat 6: tiger48475 ($5.06 in chips) 
-s0rrow: posts small blind $0.01
-tiger48475: posts big blind $0.02
-*** HOLE CARDS ***
-Dealt to s0rrow [9c 5h 3s Th]
-supermeXXX: calls $0.02
-s0rrow: calls $0.01
-tiger48475: checks 
-*** FLOP *** [Jc 3h Jd]
-s0rrow: checks 
-tiger48475: checks 
-supermeXXX: checks 
-*** TURN *** [Jc 3h Jd] [6d]
-s0rrow: checks 
-tiger48475: bets $0.06
-supermeXXX: folds 
-EricSteph261 has returned
-s0rrow: calls $0.06
-*** RIVER *** [Jc 3h Jd 6d] [5c]
-s0rrow: checks 
-tiger48475: bets $0.14
-s0rrow: folds 
-Uncalled bet ($0.14) returned to tiger48475
-tiger48475 collected $0.18 from pot
-*** SUMMARY ***
-Total pot $0.18 | Rake $0 
-Board [Jc 3h Jd 6d 5c]
-Seat 3: supermeXXX (button) folded on the Turn
-Seat 5: s0rrow (small blind) folded on the River
-Seat 6: tiger48475 (big blind) collected ($0.18)
-
-
-
-PokerStars Game #35875409365:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:48:29 ET
-Table 'Gaby II' 6-max Seat #5 is the button
-Seat 1: EricSteph261 ($11.28 in chips) 
-Seat 3: supermeXXX ($1.13 in chips) 
-Seat 5: s0rrow ($5.21 in chips) 
-Seat 6: tiger48475 ($5.16 in chips) 
-tiger48475: posts small blind $0.01
-EricSteph261: posts big blind $0.02
-*** HOLE CARDS ***
-Dealt to s0rrow [6h 3c Th 2s]
-supermeXXX: calls $0.02
-s0rrow: calls $0.02
-tiger48475: calls $0.01
-EricSteph261 has timed out
-EricSteph261: checks 
-*** FLOP *** [9d 5s Jh]
-tiger48475: bets $0.06
-EricSteph261 has timed out
-EricSteph261: folds 
-EricSteph261 is sitting out
-supermeXXX: calls $0.06
-s0rrow: calls $0.06
-*** TURN *** [9d 5s Jh] [Ks]
-tiger48475: checks 
-supermeXXX: bets $0.10
-s0rrow: folds 
-tiger48475: calls $0.10
-*** RIVER *** [9d 5s Jh Ks] [9s]
-tiger48475: checks 
-supermeXXX: checks 
-*** SHOW DOWN ***
-tiger48475: shows [6s 9h 9c Ad] (HI: four of a kind, Nines)
-supermeXXX: mucks hand 
-tiger48475 collected $0.46 from pot
-No low hand qualified
-*** SUMMARY ***
-Total pot $0.46 | Rake $0 
-Board [9d 5s Jh Ks 9s]
-Seat 1: EricSteph261 (big blind) folded on the Flop
-Seat 3: supermeXXX mucked [Qd Tc 5h Ts]
-Seat 5: s0rrow (button) folded on the Turn
-Seat 6: tiger48475 (small blind) showed [6s 9h 9c Ad] and won ($0.46) with HI: four of a kind, Nines
-
-
-
+PokerStars Game #35874998500:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:36:51 ET
+Table 'Gaby II' 6-max Seat #3 is the button
+Seat 1: EricSteph261 ($11.27 in chips) 
+Seat 2: UnderMeSensi ($3.33 in chips) 
+Seat 3: supermeXXX ($1.19 in chips) 
+Seat 4: xgz520 ($1.81 in chips) 
+Seat 5: s0rrow ($3 in chips) 
+Seat 6: tiger48475 ($5 in chips) 
+xgz520: posts small blind $0.01
+s0rrow: posts big blind $0.02
+*** HOLE CARDS ***
+Dealt to s0rrow [2h 2c 3s 9h]
+tiger48475: folds 
+EricSteph261: folds 
+UnderMeSensi: raises $0.05 to $0.07
+supermeXXX: folds 
+xgz520: folds 
+s0rrow: calls $0.05
+*** FLOP *** [Jd 5c Kc]
+s0rrow: checks 
+UnderMeSensi: checks 
+*** TURN *** [Jd 5c Kc] [4c]
+s0rrow: checks 
+UnderMeSensi: bets $0.08
+s0rrow: calls $0.08
+*** RIVER *** [Jd 5c Kc 4c] [Th]
+s0rrow: checks 
+UnderMeSensi: bets $0.31
+EricSteph261 is sitting out
+s0rrow: folds 
+Uncalled bet ($0.31) returned to UnderMeSensi
+UnderMeSensi collected $0.31 from pot
+UnderMeSensi: doesn't show hand 
+*** SUMMARY ***
+Total pot $0.31 | Rake $0 
+Board [Jd 5c Kc 4c Th]
+Seat 1: EricSteph261 folded before Flop (didn't bet)
+Seat 2: UnderMeSensi collected ($0.31)
+Seat 3: supermeXXX (button) folded before Flop (didn't bet)
+Seat 4: xgz520 (small blind) folded before Flop
+Seat 5: s0rrow (big blind) folded on the River
+Seat 6: tiger48475 folded before Flop (didn't bet)
+
+
+
+PokerStars Game #35875026976:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:37:39 ET
+Table 'Gaby II' 6-max Seat #4 is the button
+Seat 2: UnderMeSensi ($3.49 in chips) 
+Seat 3: supermeXXX ($1.19 in chips) 
+Seat 4: xgz520 ($1.80 in chips) 
+Seat 5: s0rrow ($2.85 in chips) 
+Seat 6: tiger48475 ($5 in chips) 
+s0rrow: posts small blind $0.01
+tiger48475: posts big blind $0.02
+*** HOLE CARDS ***
+Dealt to s0rrow [4d 3s 8d Jd]
+UnderMeSensi: raises $0.05 to $0.07
+supermeXXX: folds 
+xgz520: folds 
+s0rrow: folds 
+tiger48475: folds 
+Uncalled bet ($0.05) returned to UnderMeSensi
+xgz520 leaves the table
+UnderMeSensi collected $0.05 from pot
+UnderMeSensi: doesn't show hand 
+*** SUMMARY ***
+Total pot $0.05 | Rake $0 
+Seat 2: UnderMeSensi collected ($0.05)
+Seat 3: supermeXXX folded before Flop (didn't bet)
+Seat 4: xgz520 (button) folded before Flop (didn't bet)
+Seat 5: s0rrow (small blind) folded before Flop
+Seat 6: tiger48475 (big blind) folded before Flop
+
+
+
+PokerStars Game #35875034981:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:37:53 ET
+Table 'Gaby II' 6-max Seat #5 is the button
+Seat 2: UnderMeSensi ($3.52 in chips) 
+Seat 3: supermeXXX ($1.19 in chips) 
+Seat 5: s0rrow ($2.84 in chips) 
+Seat 6: tiger48475 ($5 in chips) 
+tiger48475: posts small blind $0.01
+UnderMeSensi: posts big blind $0.02
+*** HOLE CARDS ***
+Dealt to s0rrow [Qh 6c Th 9c]
+supermeXXX: raises $0.04 to $0.06
+s0rrow: calls $0.06
+tiger48475: folds 
+UnderMeSensi: calls $0.04
+*** FLOP *** [5h 4d 2d]
+UnderMeSensi: checks 
+supermeXXX: bets $0.10
+s0rrow: folds 
+UnderMeSensi: calls $0.10
+*** TURN *** [5h 4d 2d] [Jd]
+UnderMeSensi: checks 
+supermeXXX: checks 
+*** RIVER *** [5h 4d 2d Jd] [6h]
+UnderMeSensi: checks 
+supermeXXX: checks 
+*** SHOW DOWN ***
+UnderMeSensi: shows [7c 6s 7h As] (HI: a pair of Sevens; LO: 6,5,4,2,A)
+supermeXXX: shows [Ah 2h Kh 2s] (HI: three of a kind, Deuces; LO: 6,5,4,2,A)
+supermeXXX collected $0.20 from pot
+UnderMeSensi collected $0.10 from pot
+supermeXXX collected $0.09 from pot
+*** SUMMARY ***
+Total pot $0.39 | Rake $0 
+Board [5h 4d 2d Jd 6h]
+Seat 2: UnderMeSensi (big blind) showed [7c 6s 7h As] and won ($0.10) with HI: a pair of Sevens; LO: 6,5,4,2,A
+Seat 3: supermeXXX showed [Ah 2h Kh 2s] and won ($0.29) with HI: three of a kind, Deuces; LO: 6,5,4,2,A
+Seat 5: s0rrow (button) folded on the Flop
+Seat 6: tiger48475 (small blind) folded before Flop
+
+
+
+PokerStars Game #35875059163:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:38:34 ET
+Table 'Gaby II' 6-max Seat #6 is the button
+Seat 2: UnderMeSensi ($3.46 in chips) 
+Seat 3: supermeXXX ($1.32 in chips) 
+Seat 5: s0rrow ($2.78 in chips) 
+Seat 6: tiger48475 ($5 in chips) 
+UnderMeSensi: posts small blind $0.01
+supermeXXX: posts big blind $0.02
+*** HOLE CARDS ***
+Dealt to s0rrow [Ts Qs 9d 7c]
+s0rrow: raises $0.04 to $0.06
+tiger48475: folds 
+UnderMeSensi: calls $0.05
+diyi69 joins the table at seat #4 
+supermeXXX: folds 
+*** FLOP *** [3h Ah 5d]
+UnderMeSensi: checks 
+s0rrow: checks 
+*** TURN *** [3h Ah 5d] [Kc]
+UnderMeSensi: checks 
+s0rrow: bets $0.14
+UnderMeSensi: folds 
+Uncalled bet ($0.14) returned to s0rrow
+s0rrow collected $0.14 from pot
+*** SUMMARY ***
+Total pot $0.14 | Rake $0 
+Board [3h Ah 5d Kc]
+Seat 2: UnderMeSensi (small blind) folded on the Turn
+Seat 3: supermeXXX (big blind) folded before Flop
+Seat 5: s0rrow collected ($0.14)
+Seat 6: tiger48475 (button) folded before Flop (didn't bet)
+
+
+
+PokerStars Game #35875079294:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:39:09 ET
+Table 'Gaby II' 6-max Seat #2 is the button
+Seat 2: UnderMeSensi ($3.40 in chips) 
+Seat 3: supermeXXX ($1.30 in chips) 
+Seat 4: diyi69 ($1 in chips) 
+Seat 5: s0rrow ($2.86 in chips) 
+Seat 6: tiger48475 ($5 in chips) 
+supermeXXX: posts small blind $0.01
+diyi69: posts big blind $0.02
+*** HOLE CARDS ***
+Dealt to s0rrow [8s 6d 7s 2s]
+s0rrow: folds 
+tiger48475: folds 
+UnderMeSensi: folds 
+supermeXXX: calls $0.01
+diyi69 has timed out
+diyi69: checks 
+*** FLOP *** [As Js 5h]
+supermeXXX: bets $0.04
+diyi69 has timed out
+diyi69: folds 
+Uncalled bet ($0.04) returned to supermeXXX
+diyi69 is sitting out
+supermeXXX collected $0.04 from pot
+*** SUMMARY ***
+Total pot $0.04 | Rake $0 
+Board [As Js 5h]
+Seat 2: UnderMeSensi (button) folded before Flop (didn't bet)
+Seat 3: supermeXXX (small blind) collected ($0.04)
+Seat 4: diyi69 (big blind) folded on the Flop
+Seat 5: s0rrow folded before Flop (didn't bet)
+Seat 6: tiger48475 folded before Flop (didn't bet)
+
+
+
+PokerStars Game #35875131707:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:40:40 ET
+Table 'Gaby II' 6-max Seat #3 is the button
+Seat 2: UnderMeSensi ($3.40 in chips) 
+Seat 3: supermeXXX ($1.32 in chips) 
+Seat 5: s0rrow ($2.86 in chips) 
+Seat 6: tiger48475 ($5 in chips) 
+s0rrow: posts small blind $0.01
+tiger48475: posts big blind $0.02
+*** HOLE CARDS ***
+Dealt to s0rrow [7c As 4d 4h]
+UnderMeSensi: calls $0.02
+supermeXXX: folds 
+s0rrow: calls $0.01
+tiger48475: checks 
+*** FLOP *** [Ks 9d Ts]
+s0rrow: checks 
+tiger48475: bets $0.06
+UnderMeSensi: calls $0.06
+s0rrow: folds 
+*** TURN *** [Ks 9d Ts] [7h]
+tiger48475: checks 
+EricSteph261 has returned
+UnderMeSensi: checks 
+*** RIVER *** [Ks 9d Ts 7h] [4s]
+tiger48475: checks 
+UnderMeSensi: bets $0.10
+tiger48475: folds 
+Uncalled bet ($0.10) returned to UnderMeSensi
+UnderMeSensi collected $0.18 from pot
+UnderMeSensi: doesn't show hand 
+*** SUMMARY ***
+Total pot $0.18 | Rake $0 
+Board [Ks 9d Ts 7h 4s]
+Seat 2: UnderMeSensi collected ($0.18)
+Seat 3: supermeXXX (button) folded before Flop (didn't bet)
+Seat 5: s0rrow (small blind) folded on the Flop
+Seat 6: tiger48475 (big blind) folded on the River
+
+
+
+PokerStars Game #35875159084:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:41:27 ET
+Table 'Gaby II' 6-max Seat #5 is the button
+Seat 1: EricSteph261 ($11.27 in chips) 
+Seat 2: UnderMeSensi ($3.50 in chips) 
+Seat 3: supermeXXX ($1.32 in chips) 
+Seat 5: s0rrow ($2.84 in chips) 
+Seat 6: tiger48475 ($5 in chips) 
+tiger48475: posts small blind $0.01
+EricSteph261: posts big blind $0.02
+*** HOLE CARDS ***
+Dealt to s0rrow [Jc 3h 2s Qc]
+UnderMeSensi: calls $0.02
+supermeXXX: calls $0.02
+s0rrow: raises $0.08 to $0.10
+tiger48475: folds 
+EricSteph261: folds 
+UnderMeSensi: calls $0.08
+supermeXXX: folds 
+*** FLOP *** [Ac 5s Js]
+UnderMeSensi: checks 
+s0rrow: bets $0.20
+UnderMeSensi: calls $0.20
+*** TURN *** [Ac 5s Js] [8c]
+UnderMeSensi: checks 
+s0rrow: bets $0.50
+UnderMeSensi: calls $0.50
+*** RIVER *** [Ac 5s Js 8c] [Jd]
+UnderMeSensi: bets $1.60
+s0rrow: calls $1.60
+*** SHOW DOWN ***
+UnderMeSensi: shows [7s 9s Jh 3c] (HI: three of a kind, Jacks; LO: 8,7,5,3,A)
+s0rrow: shows [Jc 3h 2s Qc] (HI: three of a kind, Jacks - Ace+Queen kicker; LO: 8,5,3,2,A)
+s0rrow collected $2.33 from pot
+s0rrow collected $2.32 from pot
+*** SUMMARY ***
+Total pot $4.85 | Rake $0.20 
+Board [Ac 5s Js 8c Jd]
+Seat 1: EricSteph261 (big blind) folded before Flop
+Seat 2: UnderMeSensi showed [7s 9s Jh 3c] and lost with HI: three of a kind, Jacks; LO: 8,7,5,3,A
+Seat 3: supermeXXX folded before Flop
+Seat 5: s0rrow (button) showed [Jc 3h 2s Qc] and won ($4.65) with HI: three of a kind, Jacks; LO: 8,5,3,2,A
+Seat 6: tiger48475 (small blind) folded before Flop
+
+
+
+PokerStars Game #35875194885:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:42:28 ET
+Table 'Gaby II' 6-max Seat #6 is the button
+Seat 1: EricSteph261 ($11.25 in chips) 
+Seat 2: UnderMeSensi ($1.10 in chips) 
+Seat 3: supermeXXX ($1.30 in chips) 
+Seat 5: s0rrow ($5.09 in chips) 
+Seat 6: tiger48475 ($5 in chips) 
+EricSteph261: posts small blind $0.01
+UnderMeSensi: posts big blind $0.02
+*** HOLE CARDS ***
+Dealt to s0rrow [7s 3c 3h 8d]
+supermeXXX: folds 
+s0rrow: raises $0.02 to $0.04
+tiger48475: calls $0.04
+EricSteph261: calls $0.03
+UnderMeSensi: calls $0.02
+*** FLOP *** [8c 3s 4s]
+EricSteph261: checks 
+UnderMeSensi: checks 
+s0rrow: bets $0.14
+tiger48475: folds 
+EricSteph261: folds 
+UnderMeSensi: folds 
+Uncalled bet ($0.14) returned to s0rrow
+s0rrow collected $0.16 from pot
+*** SUMMARY ***
+Total pot $0.16 | Rake $0 
+Board [8c 3s 4s]
+Seat 1: EricSteph261 (small blind) folded on the Flop
+Seat 2: UnderMeSensi (big blind) folded on the Flop
+Seat 3: supermeXXX folded before Flop (didn't bet)
+Seat 5: s0rrow collected ($0.16)
+Seat 6: tiger48475 (button) folded on the Flop
+
+
+
+PokerStars Game #35875219121:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:43:08 ET
+Table 'Gaby II' 6-max Seat #1 is the button
+Seat 1: EricSteph261 ($11.21 in chips) 
+Seat 2: UnderMeSensi ($1.06 in chips) 
+Seat 3: supermeXXX ($1.30 in chips) 
+Seat 5: s0rrow ($5.21 in chips) 
+Seat 6: tiger48475 ($5 in chips) 
+UnderMeSensi: posts small blind $0.01
+supermeXXX: posts big blind $0.02
+*** HOLE CARDS ***
+Dealt to s0rrow [Ks Qd Kd Kc]
+s0rrow: raises $0.04 to $0.06
+tiger48475: folds 
+EricSteph261: calls $0.06
+UnderMeSensi: calls $0.05
+supermeXXX: calls $0.04
+*** FLOP *** [2d Jh 5h]
+UnderMeSensi: checks 
+supermeXXX: checks 
+s0rrow: checks 
+EricSteph261: checks 
+*** TURN *** [2d Jh 5h] [Js]
+UnderMeSensi: checks 
+supermeXXX: checks 
+s0rrow: checks 
+EricSteph261: checks 
+*** RIVER *** [2d Jh 5h Js] [7s]
+UnderMeSensi: checks 
+supermeXXX: checks 
+s0rrow: checks 
+EricSteph261: checks 
+*** SHOW DOWN ***
+UnderMeSensi: shows [5d 6c As 9d] (HI: two pair, Jacks and Fives; LO: 7,6,5,2,A)
+supermeXXX: shows [6s Th 7c Ac] (HI: two pair, Jacks and Sevens; LO: 7,6,5,2,A)
+s0rrow: shows [Ks Qd Kd Kc] (HI: two pair, Kings and Jacks)
+EricSteph261: shows [4s 9c 3d 2c] (HI: two pair, Jacks and Deuces; LO: 7,5,4,3,2)
+s0rrow collected $0.12 from pot
+EricSteph261 collected $0.12 from pot
+*** SUMMARY ***
+Total pot $0.24 | Rake $0 
+Board [2d Jh 5h Js 7s]
+Seat 1: EricSteph261 (button) showed [4s 9c 3d 2c] and won ($0.12) with HI: two pair, Jacks and Deuces; LO: 7,5,4,3,2
+Seat 2: UnderMeSensi (small blind) showed [5d 6c As 9d] and lost with HI: two pair, Jacks and Fives; LO: 7,6,5,2,A
+Seat 3: supermeXXX (big blind) showed [6s Th 7c Ac] and lost with HI: two pair, Jacks and Sevens; LO: 7,6,5,2,A
+Seat 5: s0rrow showed [Ks Qd Kd Kc] and won ($0.12) with HI: two pair, Kings and Jacks
+Seat 6: tiger48475 folded before Flop (didn't bet)
+
+
+
+PokerStars Game #35875246335:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:43:54 ET
+Table 'Gaby II' 6-max Seat #2 is the button
+Seat 1: EricSteph261 ($11.27 in chips) 
+Seat 2: UnderMeSensi ($1 in chips) 
+Seat 3: supermeXXX ($1.24 in chips) 
+Seat 5: s0rrow ($5.27 in chips) 
+Seat 6: tiger48475 ($5 in chips) 
+supermeXXX: posts small blind $0.01
+s0rrow: posts big blind $0.02
+*** HOLE CARDS ***
+Dealt to s0rrow [Jd Kc 6h Jc]
+tiger48475: folds 
+EricSteph261: calls $0.02
+UnderMeSensi is disconnected 
+UnderMeSensi has timed out while disconnected
+UnderMeSensi: folds 
+UnderMeSensi is sitting out
+supermeXXX: calls $0.01
+s0rrow: checks 
+*** FLOP *** [8d 7s Qh]
+supermeXXX: bets $0.02
+s0rrow: folds 
+EricSteph261: calls $0.02
+*** TURN *** [8d 7s Qh] [As]
+supermeXXX: bets $0.04
+EricSteph261: calls $0.04
+*** RIVER *** [8d 7s Qh As] [5d]
+supermeXXX: checks 
+EricSteph261: checks 
+*** SHOW DOWN ***
+supermeXXX: shows [Kh Qd 9s Th] (HI: a pair of Queens)
+EricSteph261: shows [Jh 2d 5s 6c] (HI: a pair of Fives; LO: 7,6,5,2,A)
+supermeXXX collected $0.09 from pot
+EricSteph261 collected $0.09 from pot
+*** SUMMARY ***
+Total pot $0.18 | Rake $0 
+Board [8d 7s Qh As 5d]
+Seat 1: EricSteph261 showed [Jh 2d 5s 6c] and won ($0.09) with HI: a pair of Fives; LO: 7,6,5,2,A
+Seat 2: UnderMeSensi (button) folded before Flop (didn't bet)
+Seat 3: supermeXXX (small blind) showed [Kh Qd 9s Th] and won ($0.09) with HI: a pair of Queens
+Seat 5: s0rrow (big blind) folded on the Flop
+Seat 6: tiger48475 folded before Flop (didn't bet)
+
+
+
+PokerStars Game #35875293439:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:45:14 ET
+Table 'Gaby II' 6-max Seat #3 is the button
+Seat 1: EricSteph261 ($11.28 in chips) 
+Seat 3: supermeXXX ($1.25 in chips) 
+Seat 5: s0rrow ($5.25 in chips) 
+Seat 6: tiger48475 ($5 in chips) 
+s0rrow: posts small blind $0.01
+tiger48475: posts big blind $0.02
+*** HOLE CARDS ***
+Dealt to s0rrow [9c 8h 8s 3c]
+EricSteph261: calls $0.02
+supermeXXX: calls $0.02
+s0rrow: calls $0.01
+tiger48475: checks 
+*** FLOP *** [Ah 2d Qc]
+s0rrow: checks 
+tiger48475: checks 
+EricSteph261: checks 
+supermeXXX: checks 
+*** TURN *** [Ah 2d Qc] [3d]
+s0rrow: checks 
+tiger48475: checks 
+EricSteph261: checks 
+supermeXXX: checks 
+*** RIVER *** [Ah 2d Qc 3d] [6s]
+s0rrow: checks 
+tiger48475: checks 
+EricSteph261: checks 
+supermeXXX: checks 
+*** SHOW DOWN ***
+s0rrow: shows [9c 8h 8s 3c] (HI: a pair of Eights; LO: 8,6,3,2,A)
+tiger48475: shows [3s 5s Ts Th] (HI: a pair of Tens; LO: 6,5,3,2,A)
+EricSteph261: shows [As Ks Jh 7h] (HI: a pair of Aces; LO: 7,6,3,2,A)
+supermeXXX: mucks hand 
+EricSteph261 collected $0.04 from pot
+tiger48475 collected $0.04 from pot
+*** SUMMARY ***
+Total pot $0.08 | Rake $0 
+Board [Ah 2d Qc 3d 6s]
+Seat 1: EricSteph261 showed [As Ks Jh 7h] and won ($0.04) with HI: a pair of Aces; LO: 7,6,3,2,A
+Seat 3: supermeXXX (button) mucked [9h 9s 4c Kc]
+Seat 5: s0rrow (small blind) showed [9c 8h 8s 3c] and lost with HI: a pair of Eights; LO: 8,6,3,2,A
+Seat 6: tiger48475 (big blind) showed [3s 5s Ts Th] and won ($0.04) with HI: a pair of Tens; LO: 6,5,3,2,A
+
+
+
+PokerStars Game #35875328026:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:46:13 ET
+Table 'Gaby II' 6-max Seat #5 is the button
+Seat 1: EricSteph261 ($11.30 in chips) 
+Seat 3: supermeXXX ($1.23 in chips) 
+Seat 5: s0rrow ($5.23 in chips) 
+Seat 6: tiger48475 ($5.02 in chips) 
+tiger48475: posts small blind $0.01
+EricSteph261: posts big blind $0.02
+*** HOLE CARDS ***
+Dealt to s0rrow [Qd 6h 8s 6c]
+supermeXXX: calls $0.02
+s0rrow: folds 
+tiger48475: calls $0.01
+EricSteph261: checks 
+*** FLOP *** [Kc Ac 5s]
+tiger48475: checks 
+EricSteph261: checks 
+supermeXXX: checks 
+*** TURN *** [Kc Ac 5s] [3h]
+tiger48475: checks 
+EricSteph261: checks 
+supermeXXX: checks 
+*** RIVER *** [Kc Ac 5s 3h] [Qh]
+tiger48475: bets $0.06
+EricSteph261: folds 
+EricSteph261 is sitting out
+supermeXXX: folds 
+Uncalled bet ($0.06) returned to tiger48475
+tiger48475 collected $0.06 from pot
+*** SUMMARY ***
+Total pot $0.06 | Rake $0 
+Board [Kc Ac 5s 3h Qh]
+Seat 1: EricSteph261 (big blind) folded on the River
+Seat 3: supermeXXX folded on the River
+Seat 5: s0rrow (button) folded before Flop (didn't bet)
+Seat 6: tiger48475 (small blind) collected ($0.06)
+
+
+
+PokerStars Game #35875356253:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:47:00 ET
+Table 'Gaby II' 6-max Seat #6 is the button
+Seat 3: supermeXXX ($1.21 in chips) 
+Seat 5: s0rrow ($5.23 in chips) 
+Seat 6: tiger48475 ($5.06 in chips) 
+supermeXXX: posts small blind $0.01
+s0rrow: posts big blind $0.02
+*** HOLE CARDS ***
+Dealt to s0rrow [8h Jd 5d 8d]
+tiger48475: folds 
+supermeXXX: calls $0.01
+s0rrow: checks 
+*** FLOP *** [Ks 9s 6c]
+supermeXXX: bets $0.02
+s0rrow: calls $0.02
+*** TURN *** [Ks 9s 6c] [Qc]
+supermeXXX: bets $0.02
+s0rrow: calls $0.02
+*** RIVER *** [Ks 9s 6c Qc] [Ad]
+supermeXXX: checks 
+s0rrow: checks 
+*** SHOW DOWN ***
+supermeXXX: shows [Tc 7d 8c 3s] (HI: high card Ace)
+s0rrow: shows [8h Jd 5d 8d] (HI: a pair of Eights)
+s0rrow collected $0.12 from pot
+No low hand qualified
+*** SUMMARY ***
+Total pot $0.12 | Rake $0 
+Board [Ks 9s 6c Qc Ad]
+Seat 3: supermeXXX (small blind) showed [Tc 7d 8c 3s] and lost with HI: high card Ace
+Seat 5: s0rrow (big blind) showed [8h Jd 5d 8d] and won ($0.12) with HI: a pair of Eights
+Seat 6: tiger48475 (button) folded before Flop (didn't bet)
+
+
+
+PokerStars Game #35875379792:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:47:39 ET
+Table 'Gaby II' 6-max Seat #3 is the button
+Seat 3: supermeXXX ($1.15 in chips) 
+Seat 5: s0rrow ($5.29 in chips) 
+Seat 6: tiger48475 ($5.06 in chips) 
+s0rrow: posts small blind $0.01
+tiger48475: posts big blind $0.02
+*** HOLE CARDS ***
+Dealt to s0rrow [9c 5h 3s Th]
+supermeXXX: calls $0.02
+s0rrow: calls $0.01
+tiger48475: checks 
+*** FLOP *** [Jc 3h Jd]
+s0rrow: checks 
+tiger48475: checks 
+supermeXXX: checks 
+*** TURN *** [Jc 3h Jd] [6d]
+s0rrow: checks 
+tiger48475: bets $0.06
+supermeXXX: folds 
+EricSteph261 has returned
+s0rrow: calls $0.06
+*** RIVER *** [Jc 3h Jd 6d] [5c]
+s0rrow: checks 
+tiger48475: bets $0.14
+s0rrow: folds 
+Uncalled bet ($0.14) returned to tiger48475
+tiger48475 collected $0.18 from pot
+*** SUMMARY ***
+Total pot $0.18 | Rake $0 
+Board [Jc 3h Jd 6d 5c]
+Seat 3: supermeXXX (button) folded on the Turn
+Seat 5: s0rrow (small blind) folded on the River
+Seat 6: tiger48475 (big blind) collected ($0.18)
+
+
+
+PokerStars Game #35875409365:  Omaha Hi/Lo Pot Limit ($0.01/$0.02 USD) - 2009/11/26 10:48:29 ET
+Table 'Gaby II' 6-max Seat #5 is the button
+Seat 1: EricSteph261 ($11.28 in chips) 
+Seat 3: supermeXXX ($1.13 in chips) 
+Seat 5: s0rrow ($5.21 in chips) 
+Seat 6: tiger48475 ($5.16 in chips) 
+tiger48475: posts small blind $0.01
+EricSteph261: posts big blind $0.02
+*** HOLE CARDS ***
+Dealt to s0rrow [6h 3c Th 2s]
+supermeXXX: calls $0.02
+s0rrow: calls $0.02
+tiger48475: calls $0.01
+EricSteph261 has timed out
+EricSteph261: checks 
+*** FLOP *** [9d 5s Jh]
+tiger48475: bets $0.06
+EricSteph261 has timed out
+EricSteph261: folds 
+EricSteph261 is sitting out
+supermeXXX: calls $0.06
+s0rrow: calls $0.06
+*** TURN *** [9d 5s Jh] [Ks]
+tiger48475: checks 
+supermeXXX: bets $0.10
+s0rrow: folds 
+tiger48475: calls $0.10
+*** RIVER *** [9d 5s Jh Ks] [9s]
+tiger48475: checks 
+supermeXXX: checks 
+*** SHOW DOWN ***
+tiger48475: shows [6s 9h 9c Ad] (HI: four of a kind, Nines)
+supermeXXX: mucks hand 
+tiger48475 collected $0.46 from pot
+No low hand qualified
+*** SUMMARY ***
+Total pot $0.46 | Rake $0 
+Board [9d 5s Jh Ks 9s]
+Seat 1: EricSteph261 (big blind) folded on the Flop
+Seat 3: supermeXXX mucked [Qd Tc 5h Ts]
+Seat 5: s0rrow (button) folded on the Turn
+Seat 6: tiger48475 (small blind) showed [6s 9h 9c Ad] and won ($0.46) with HI: four of a kind, Nines
+
+
+
diff --git a/pyfpdb/regression-test-files/cash/Stars/Stud/7-StudHL-USD-0.04-0.08-200911.Cardtest.txt b/pyfpdb/regression-test-files/cash/Stars/Stud/7-StudHL-USD-0.04-0.08-200911.Cardtest.txt
index 0ffdcc3d..7b1e2f44 100644
--- a/pyfpdb/regression-test-files/cash/Stars/Stud/7-StudHL-USD-0.04-0.08-200911.Cardtest.txt
+++ b/pyfpdb/regression-test-files/cash/Stars/Stud/7-StudHL-USD-0.04-0.08-200911.Cardtest.txt
@@ -1,96 +1,96 @@
-PokerStars Game #35874676388:  7 Card Stud Hi/Lo Limit ($0.04/$0.08 USD) - 2009/11/26 10:27:46 ET
-Table 'Dawn II' 8-max
-Seat 1: u.pressure ($11.17 in chips) 
-Seat 2: 123smoothie ($0.99 in chips) 
-Seat 3: gashpor ($1.40 in chips) 
-Seat 4: denny501 ($0.71 in chips) 
-Seat 5: s0rrow ($1.52 in chips) 
-Seat 6: TomSludge ($1.58 in chips) 
-Seat 7: Soroka69 ($0.83 in chips) 
-Seat 8: rdiezchang ($2.05 in chips) 
-u.pressure: posts the ante $0.01
-123smoothie: posts the ante $0.01
-gashpor: posts the ante $0.01
-denny501: posts the ante $0.01
-s0rrow: posts the ante $0.01
-TomSludge: posts the ante $0.01
-Soroka69: posts the ante $0.01
-rdiezchang: posts the ante $0.01
-*** 3rd STREET ***
-Dealt to u.pressure [Td]
-Dealt to 123smoothie [4c]
-Dealt to gashpor [5d]
-Dealt to denny501 [2c]
-Dealt to s0rrow [7c 3s 5h]
-Dealt to TomSludge [8s]
-Dealt to Soroka69 [7d]
-Dealt to rdiezchang [Ad]
-denny501: brings in for $0.02
-s0rrow: calls $0.02
-TomSludge: folds 
-Soroka69: calls $0.02
-rdiezchang: calls $0.02
-u.pressure: folds 
-123smoothie: calls $0.02
-gashpor: calls $0.02
-*** 4th STREET ***
-Dealt to 123smoothie [4c] [3c]
-Dealt to gashpor [5d] [Qd]
-Dealt to denny501 [2c] [7s]
-Dealt to s0rrow [7c 3s 5h] [Qc]
-Dealt to Soroka69 [7d] [5s]
-Dealt to rdiezchang [Ad] [Js]
-rdiezchang: checks 
-123smoothie: checks 
-gashpor: checks 
-denny501: folds 
-denny501 leaves the table
-s0rrow: checks 
-Soroka69: checks 
-*** 5th STREET ***
-Dealt to 123smoothie [4c 3c] [9s]
-Dealt to gashpor [5d Qd] [Jd]
-Dealt to s0rrow [7c 3s 5h Qc] [Kc]
-Dealt to Soroka69 [7d 5s] [5c]
-Dealt to rdiezchang [Ad Js] [Ts]
-LainaRahat joins the table at seat #4 
-Soroka69: checks 
-rdiezchang: checks 
-123smoothie: checks 
-gashpor: bets $0.08
-s0rrow: calls $0.08
-Soroka69: calls $0.08
-rdiezchang: folds 
-123smoothie: folds 
-*** 6th STREET ***
-Dealt to gashpor [5d Qd Jd] [9d]
-Dealt to s0rrow [7c 3s 5h Qc Kc] [6d]
-Dealt to Soroka69 [7d 5s 5c] [2s]
-Soroka69: checks 
-gashpor: bets $0.08
-s0rrow: calls $0.08
-Soroka69: calls $0.08
-*** RIVER ***
-Dealt to s0rrow [7c 3s 5h Qc Kc 6d] [4d]
-Soroka69: checks 
-gashpor: bets $0.08
-s0rrow: calls $0.08
-Soroka69: folds 
-*** SHOW DOWN ***
-gashpor: shows [4h 3d 5d Qd Jd 9d 6h] (HI: a flush, Queen high)
-s0rrow: shows [7c 3s 5h Qc Kc 6d 4d] (HI: a straight, Three to Seven; LO: 7,6,5,4,3)
-gashpor collected $0.40 from pot
-s0rrow collected $0.40 from pot
-*** SUMMARY ***
-Total pot $0.84 | Rake $0.04 
-Seat 1: u.pressure folded on the 3rd Street (didn't bet)
-Seat 2: 123smoothie folded on the 5th Street
-Seat 3: gashpor showed [4h 3d 5d Qd Jd 9d 6h] and won ($0.40) with HI: a flush, Queen high
-Seat 4: denny501 folded on the 4th Street
-Seat 5: s0rrow showed [7c 3s 5h Qc Kc 6d 4d] and won ($0.40) with HI: a straight, Three to Seven; LO: 7,6,5,4,3
-Seat 6: TomSludge folded on the 3rd Street (didn't bet)
-Seat 7: Soroka69 folded on the River
-Seat 8: rdiezchang folded on the 5th Street
-
-
-
+PokerStars Game #35874676388:  7 Card Stud Hi/Lo Limit ($0.04/$0.08 USD) - 2009/11/26 10:27:46 ET
+Table 'Dawn II' 8-max
+Seat 1: u.pressure ($11.17 in chips) 
+Seat 2: 123smoothie ($0.99 in chips) 
+Seat 3: gashpor ($1.40 in chips) 
+Seat 4: denny501 ($0.71 in chips) 
+Seat 5: s0rrow ($1.52 in chips) 
+Seat 6: TomSludge ($1.58 in chips) 
+Seat 7: Soroka69 ($0.83 in chips) 
+Seat 8: rdiezchang ($2.05 in chips) 
+u.pressure: posts the ante $0.01
+123smoothie: posts the ante $0.01
+gashpor: posts the ante $0.01
+denny501: posts the ante $0.01
+s0rrow: posts the ante $0.01
+TomSludge: posts the ante $0.01
+Soroka69: posts the ante $0.01
+rdiezchang: posts the ante $0.01
+*** 3rd STREET ***
+Dealt to u.pressure [Td]
+Dealt to 123smoothie [4c]
+Dealt to gashpor [5d]
+Dealt to denny501 [2c]
+Dealt to s0rrow [7c 3s 5h]
+Dealt to TomSludge [8s]
+Dealt to Soroka69 [7d]
+Dealt to rdiezchang [Ad]
+denny501: brings in for $0.02
+s0rrow: calls $0.02
+TomSludge: folds 
+Soroka69: calls $0.02
+rdiezchang: calls $0.02
+u.pressure: folds 
+123smoothie: calls $0.02
+gashpor: calls $0.02
+*** 4th STREET ***
+Dealt to 123smoothie [4c] [3c]
+Dealt to gashpor [5d] [Qd]
+Dealt to denny501 [2c] [7s]
+Dealt to s0rrow [7c 3s 5h] [Qc]
+Dealt to Soroka69 [7d] [5s]
+Dealt to rdiezchang [Ad] [Js]
+rdiezchang: checks 
+123smoothie: checks 
+gashpor: checks 
+denny501: folds 
+denny501 leaves the table
+s0rrow: checks 
+Soroka69: checks 
+*** 5th STREET ***
+Dealt to 123smoothie [4c 3c] [9s]
+Dealt to gashpor [5d Qd] [Jd]
+Dealt to s0rrow [7c 3s 5h Qc] [Kc]
+Dealt to Soroka69 [7d 5s] [5c]
+Dealt to rdiezchang [Ad Js] [Ts]
+LainaRahat joins the table at seat #4 
+Soroka69: checks 
+rdiezchang: checks 
+123smoothie: checks 
+gashpor: bets $0.08
+s0rrow: calls $0.08
+Soroka69: calls $0.08
+rdiezchang: folds 
+123smoothie: folds 
+*** 6th STREET ***
+Dealt to gashpor [5d Qd Jd] [9d]
+Dealt to s0rrow [7c 3s 5h Qc Kc] [6d]
+Dealt to Soroka69 [7d 5s 5c] [2s]
+Soroka69: checks 
+gashpor: bets $0.08
+s0rrow: calls $0.08
+Soroka69: calls $0.08
+*** RIVER ***
+Dealt to s0rrow [7c 3s 5h Qc Kc 6d] [4d]
+Soroka69: checks 
+gashpor: bets $0.08
+s0rrow: calls $0.08
+Soroka69: folds 
+*** SHOW DOWN ***
+gashpor: shows [4h 3d 5d Qd Jd 9d 6h] (HI: a flush, Queen high)
+s0rrow: shows [7c 3s 5h Qc Kc 6d 4d] (HI: a straight, Three to Seven; LO: 7,6,5,4,3)
+gashpor collected $0.40 from pot
+s0rrow collected $0.40 from pot
+*** SUMMARY ***
+Total pot $0.84 | Rake $0.04 
+Seat 1: u.pressure folded on the 3rd Street (didn't bet)
+Seat 2: 123smoothie folded on the 5th Street
+Seat 3: gashpor showed [4h 3d 5d Qd Jd 9d 6h] and won ($0.40) with HI: a flush, Queen high
+Seat 4: denny501 folded on the 4th Street
+Seat 5: s0rrow showed [7c 3s 5h Qc Kc 6d 4d] and won ($0.40) with HI: a straight, Three to Seven; LO: 7,6,5,4,3
+Seat 6: TomSludge folded on the 3rd Street (didn't bet)
+Seat 7: Soroka69 folded on the River
+Seat 8: rdiezchang folded on the 5th Street
+
+
+
diff --git a/pyfpdb/test1.py b/pyfpdb/test1.py
index 76bde20e..4f220935 100755
--- a/pyfpdb/test1.py
+++ b/pyfpdb/test1.py
@@ -1,29 +1,29 @@
-#!/usr/bin/env python
-"""test1.py
-
-Test if python is working.
-"""
-#    Copyright 2008, Ray E. Barker
-#    
-#    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 of the License, or
-#    (at your option) any later version.
-#    
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#    GNU General Public License for more details.
-#    
-#    You should have received a copy of the GNU General Public License
-#    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-########################################################################
-
-import sys
-
-print "\npython is working!"
-print "\npress return to finish"
-
-sys.stdin.readline()
+#!/usr/bin/env python
+"""test1.py
+
+Test if python is working.
+"""
+#    Copyright 2008, Ray E. Barker
+#    
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#    
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#    GNU General Public License for more details.
+#    
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+########################################################################
+
+import sys
+
+print "\npython is working!"
+print "\npress return to finish"
+
+sys.stdin.readline()
diff --git a/pyfpdb/test2.py b/pyfpdb/test2.py
index c52d0a6c..74ce1e72 100755
--- a/pyfpdb/test2.py
+++ b/pyfpdb/test2.py
@@ -1,57 +1,57 @@
-#!/usr/bin/env python
-"""test2.py
-
-Test if gtk is working.
-"""
-#    Copyright 2008, Ray E. Barker
-#    
-#    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 of the License, or
-#    (at your option) any later version.
-#    
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#    GNU General Public License for more details.
-#    
-#    You should have received a copy of the GNU General Public License
-#    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-########################################################################
-
-import sys
-
-try:
-    import pygtk
-    pygtk.require('2.0')
-    import gtk
-
-
-    win = gtk.Window(gtk.WINDOW_TOPLEVEL)
-    win.set_title("Test GTK")
-    win.set_border_width(1)
-    win.set_default_size(600, 500)
-    win.set_resizable(True)
-    #win.show()
-
-    dia = gtk.Dialog("Test GTK",
-                     win,
-                     gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
-                     (gtk.STOCK_CLOSE, gtk.RESPONSE_OK))
-    dia.set_default_size(500, 300)
-
-    l = gtk.Label("GTK is working!")
-    dia.vbox.add(l)
-    l.show()
-
-    response = dia.run()
-    if response == gtk.RESPONSE_ACCEPT:
-        pass
-    dia.destroy()
-
-except:
-    print "\nError:", sys.exc_info()
-    print "\npress return to finish"
-    sys.stdin.readline()
+#!/usr/bin/env python
+"""test2.py
+
+Test if gtk is working.
+"""
+#    Copyright 2008, Ray E. Barker
+#    
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#    
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#    GNU General Public License for more details.
+#    
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+########################################################################
+
+import sys
+
+try:
+    import pygtk
+    pygtk.require('2.0')
+    import gtk
+
+
+    win = gtk.Window(gtk.WINDOW_TOPLEVEL)
+    win.set_title("Test GTK")
+    win.set_border_width(1)
+    win.set_default_size(600, 500)
+    win.set_resizable(True)
+    #win.show()
+
+    dia = gtk.Dialog("Test GTK",
+                     win,
+                     gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
+                     (gtk.STOCK_CLOSE, gtk.RESPONSE_OK))
+    dia.set_default_size(500, 300)
+
+    l = gtk.Label("GTK is working!")
+    dia.vbox.add(l)
+    l.show()
+
+    response = dia.run()
+    if response == gtk.RESPONSE_ACCEPT:
+        pass
+    dia.destroy()
+
+except:
+    print "\nError:", sys.exc_info()
+    print "\npress return to finish"
+    sys.stdin.readline()

From e915b0b62cb5abb920580f2cd379c9ca6b29d27d Mon Sep 17 00:00:00 2001
From: Mika Bostrom <bostik@odin.bostik.iki.fi>
Date: Thu, 21 Jan 2010 21:23:13 +0200
Subject: [PATCH 075/320] Allow to bypass codec

If the system (display) locale is UTF-8, there is no need to encode to
either direction. In fact, running the .encode() routine appears to
mangle a valid UTF-8 string to a worse condition, effectively breaking
it.
---
 pyfpdb/Charset.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pyfpdb/Charset.py b/pyfpdb/Charset.py
index 2c6f78c3..85cbd69a 100644
--- a/pyfpdb/Charset.py
+++ b/pyfpdb/Charset.py
@@ -24,11 +24,18 @@ import Configuration
 encoder_to_utf = codecs.lookup('utf-8')
 encoder_to_sys = codecs.lookup(Configuration.LOCALE_ENCODING)
 
+# I'm saving a few cycles with this one
+not_needed = False
+if Configuration.LOCALE_ENCODING == 'utf-8':
+    not_needed = True
+
 def to_utf8(s):
+    if not_needed: return s
     (_out, _len) = encoder_to_utf.encode(s)
     return _out
 
 def to_gui(s):
+    if not_needed: return s
     (_out, _len) = encoder_to_sys.encode(s)
     return _out
 

From a8416034600525aa3179c15c9835aaac08f5cb47 Mon Sep 17 00:00:00 2001
From: Mika Bostrom <bostik@odin.bostik.iki.fi>
Date: Thu, 21 Jan 2010 21:24:55 +0200
Subject: [PATCH 076/320] Some character set improvements

The strings (names) as stored in database should always be UTF-8;
whatever the display locale is, we then need to convert from the storage
encoding to session encoding. When making database queries with players
names in them, the names must be reconverted to UTF-8.
---
 pyfpdb/Database.py         |  7 +++++--
 pyfpdb/Filters.py          | 15 +++++++++++----
 pyfpdb/GuiGraphViewer.py   |  3 ++-
 pyfpdb/GuiPlayerStats.py   |  3 ++-
 pyfpdb/GuiSessionViewer.py |  6 +++++-
 pyfpdb/GuiTableViewer.py   |  3 ++-
 6 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index 72b41336..bf071782 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -48,6 +48,7 @@ import Configuration
 import SQL
 import Card
 import Tourney
+import Charset
 from Exceptions import *
 
 log = Configuration.get_logger("logging.conf")
@@ -602,7 +603,8 @@ class Database:
             
     def get_player_id(self, config, site, player_name):
         c = self.connection.cursor()
-        c.execute(self.sql.query['get_player_id'], (player_name, site))
+        p_name = Charset.to_utf8(player_name)
+        c.execute(self.sql.query['get_player_id'], (p_name, site))
         row = c.fetchone()
         if row:
             return row[0]
@@ -615,7 +617,8 @@ class Database:
         if site_id is None:
             site_id = -1
         c = self.get_cursor()
-        c.execute(self.sql.query['get_player_names'], (like_player_name, site_id, site_id))
+        p_name = Charset.to_utf8(like_player_name)
+        c.execute(self.sql.query['get_player_names'], (p_name, site_id, site_id))
         rows = c.fetchall()
         return rows
             
diff --git a/pyfpdb/Filters.py b/pyfpdb/Filters.py
index dc2e4859..3a25c1f1 100644
--- a/pyfpdb/Filters.py
+++ b/pyfpdb/Filters.py
@@ -29,6 +29,7 @@ import gobject
 import Configuration
 import fpdb_db
 import FpdbSQLQueries
+import Charset
 
 class Filters(threading.Thread):
     def __init__(self, db, config, qdict, display = {}, debug=True):
@@ -238,6 +239,7 @@ class Filters(threading.Thread):
         print "DEBUG: %s was toggled %s" % (data, ("OFF", "ON")[widget.get_active()])
 
     def createPlayerLine(self, hbox, site, player):
+        print 'DEBUG :: add:"%s"' % player
         label = gtk.Label(site +" id:")
         hbox.pack_start(label, False, False, 0)
 
@@ -254,13 +256,17 @@ class Filters(threading.Thread):
         completion.set_model(liststore)
         completion.set_text_column(0)
         names = self.db.get_player_names(self.conf)  # (config=self.conf, site_id=None, like_player_name="%")
-        for n in names:
-            liststore.append(n)
+        for n in names: # list of single-element "tuples"
+            _n = Charset.to_gui(n[0])
+            _nt = (_n, )
+            liststore.append(_nt)
 
         self.__set_hero_name(pname, site)
 
     def __set_hero_name(self, w, site):
-        self.heroes[site] = w.get_text()
+        _name = w.get_text()
+        _guiname = Charset.to_gui(_name)
+        self.heroes[site] = _guiname
 #        print "DEBUG: setting heroes[%s]: %s"%(site, self.heroes[site])
 
     def __set_num_hands(self, w, val):
@@ -417,7 +423,8 @@ class Filters(threading.Thread):
             vbox.pack_start(hBox, False, True, 0)
 
             player = self.conf.supported_sites[site].screen_name
-            self.createPlayerLine(hBox, site, player)
+            _pname = Charset.to_gui(player)
+            self.createPlayerLine(hBox, site, _pname)
 
         if "GroupsAll" in display and display["GroupsAll"] == True:
             hbox = gtk.HBox(False, 0)
diff --git a/pyfpdb/GuiGraphViewer.py b/pyfpdb/GuiGraphViewer.py
index 9daa940f..4534920a 100644
--- a/pyfpdb/GuiGraphViewer.py
+++ b/pyfpdb/GuiGraphViewer.py
@@ -145,7 +145,8 @@ class GuiGraphViewer (threading.Thread):
                 if sites[site] == True:
                     sitenos.append(siteids[site])
                     c = self.db.get_cursor()
-                    c.execute(self.sql.query['getPlayerId'], (heroes[site],))
+                    _hname = Charset.to_utf8(heroes[site])
+                    c.execute(self.sql.query['getPlayerId'], (_hname,))
                     result = c.fetchall()
                     if len(result) == 1:
                         playerids.append( int(result[0][0]) )
diff --git a/pyfpdb/GuiPlayerStats.py b/pyfpdb/GuiPlayerStats.py
index 889988c5..140ed30b 100644
--- a/pyfpdb/GuiPlayerStats.py
+++ b/pyfpdb/GuiPlayerStats.py
@@ -189,7 +189,8 @@ class GuiPlayerStats (threading.Thread):
                 sitenos.append(siteids[site])
                 # Nasty hack to deal with multiple sites + same player name -Eric
                 que = self.sql.query['getPlayerId'] + " AND siteId=%d" % siteids[site]
-                self.cursor.execute(que, (heroes[site],))
+                _hname = Charset.to_utf8(heroes[site])
+                self.cursor.execute(que, (_hname,))
                 result = self.db.cursor.fetchall()
                 if len(result) == 1:
                     playerids.append(result[0][0])
diff --git a/pyfpdb/GuiSessionViewer.py b/pyfpdb/GuiSessionViewer.py
index d8cd7042..b5ca0867 100755
--- a/pyfpdb/GuiSessionViewer.py
+++ b/pyfpdb/GuiSessionViewer.py
@@ -47,6 +47,7 @@ import fpdb_import
 import Database
 import Filters
 import FpdbSQLQueries
+import Charset
 
 class GuiSessionViewer (threading.Thread):
     def __init__(self, config, querylist, mainwin, debug=True):
@@ -181,7 +182,10 @@ class GuiSessionViewer (threading.Thread):
         for site in sites:
             if sites[site] == True:
                 sitenos.append(siteids[site])
-                self.cursor.execute(self.sql.query['getPlayerId'], (heroes[site],))
+                _q = self.sql.query['getPlayerId']
+                _name = Charset.to_utf8(heroes[site])
+                print 'DEBUG(_name) :: %s' % _name
+                self.cursor.execute(_q, (_name,)) # arg = tuple
                 result = self.db.cursor.fetchall()
                 if len(result) == 1:
                     playerids.append(result[0][0])
diff --git a/pyfpdb/GuiTableViewer.py b/pyfpdb/GuiTableViewer.py
index c730f962..c5b843f1 100644
--- a/pyfpdb/GuiTableViewer.py
+++ b/pyfpdb/GuiTableViewer.py
@@ -80,7 +80,8 @@ class GuiTableViewer (threading.Thread):
         #then the data rows
         for player in range(len(self.player_names)):
             tmp=[]
-            tmp.append(self.player_names[player][0])
+            p_name = Charset.to_gui(self.player_names[player][0])
+            tmp.append(p_name)
             
             seatCount=len(self.player_names)
             if seatCount>=8:

From dda00b6b10ff4dcc32b22b24853e9e973f5e38cc Mon Sep 17 00:00:00 2001
From: Mika Bostrom <bostik@odin.bostik.iki.fi>
Date: Thu, 21 Jan 2010 21:31:19 +0200
Subject: [PATCH 077/320] Catch character encoding errors

---
 pyfpdb/Charset.py | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pyfpdb/Charset.py b/pyfpdb/Charset.py
index 85cbd69a..69511cdd 100644
--- a/pyfpdb/Charset.py
+++ b/pyfpdb/Charset.py
@@ -31,11 +31,21 @@ if Configuration.LOCALE_ENCODING == 'utf-8':
 
 def to_utf8(s):
     if not_needed: return s
-    (_out, _len) = encoder_to_utf.encode(s)
-    return _out
+
+    try:
+        (_out, _len) = encoder_to_utf.encode(s)
+        return _out
+    except UnicodeDecodeError:
+        print 'Could not convert: "%s"' % s
+        raise
 
 def to_gui(s):
     if not_needed: return s
-    (_out, _len) = encoder_to_sys.encode(s)
-    return _out
+
+    try:
+        (_out, _len) = encoder_to_sys.encode(s)
+        return _out
+    except UnicodeDecodeError:
+        print 'Could not convert: "%s"' % s
+        raise
 

From 04c345ae1f213c26ae50d56bdda11f372fa191be Mon Sep 17 00:00:00 2001
From: Mika Bostrom <bostik@odin.bostik.iki.fi>
Date: Thu, 21 Jan 2010 21:46:14 +0200
Subject: [PATCH 078/320] Use a different "unicoder" for db strings

It seems that running encoder.encode() on a latin1/latin9 string results
in, yes a bloody UnicodeDecodeError. Decode error on .encode()...
Really. This way the modification from non-unicode string to real
unicode appears to work better.
---
 pyfpdb/Charset.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/Charset.py b/pyfpdb/Charset.py
index 69511cdd..f8043876 100644
--- a/pyfpdb/Charset.py
+++ b/pyfpdb/Charset.py
@@ -33,7 +33,8 @@ def to_utf8(s):
     if not_needed: return s
 
     try:
-        (_out, _len) = encoder_to_utf.encode(s)
+        #(_out, _len) = encoder_to_utf.encode(s)
+        _out = unicode(s, Configuration.LOCALE_ENCODING).encode('utf-8')
         return _out
     except UnicodeDecodeError:
         print 'Could not convert: "%s"' % s

From 29d5204bee45b8f1a5ee9093943d6c29d2af5395 Mon Sep 17 00:00:00 2001
From: Mika Bostrom <bostik@odin.bostik.iki.fi>
Date: Thu, 21 Jan 2010 21:52:22 +0200
Subject: [PATCH 079/320] Add missing import

GuiPlayerStats.py didn't import the new Charset module but tried to use
the functions.
---
 pyfpdb/GuiPlayerStats.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyfpdb/GuiPlayerStats.py b/pyfpdb/GuiPlayerStats.py
index 140ed30b..a528e784 100644
--- a/pyfpdb/GuiPlayerStats.py
+++ b/pyfpdb/GuiPlayerStats.py
@@ -29,6 +29,7 @@ import fpdb_import
 import Database
 import fpdb_db
 import Filters
+import Charset
 
 colalias,colshow,colheading,colxalign,colformat,coltype = 0,1,2,3,4,5
 ranks = {'x':0, '2':2, '3':3, '4':4, '5':5, '6':6, '7':7, '8':8, '9':9, 'T':10, 'J':11, 'Q':12, 'K':13, 'A':14}

From 91cd2d25998516249259b67d75a3e8c8416fa5fd Mon Sep 17 00:00:00 2001
From: Mika Bostrom <bostik@odin.bostik.iki.fi>
Date: Thu, 21 Jan 2010 22:05:24 +0200
Subject: [PATCH 080/320] Remove erroneous encoding

This string should not be encoded, it seems.
---
 pyfpdb/Database.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index d5eadf7a..3bcb99a3 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -605,8 +605,7 @@ class Database:
             
     def get_player_id(self, config, site, player_name):
         c = self.connection.cursor()
-        p_name = Charset.to_utf8(player_name)
-        c.execute(self.sql.query['get_player_id'], (p_name, site))
+        c.execute(self.sql.query['get_player_id'], (player_name, site))
         row = c.fetchone()
         if row:
             return row[0]

From 4ada389f869e1bc8e4cfd24e413013c47bc407e3 Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Thu, 21 Jan 2010 21:14:49 +0100
Subject: [PATCH 081/320] Changed the card positions and mucked card positions
 to relative positions.

---
 pyfpdb/Hud.py    | 20 +++++++++++++++-----
 pyfpdb/Mucked.py | 21 +++++++++++++--------
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/pyfpdb/Hud.py b/pyfpdb/Hud.py
index 1a27b682..ada7b316 100644
--- a/pyfpdb/Hud.py
+++ b/pyfpdb/Hud.py
@@ -457,7 +457,9 @@ class Hud:
                 # TODO: is stat_windows getting converted somewhere from a list to a dict, for no good reason?
                 for i, w in enumerate(self.stat_windows.itervalues()):
                     (x, y) = loc[adj[i+1]]
-                    w.relocate(x, y)
+                    px = int(x * self.table.width  / 1000)
+                    py = int(y * self.table.height / 1000)
+                    w.relocate(px, py)
 
                 # While we're at it, fix the positions of mucked cards too
                 for aux in self.aux_windows:
@@ -507,9 +509,11 @@ class Hud:
 
     def save_layout(self, *args):
         new_layout = [(0, 0)] * self.max
+        width = self.table.width
+        height = self.table.height
         for sw in self.stat_windows:
-            loc = self.stat_windows[sw].window.get_position()
-            new_loc = (loc[0] - self.table.x, loc[1] - self.table.y)
+            (x,y) = self.stat_windows[sw].window.get_position()
+            new_loc = (int((x - self.table.x)*1000/width), int((y - self.table.y)*1000/height))
             new_layout[self.stat_windows[sw].adj - 1] = new_loc
         self.config.edit_layout(self.table.site, self.max, locations = new_layout)
 #    ask each aux to save its layout back to the config object
@@ -571,16 +575,22 @@ class Hud:
             loc = self.config.get_locations(self.table.site, 9)
 
 #    create the stat windows
+#    get the width and height of the client window
+#    The x and Y positions are now made relative.
+        
         for i in xrange(1, self.max + 1):
             (x, y) = loc[adj[i]]
+            px = int(x * self.table.width  / 1000)
+            py = int(y * self.table.height / 1000)
             if i in self.stat_windows:
                 self.stat_windows[i].relocate(x, y)
+                self.stat_windows[i].relocate(px, py)
             else:
                 self.stat_windows[i] = Stat_Window(game = config.supported_games[self.poker_game],
                                                parent = self,
                                                table = self.table,
-                                               x = x,
-                                               y = y,
+                                               x = px,
+                                               y = py,
                                                seat = i,
                                                adj = adj[i],
                                                player_id = 'fake',
diff --git a/pyfpdb/Mucked.py b/pyfpdb/Mucked.py
index dd424e63..d4c7d688 100755
--- a/pyfpdb/Mucked.py
+++ b/pyfpdb/Mucked.py
@@ -357,21 +357,24 @@ class Aux_Seats(Aux_Window):
         except AttributeError:
             return
         loc = self.config.get_aux_locations(self.params['name'], int(self.hud.max))
+        width = self.hud.table.width
+        height = self.hud.table.height
+
         for i in (range(1, self.hud.max + 1) + ['common']):
             if i == 'common':
                 (x, y) = self.params['layout'][self.hud.max].common
             else:
                 (x, y) = loc[adj[i]]
-            self.positions[i] = self.card_positions(x, self.hud.table.x, y, self.hud.table.y)
+            self.positions[i] = self.card_positions((x * width) / 1000, self.hud.table.x, (y * height) /1000, self.hud.table.y)       
             self.m_windows[i].move(self.positions[i][0], self.positions[i][1])
 
-
     def create(self):
         self.adj = self.hud.adj_seats(0, self.config)  # move adj_seats to aux and get rid of it in Hud.py
         loc = self.config.get_aux_locations(self.params['name'], int(self.hud.max))
         
         self.m_windows = {}      # windows to put the card images in
-
+        width = self.hud.table.width
+        height = self.hud.table.height
         for i in (range(1, self.hud.max + 1) + ['common']):           
             if i == 'common':
                 (x, y) = self.params['layout'][self.hud.max].common
@@ -383,7 +386,7 @@ class Aux_Seats(Aux_Window):
             self.m_windows[i].set_transient_for(self.hud.main_window)
             self.m_windows[i].set_focus_on_map(False)
             self.m_windows[i].connect("configure_event", self.configure_event_cb, i)
-            self.positions[i] = self.card_positions(x, self.hud.table.x, y, self.hud.table.y)
+            self.positions[i] = self.card_positions((x * width) / 1000, self.hud.table.x, (y * height) /1000, self.hud.table.y)
             self.m_windows[i].move(self.positions[i][0], self.positions[i][1])
             if self.params.has_key('opacity'):
                 self.m_windows[i].set_opacity(float(self.params['opacity']))
@@ -425,11 +428,13 @@ class Aux_Seats(Aux_Window):
         """Save new layout back to the aux element in the config file."""
         new_locs = {}
 #        print "adj =", self.adj
+        witdh = self.hud.table.width
+        height = self.hud.table.height
         for (i, pos) in self.positions.iteritems():
-            if i != 'common':
-                new_locs[self.adj[int(i)]] = (pos[0] - self.hud.table.x, pos[1] - self.hud.table.y)
-            else:
-                new_locs[i] = (pos[0] - self.hud.table.x, pos[1] - self.hud.table.y)
+             if i != 'common':
+                new_locs[self.adj[int(i)]] = ((pos[0] - self.hud.table.x) * 1000 / witdh, (pos[1] - self.hud.table.y) * 1000 / height)
+             else:
+                new_locs[i] = ((pos[0] - self.hud.table.x) * 1000 / witdh, (pos[1] - self.hud.table.y) * 1000 / height)
         self.config.edit_aux_layout(self.params['name'], self.hud.max, locations = new_locs)
 
     def configure_event_cb(self, widget, event, i, *args):

From 8b012a3af324c0df98442e8dc76c15143d9bbead Mon Sep 17 00:00:00 2001
From: Mika Bostrom <bostik@odin.bostik.iki.fi>
Date: Fri, 22 Jan 2010 09:27:09 +0200
Subject: [PATCH 082/320] Update debian/changelog for snapshot

---
 packaging/debian/changelog | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index ec66f4a7..4bacf635 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -1,8 +1,8 @@
-free-poker-tools (0.12-1) unstable; urgency=low
+free-poker-tools (0.12~git20100122) unstable; urgency=low
 
-  * New release
+  * New snapshot release with reworked import code
 
- -- Mika Bostrom <bostik+fpdb@bostik.iki.fi>  Mon, 26 Oct 2009 17:49:07 +0200
+ -- Mika Bostrom <bostik+fpdb@bostik.iki.fi>  Fri, 22 Jan 2010 09:25:27 +0200
 
 free-poker-tools (0.11.3+git20091023) unstable; urgency=low
 

From fdc5a0a635f5ba31a257b830d6b06e023c6e5989 Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Fri, 22 Jan 2010 15:38:33 +0100
Subject: [PATCH 083/320] Added close on double click for a stat window Just in
 case you don't have a mouse with middle button

---
 pyfpdb/Hud.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pyfpdb/Hud.py b/pyfpdb/Hud.py
index ada7b316..ec2e4ac3 100644
--- a/pyfpdb/Hud.py
+++ b/pyfpdb/Hud.py
@@ -575,15 +575,14 @@ class Hud:
             loc = self.config.get_locations(self.table.site, 9)
 
 #    create the stat windows
-#    get the width and height of the client window
-#    The x and Y positions are now made relative.
+        # get the width and height of the client window
+        # The x and Y positions are now made relative.
         
         for i in xrange(1, self.max + 1):
             (x, y) = loc[adj[i]]
             px = int(x * self.table.width  / 1000)
             py = int(y * self.table.height / 1000)
             if i in self.stat_windows:
-                self.stat_windows[i].relocate(x, y)
                 self.stat_windows[i].relocate(px, py)
             else:
                 self.stat_windows[i] = Stat_Window(game = config.supported_games[self.poker_game],
@@ -686,6 +685,9 @@ class Stat_Window:
             return True
 
         if event.button == 1:   # left button event
+            if event.type == gtk.gdk._2BUTTON_PRESS:
+            	self.window.hide()
+            	return True
             # TODO: make position saving save sizes as well?
             if event.state & gtk.gdk.SHIFT_MASK:
                 self.window.begin_resize_drag(gtk.gdk.WINDOW_EDGE_SOUTH_EAST, event.button, int(event.x_root), int(event.y_root), event.time)

From 261daf600391617e66ea7201faa594d3f39c0a63 Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Fri, 22 Jan 2010 18:36:21 +0100
Subject: [PATCH 084/320] game selector for graphs added. exception caught for
 games selector for player stats

---
 pyfpdb/GuiGraphViewer.py | 22 ++++++++++++++++++++--
 pyfpdb/GuiPlayerStats.py | 13 ++++++++-----
 pyfpdb/SQL.py            |  1 +
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/pyfpdb/GuiGraphViewer.py b/pyfpdb/GuiGraphViewer.py
index 9daa940f..0b2d20cd 100644
--- a/pyfpdb/GuiGraphViewer.py
+++ b/pyfpdb/GuiGraphViewer.py
@@ -137,6 +137,8 @@ class GuiGraphViewer (threading.Thread):
             heroes  = self.filters.getHeroes()
             siteids = self.filters.getSiteIds()
             limits  = self.filters.getLimits()
+            games   = self.filters.getGames()
+            
             for i in ('show', 'none'):
                 if i in limits:
                     limits.remove(i)
@@ -171,7 +173,7 @@ class GuiGraphViewer (threading.Thread):
 
             #Get graph data from DB
             starttime = time()
-            (green, blue, red) = self.getRingProfitGraph(playerids, sitenos, limits)
+            (green, blue, red) = self.getRingProfitGraph(playerids, sitenos, limits, games)
             print "Graph generated in: %s" %(time() - starttime)
 
             self.ax.set_title("Profit graph for ring games")
@@ -212,7 +214,7 @@ class GuiGraphViewer (threading.Thread):
 
     #end of def showClicked
 
-    def getRingProfitGraph(self, names, sites, limits):
+    def getRingProfitGraph(self, names, sites, limits, games):
         tmp = self.sql.query['getRingProfitAllHandsPlayerIdSite']
 #        print "DEBUG: getRingProfitGraph"
         start_date, end_date = self.filters.getDates()
@@ -224,6 +226,22 @@ class GuiGraphViewer (threading.Thread):
         sitetest = str(tuple(sites))
         #nametest = nametest.replace("L", "")
 
+        q = []
+        for m in self.filters.display.items():
+            if m[0] == 'Games' and m[1]:
+                for n in games:
+                    if games[n]:
+                        q.append(n)
+                if len(q) > 0:
+                    gametest = str(tuple(q))
+                    gametest = gametest.replace("L", "")
+                    gametest = gametest.replace(",)",")")
+                    gametest = gametest.replace("u'","'")
+                    gametest = "and gt.category in %s" % gametest
+                else:
+                    gametest = "and gt.category IS NULL"
+        tmp = tmp.replace("<game_test>", gametest)
+        
         lims = [int(x) for x in limits if x.isdigit()]
         potlims = [int(x[0:-2]) for x in limits if len(x) > 2 and x[-2:] == 'pl']
         nolims = [int(x[0:-2]) for x in limits if len(x) > 2 and x[-2:] == 'nl']
diff --git a/pyfpdb/GuiPlayerStats.py b/pyfpdb/GuiPlayerStats.py
index 1da08fbc..e842b301 100644
--- a/pyfpdb/GuiPlayerStats.py
+++ b/pyfpdb/GuiPlayerStats.py
@@ -474,11 +474,14 @@ class GuiPlayerStats (threading.Thread):
                 for n in games:
                     if games[n]:
                         q.append(n)
-                gametest = str(tuple(q))
-                gametest = gametest.replace("L", "")
-                gametest = gametest.replace(",)",")")
-                gametest = gametest.replace("u'","'")
-                gametest = "and gt.category in %s" % gametest
+                if len(q) > 0:
+                    gametest = str(tuple(q))
+                    gametest = gametest.replace("L", "")
+                    gametest = gametest.replace(",)",")")
+                    gametest = gametest.replace("u'","'")
+                    gametest = "and gt.category in %s" % gametest
+                else:
+                    gametest = "and gt.category IS NULL"
         query = query.replace("<game_test>", gametest)
 
         if seats:
diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py
index c377c7b6..5913c624 100644
--- a/pyfpdb/SQL.py
+++ b/pyfpdb/SQL.py
@@ -2576,6 +2576,7 @@ class Sql:
             AND   h.handStart > '<startdate_test>'
             AND   h.handStart < '<enddate_test>'
             <limit_test>
+            <game_test>
             AND   hp.tourneysPlayersId IS NULL
             GROUP BY h.handStart, hp.handId, hp.sawShowdown, hp.totalProfit
             ORDER BY h.handStart"""

From c88ccd11409a6613adc6a2f02a4ab5b00b080848 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sat, 23 Jan 2010 02:18:20 +0800
Subject: [PATCH 085/320] Remove unused convert_cards()

---
 pyfpdb/Database.py | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index c7b3e3b8..5f3c7c34 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -359,28 +359,6 @@ class Database:
         cards['common'] = c.fetchone()
         return cards
 
-    def convert_cards(self, d):
-        ranks = ('', '', '2', '3', '4', '5', '6', '7', '8', '9', 'T', 'J', 'Q', 'K', 'A')
-        cards = ""
-        for i in xrange(1, 8):
-#            key = 'card' + str(i) + 'Value'
-#            if not d.has_key(key): continue
-#            if d[key] == None:
-#                break
-#            elif d[key] == 0:
-#                cards += "xx"
-#            else:
-#                cards += ranks[d['card' + str(i) + 'Value']] + d['card' +str(i) + 'Suit']
-            cv = "card%dvalue" % i
-            if cv not in d or d[cv] is None:
-                break
-            elif d[cv] == 0:
-                cards += "xx"
-            else:
-                cs = "card%dsuit" % i
-                cards = "%s%s%s" % (cards, ranks[d[cv]], d[cs])
-        return cards
-
     def get_action_from_hand(self, hand_no):
         action = [ [], [], [], [], [] ]
         c = self.connection.cursor()

From 3cd51ca99010d70010ae1e2b8fc11c9e78464165 Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Fri, 22 Jan 2010 23:42:44 +0100
Subject: [PATCH 086/320] Added freeroll support for Pokerstars

---
 pyfpdb/PokerStarsToFpdb.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
index 09bd0390..03c70845 100755
--- a/pyfpdb/PokerStarsToFpdb.py
+++ b/pyfpdb/PokerStarsToFpdb.py
@@ -46,9 +46,9 @@ class PokerStars(HandHistoryConverter):
           PokerStars\sGame\s\#(?P<HID>[0-9]+):\s+
           (Tournament\s\#                # open paren of tournament info
           (?P<TOURNO>\d+),\s
-          (?P<BUYIN>[%(LS)s\+\d\.]+      # here's how I plan to use LS
-          \s?(?P<TOUR_ISO>%(LEGAL_ISO)s)?
-          )\s)?                          # close paren of tournament info
+          # here's how I plan to use LS
+          (?P<BUYIN>([%(LS)s\+\d\.]+\s?(?P<TOUR_ISO>%(LEGAL_ISO)s)?)|Freeroll)\s+)?                          
+          # close paren of tournament info
           (?P<MIXED>HORSE|8\-Game|HOSE)?\s?\(?
           (?P<GAME>Hold\'em|Razz|7\sCard\sStud|7\sCard\sStud\sHi/Lo|Omaha|Omaha\sHi/Lo|Badugi|Triple\sDraw\s2\-7\sLowball|5\sCard\sDraw)\s
           (?P<LIMIT>No\sLimit|Limit|Pot\sLimit)\)?,?\s
@@ -205,9 +205,12 @@ class PokerStars(HandHistoryConverter):
             if key == 'TOURNO':
                 hand.tourNo = info[key]
             if key == 'BUYIN':
-                #FIXME: The key looks like: '€0.82+€0.18 EUR'
-                #       This should be parsed properly and used
-                hand.buyin = info[key]
+                if info[key] == 'Freeroll':
+                    hand.buyin = '$0+$0'
+                else:
+                    #FIXME: The key looks like: '€0.82+€0.18 EUR'
+                    #       This should be parsed properly and used
+                    hand.buyin = info[key]
             if key == 'LEVEL':
                 hand.level = info[key]
 

From 29e705f3372248a84e94b76da50fbc59580e6f0f Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sat, 23 Jan 2010 13:37:41 +0800
Subject: [PATCH 087/320] Remove NEWIMPORT variable.

No going back now :)
---
 pyfpdb/Configuration.py        | 1 -
 pyfpdb/HandHistoryConverter.py | 3 +--
 pyfpdb/fpdb_import.py          | 4 +---
 pyfpdb/test_PokerStars.py      | 6 +-----
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py
index 39bf5921..abd5b016 100755
--- a/pyfpdb/Configuration.py
+++ b/pyfpdb/Configuration.py
@@ -126,7 +126,6 @@ DATABASE_TYPES = (
         DATABASE_TYPE_MYSQL,
         )
 
-NEWIMPORT = True
 LOCALE_ENCODING = locale.getdefaultlocale()[1]
 
 ########################################################################
diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index 47cfd302..c0374143 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -292,8 +292,7 @@ which it expects to find at self.re_TailSplitHands -- see for e.g. Everleaf.py.
             log.info("Unsupported game type: %s" % gametype)
 
         if hand:
-            if Configuration.NEWIMPORT == False:
-                hand.writeHand(self.out_fh)
+            #hand.writeHand(self.out_fh)
             return hand
         else:
             log.info("Unsupported game type: %s" % gametype)
diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index 7c240cbe..ec480831 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -98,8 +98,6 @@ class Importer:
         for i in xrange(self.settings['threads']):
             self.writerdbs.append( Database.Database(self.config, sql = self.sql) )
 
-        self.NEWIMPORT = Configuration.NEWIMPORT
-
         clock() # init clock in windows
 
     #Set functions
@@ -433,7 +431,7 @@ class Importer:
             else:
                 self.pos_in_file[file] = 0
             hhc = obj(in_path = file, out_path = out_path, index = idx, starsArchive = self.settings['starsArchive'])
-            if hhc.getStatus() and self.NEWIMPORT == True:
+            if hhc.getStatus():
                 handlist = hhc.getProcessedHands()
                 self.pos_in_file[file] = hhc.getLastCharacterRead()
                 to_hud = []
diff --git a/pyfpdb/test_PokerStars.py b/pyfpdb/test_PokerStars.py
index 72c9049c..4244f532 100644
--- a/pyfpdb/test_PokerStars.py
+++ b/pyfpdb/test_PokerStars.py
@@ -178,11 +178,7 @@ def testDrawImport():
         (stored, dups, partial, errs, ttime) = importer.runImport()
         importer.clearFileList()
     except FpdbError:
-        if Configuration.NEWIMPORT == False:
-            #Old import code doesn't support draw
-            pass
-        else:
-            assert 0 == 1
+        assert 0 == 1
 
     # Should actually do some testing here
     assert 1 == 1

From d3f17f3fb7031b5fc28b85a6ab231575a26f94f1 Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Fri, 22 Jan 2010 18:36:21 +0100
Subject: [PATCH 088/320] game selector for graphs added. exception caught for
 games selector for player stats

---
 pyfpdb/GuiGraphViewer.py | 22 ++++++++++++++++++++--
 pyfpdb/GuiPlayerStats.py | 13 ++++++++-----
 pyfpdb/SQL.py            |  1 +
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/pyfpdb/GuiGraphViewer.py b/pyfpdb/GuiGraphViewer.py
index 4534920a..56e41bdd 100644
--- a/pyfpdb/GuiGraphViewer.py
+++ b/pyfpdb/GuiGraphViewer.py
@@ -137,6 +137,8 @@ class GuiGraphViewer (threading.Thread):
             heroes  = self.filters.getHeroes()
             siteids = self.filters.getSiteIds()
             limits  = self.filters.getLimits()
+            games   = self.filters.getGames()
+            
             for i in ('show', 'none'):
                 if i in limits:
                     limits.remove(i)
@@ -172,7 +174,7 @@ class GuiGraphViewer (threading.Thread):
 
             #Get graph data from DB
             starttime = time()
-            (green, blue, red) = self.getRingProfitGraph(playerids, sitenos, limits)
+            (green, blue, red) = self.getRingProfitGraph(playerids, sitenos, limits, games)
             print "Graph generated in: %s" %(time() - starttime)
 
             self.ax.set_title("Profit graph for ring games")
@@ -213,7 +215,7 @@ class GuiGraphViewer (threading.Thread):
 
     #end of def showClicked
 
-    def getRingProfitGraph(self, names, sites, limits):
+    def getRingProfitGraph(self, names, sites, limits, games):
         tmp = self.sql.query['getRingProfitAllHandsPlayerIdSite']
 #        print "DEBUG: getRingProfitGraph"
         start_date, end_date = self.filters.getDates()
@@ -225,6 +227,22 @@ class GuiGraphViewer (threading.Thread):
         sitetest = str(tuple(sites))
         #nametest = nametest.replace("L", "")
 
+        q = []
+        for m in self.filters.display.items():
+            if m[0] == 'Games' and m[1]:
+                for n in games:
+                    if games[n]:
+                        q.append(n)
+                if len(q) > 0:
+                    gametest = str(tuple(q))
+                    gametest = gametest.replace("L", "")
+                    gametest = gametest.replace(",)",")")
+                    gametest = gametest.replace("u'","'")
+                    gametest = "and gt.category in %s" % gametest
+                else:
+                    gametest = "and gt.category IS NULL"
+        tmp = tmp.replace("<game_test>", gametest)
+        
         lims = [int(x) for x in limits if x.isdigit()]
         potlims = [int(x[0:-2]) for x in limits if len(x) > 2 and x[-2:] == 'pl']
         nolims = [int(x[0:-2]) for x in limits if len(x) > 2 and x[-2:] == 'nl']
diff --git a/pyfpdb/GuiPlayerStats.py b/pyfpdb/GuiPlayerStats.py
index 8aeff03d..7a3213e8 100644
--- a/pyfpdb/GuiPlayerStats.py
+++ b/pyfpdb/GuiPlayerStats.py
@@ -476,11 +476,14 @@ class GuiPlayerStats (threading.Thread):
                 for n in games:
                     if games[n]:
                         q.append(n)
-                gametest = str(tuple(q))
-                gametest = gametest.replace("L", "")
-                gametest = gametest.replace(",)",")")
-                gametest = gametest.replace("u'","'")
-                gametest = "and gt.category in %s" % gametest
+                if len(q) > 0:
+                    gametest = str(tuple(q))
+                    gametest = gametest.replace("L", "")
+                    gametest = gametest.replace(",)",")")
+                    gametest = gametest.replace("u'","'")
+                    gametest = "and gt.category in %s" % gametest
+                else:
+                    gametest = "and gt.category IS NULL"
         query = query.replace("<game_test>", gametest)
 
         if seats:
diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py
index c377c7b6..5913c624 100644
--- a/pyfpdb/SQL.py
+++ b/pyfpdb/SQL.py
@@ -2576,6 +2576,7 @@ class Sql:
             AND   h.handStart > '<startdate_test>'
             AND   h.handStart < '<enddate_test>'
             <limit_test>
+            <game_test>
             AND   hp.tourneysPlayersId IS NULL
             GROUP BY h.handStart, hp.handId, hp.sawShowdown, hp.totalProfit
             ORDER BY h.handStart"""

From 6b38976edc0a67d792e428c90211b7d0ff70584d Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sat, 23 Jan 2010 14:38:53 +0800
Subject: [PATCH 089/320] Add left-2click option to hide stat windows.

Gerko, so I assume others don't have a middle mouse button.
---
 pyfpdb/Hud.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pyfpdb/Hud.py b/pyfpdb/Hud.py
index 1a27b682..3ae2f661 100644
--- a/pyfpdb/Hud.py
+++ b/pyfpdb/Hud.py
@@ -676,6 +676,11 @@ class Stat_Window:
             return True
 
         if event.button == 1:   # left button event
+            # close on double click for a stat window
+            # for those that don't have a mouse with middle button
+            if event.type == gtk.gdk._2BUTTON_PRESS:
+                self.window.hide()
+                return True
             # TODO: make position saving save sizes as well?
             if event.state & gtk.gdk.SHIFT_MASK:
                 self.window.begin_resize_drag(gtk.gdk.WINDOW_EDGE_SOUTH_EAST, event.button, int(event.x_root), int(event.y_root), event.time)

From 74115dcd47c140096b996cff5211be084b4480c5 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sat, 23 Jan 2010 15:20:17 +0800
Subject: [PATCH 090/320] Fix comment layout - had a \t

---
 pyfpdb/Hand.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index a660b56d..0a0c7ead 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -192,7 +192,7 @@ dealt   whether they were seen in a 'dealt to' line
         self.holecards[street][player] = [open, closed]
 
     def prepInsert(self, db):
-	#####
+        #####
         # Players, Gametypes, TourneyTypes are all shared functions that are needed for additional tables
         # These functions are intended for prep insert eventually
         #####

From 2538f61906a817093cde4e37b75582448bde5805 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sat, 23 Jan 2010 15:22:22 +0800
Subject: [PATCH 091/320] Remove erronous comment

---
 pyfpdb/Hand.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 0a0c7ead..4bf3da8b 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -681,7 +681,6 @@ class HoldemOmahaHand(Hand):
 
     def join_holecards(self, player, asList=False):
         """With asList = True it returns the set cards for a player including down cards if they aren't know"""
-        # FIXME: This should actually return
         hcs = [u'0x', u'0x', u'0x', u'0x']
 
         for street in self.holeStreets:

From 9d6707f18f6a6b9aa721e4d6c1b898013111d629 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sat, 23 Jan 2010 15:30:48 +0800
Subject: [PATCH 092/320] Fix Charset import got Grapher

---
 pyfpdb/GuiGraphViewer.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyfpdb/GuiGraphViewer.py b/pyfpdb/GuiGraphViewer.py
index 56e41bdd..3351b70f 100644
--- a/pyfpdb/GuiGraphViewer.py
+++ b/pyfpdb/GuiGraphViewer.py
@@ -44,6 +44,7 @@ except ImportError, inst:
 import fpdb_import
 import Database
 import Filters
+import Charset
 
 class GuiGraphViewer (threading.Thread):
 

From 6fa3d693d9d90b74501f45a5219fddae702a1d05 Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Fri, 22 Jan 2010 18:36:21 +0100
Subject: [PATCH 093/320] game selector for graphs added. exception caught for
 games selector for player stats

---
 pyfpdb/GuiGraphViewer.py | 22 ++++++++++++++++++++--
 pyfpdb/GuiPlayerStats.py | 13 ++++++++-----
 pyfpdb/SQL.py            |  1 +
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/pyfpdb/GuiGraphViewer.py b/pyfpdb/GuiGraphViewer.py
index 9daa940f..0b2d20cd 100644
--- a/pyfpdb/GuiGraphViewer.py
+++ b/pyfpdb/GuiGraphViewer.py
@@ -137,6 +137,8 @@ class GuiGraphViewer (threading.Thread):
             heroes  = self.filters.getHeroes()
             siteids = self.filters.getSiteIds()
             limits  = self.filters.getLimits()
+            games   = self.filters.getGames()
+            
             for i in ('show', 'none'):
                 if i in limits:
                     limits.remove(i)
@@ -171,7 +173,7 @@ class GuiGraphViewer (threading.Thread):
 
             #Get graph data from DB
             starttime = time()
-            (green, blue, red) = self.getRingProfitGraph(playerids, sitenos, limits)
+            (green, blue, red) = self.getRingProfitGraph(playerids, sitenos, limits, games)
             print "Graph generated in: %s" %(time() - starttime)
 
             self.ax.set_title("Profit graph for ring games")
@@ -212,7 +214,7 @@ class GuiGraphViewer (threading.Thread):
 
     #end of def showClicked
 
-    def getRingProfitGraph(self, names, sites, limits):
+    def getRingProfitGraph(self, names, sites, limits, games):
         tmp = self.sql.query['getRingProfitAllHandsPlayerIdSite']
 #        print "DEBUG: getRingProfitGraph"
         start_date, end_date = self.filters.getDates()
@@ -224,6 +226,22 @@ class GuiGraphViewer (threading.Thread):
         sitetest = str(tuple(sites))
         #nametest = nametest.replace("L", "")
 
+        q = []
+        for m in self.filters.display.items():
+            if m[0] == 'Games' and m[1]:
+                for n in games:
+                    if games[n]:
+                        q.append(n)
+                if len(q) > 0:
+                    gametest = str(tuple(q))
+                    gametest = gametest.replace("L", "")
+                    gametest = gametest.replace(",)",")")
+                    gametest = gametest.replace("u'","'")
+                    gametest = "and gt.category in %s" % gametest
+                else:
+                    gametest = "and gt.category IS NULL"
+        tmp = tmp.replace("<game_test>", gametest)
+        
         lims = [int(x) for x in limits if x.isdigit()]
         potlims = [int(x[0:-2]) for x in limits if len(x) > 2 and x[-2:] == 'pl']
         nolims = [int(x[0:-2]) for x in limits if len(x) > 2 and x[-2:] == 'nl']
diff --git a/pyfpdb/GuiPlayerStats.py b/pyfpdb/GuiPlayerStats.py
index 1da08fbc..e842b301 100644
--- a/pyfpdb/GuiPlayerStats.py
+++ b/pyfpdb/GuiPlayerStats.py
@@ -474,11 +474,14 @@ class GuiPlayerStats (threading.Thread):
                 for n in games:
                     if games[n]:
                         q.append(n)
-                gametest = str(tuple(q))
-                gametest = gametest.replace("L", "")
-                gametest = gametest.replace(",)",")")
-                gametest = gametest.replace("u'","'")
-                gametest = "and gt.category in %s" % gametest
+                if len(q) > 0:
+                    gametest = str(tuple(q))
+                    gametest = gametest.replace("L", "")
+                    gametest = gametest.replace(",)",")")
+                    gametest = gametest.replace("u'","'")
+                    gametest = "and gt.category in %s" % gametest
+                else:
+                    gametest = "and gt.category IS NULL"
         query = query.replace("<game_test>", gametest)
 
         if seats:
diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py
index c377c7b6..5913c624 100644
--- a/pyfpdb/SQL.py
+++ b/pyfpdb/SQL.py
@@ -2576,6 +2576,7 @@ class Sql:
             AND   h.handStart > '<startdate_test>'
             AND   h.handStart < '<enddate_test>'
             <limit_test>
+            <game_test>
             AND   hp.tourneysPlayersId IS NULL
             GROUP BY h.handStart, hp.handId, hp.sawShowdown, hp.totalProfit
             ORDER BY h.handStart"""

From 562f21f548392991b702b62d75cda9493c48afb4 Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Fri, 22 Jan 2010 23:42:44 +0100
Subject: [PATCH 094/320] Added freeroll support for Pokerstars

---
 pyfpdb/PokerStarsToFpdb.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
index 09bd0390..03c70845 100755
--- a/pyfpdb/PokerStarsToFpdb.py
+++ b/pyfpdb/PokerStarsToFpdb.py
@@ -46,9 +46,9 @@ class PokerStars(HandHistoryConverter):
           PokerStars\sGame\s\#(?P<HID>[0-9]+):\s+
           (Tournament\s\#                # open paren of tournament info
           (?P<TOURNO>\d+),\s
-          (?P<BUYIN>[%(LS)s\+\d\.]+      # here's how I plan to use LS
-          \s?(?P<TOUR_ISO>%(LEGAL_ISO)s)?
-          )\s)?                          # close paren of tournament info
+          # here's how I plan to use LS
+          (?P<BUYIN>([%(LS)s\+\d\.]+\s?(?P<TOUR_ISO>%(LEGAL_ISO)s)?)|Freeroll)\s+)?                          
+          # close paren of tournament info
           (?P<MIXED>HORSE|8\-Game|HOSE)?\s?\(?
           (?P<GAME>Hold\'em|Razz|7\sCard\sStud|7\sCard\sStud\sHi/Lo|Omaha|Omaha\sHi/Lo|Badugi|Triple\sDraw\s2\-7\sLowball|5\sCard\sDraw)\s
           (?P<LIMIT>No\sLimit|Limit|Pot\sLimit)\)?,?\s
@@ -205,9 +205,12 @@ class PokerStars(HandHistoryConverter):
             if key == 'TOURNO':
                 hand.tourNo = info[key]
             if key == 'BUYIN':
-                #FIXME: The key looks like: '€0.82+€0.18 EUR'
-                #       This should be parsed properly and used
-                hand.buyin = info[key]
+                if info[key] == 'Freeroll':
+                    hand.buyin = '$0+$0'
+                else:
+                    #FIXME: The key looks like: '€0.82+€0.18 EUR'
+                    #       This should be parsed properly and used
+                    hand.buyin = info[key]
             if key == 'LEVEL':
                 hand.level = info[key]
 

From cd4513adf97802e4104b1bf07e1ff27e6386be63 Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Sat, 23 Jan 2010 09:50:40 +0100
Subject: [PATCH 095/320] Doulbe click for closing stat window added

---
 pyfpdb/Hud.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pyfpdb/Hud.py b/pyfpdb/Hud.py
index 1a27b682..46584aa3 100644
--- a/pyfpdb/Hud.py
+++ b/pyfpdb/Hud.py
@@ -676,6 +676,9 @@ class Stat_Window:
             return True
 
         if event.button == 1:   # left button event
+            if event.type == gtk.gdk._2BUTTON_PRESS:
+            	self.window.hide()
+            	return True
             # TODO: make position saving save sizes as well?
             if event.state & gtk.gdk.SHIFT_MASK:
                 self.window.begin_resize_drag(gtk.gdk.WINDOW_EDGE_SOUTH_EAST, event.button, int(event.x_root), int(event.y_root), event.time)

From 9100ba814cc4a3382a257ee662edaee19972725d Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Sat, 23 Jan 2010 10:01:36 +0100
Subject: [PATCH 096/320] All game selection boxes default enabled

---
 pyfpdb/Filters.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyfpdb/Filters.py b/pyfpdb/Filters.py
index 9ebeb0c5..83721ebc 100644
--- a/pyfpdb/Filters.py
+++ b/pyfpdb/Filters.py
@@ -284,6 +284,7 @@ class Filters(threading.Thread):
         cb = gtk.CheckButton(game)
         cb.connect('clicked', self.__set_game_select, game)
         hbox.pack_start(cb, False, False, 0)
+        cb.set_active(True)
 
     def createLimitLine(self, hbox, limit, ltext):
         cb = gtk.CheckButton(str(ltext))

From 6cb956c5fd6786e59c0087908fd036a4584f3725 Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Sat, 23 Jan 2010 11:17:14 +0100
Subject: [PATCH 097/320] HUD fix for tournaments. Table name storage.

---
 pyfpdb/Hand.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index a660b56d..274a103d 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -617,6 +617,8 @@ class HoldemOmahaHand(Hand):
         # which then invokes a 'addXXX' callback
         if builtFrom == "HHC":
             hhc.readHandInfo(self)
+            if self.gametype['type'] == 'tour':
+                self.tablename = "%s %s" % (self.tourNo, self.tablename)    
             hhc.readPlayerStacks(self)
             hhc.compilePlayerRegexs(self)
             hhc.markStreets(self)
@@ -912,6 +914,8 @@ class DrawHand(Hand):
         # Populate the draw hand.
         if builtFrom == "HHC":
             hhc.readHandInfo(self)
+            if self.gametype['type'] == 'tour':
+                self.tablename = "%s %s" % (self.tourNo, self.tablename)    
             hhc.readPlayerStacks(self)
             hhc.compilePlayerRegexs(self)
             hhc.markStreets(self)
@@ -1106,6 +1110,8 @@ class StudHand(Hand):
         # which then invokes a 'addXXX' callback
         if builtFrom == "HHC":
             hhc.readHandInfo(self)
+            if self.gametype['type'] == 'tour':
+                self.tablename = "%s %s" % (self.tourNo, self.tablename)    
             hhc.readPlayerStacks(self)
             hhc.compilePlayerRegexs(self)
             hhc.markStreets(self)

From 33ce9576276ec1c2688d6db7988cdf8916de07e2 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sat, 23 Jan 2010 13:29:03 +0000
Subject: [PATCH 098/320] add run_fpdb.py file in top dir

---
 run_fpdb.py | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100755 run_fpdb.py

diff --git a/run_fpdb.py b/run_fpdb.py
new file mode 100755
index 00000000..a5c06952
--- /dev/null
+++ b/run_fpdb.py
@@ -0,0 +1,31 @@
+#!/usr/bin/python
+
+#Copyright 2008 Carl Gherardi
+#This program is free software: you can redistribute it and/or modify
+#it under the terms of the GNU Affero General Public License as published by
+#the Free Software Foundation, version 3 of the License.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU Affero General Public License
+#along with this program. If not, see <http://www.gnu.org/licenses/>.
+#In the "official" distribution you can find the license in
+#agpl-3.0.txt in the docs folder of the package.
+
+
+import os
+import sys
+
+# sys.path[0] holds the dir run_fpdb.py was in
+sys.path[0] = sys.path[0]+os.sep+"pyfpdb"
+
+import fpdb
+
+
+if __name__ == "__main__":
+    me = fpdb.fpdb()
+    me.main()
+    exit()

From b888f82a53dcf40df2d1afb0bab2a85047424db9 Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Sat, 23 Jan 2010 10:01:36 +0100
Subject: [PATCH 099/320] All game selection boxes default enabled

---
 pyfpdb/Filters.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyfpdb/Filters.py b/pyfpdb/Filters.py
index c2778789..b0da336b 100644
--- a/pyfpdb/Filters.py
+++ b/pyfpdb/Filters.py
@@ -290,6 +290,7 @@ class Filters(threading.Thread):
         cb = gtk.CheckButton(game)
         cb.connect('clicked', self.__set_game_select, game)
         hbox.pack_start(cb, False, False, 0)
+        cb.set_active(True)
 
     def createLimitLine(self, hbox, limit, ltext):
         cb = gtk.CheckButton(str(ltext))

From 81b9b5170726f0fac1bb6f5f79c65b1d5785deb2 Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Sat, 23 Jan 2010 11:17:14 +0100
Subject: [PATCH 100/320] HUD fix for tournaments. Table name storage.

---
 pyfpdb/Hand.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 4bf3da8b..d2b795e6 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -617,6 +617,8 @@ class HoldemOmahaHand(Hand):
         # which then invokes a 'addXXX' callback
         if builtFrom == "HHC":
             hhc.readHandInfo(self)
+            if self.gametype['type'] == 'tour':
+                self.tablename = "%s %s" % (self.tourNo, self.tablename)    
             hhc.readPlayerStacks(self)
             hhc.compilePlayerRegexs(self)
             hhc.markStreets(self)
@@ -911,6 +913,8 @@ class DrawHand(Hand):
         # Populate the draw hand.
         if builtFrom == "HHC":
             hhc.readHandInfo(self)
+            if self.gametype['type'] == 'tour':
+                self.tablename = "%s %s" % (self.tourNo, self.tablename)    
             hhc.readPlayerStacks(self)
             hhc.compilePlayerRegexs(self)
             hhc.markStreets(self)
@@ -1105,6 +1109,8 @@ class StudHand(Hand):
         # which then invokes a 'addXXX' callback
         if builtFrom == "HHC":
             hhc.readHandInfo(self)
+            if self.gametype['type'] == 'tour':
+                self.tablename = "%s %s" % (self.tourNo, self.tablename)    
             hhc.readPlayerStacks(self)
             hhc.compilePlayerRegexs(self)
             hhc.markStreets(self)

From e1f158c4e4da8e9f44727c7971f31a2b3ecb5750 Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Sat, 23 Jan 2010 16:24:00 +0100
Subject: [PATCH 101/320] Fixed limit and freeroll support for Partypoker
 tourney's

---
 pyfpdb/PartyPokerToFpdb.py | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/pyfpdb/PartyPokerToFpdb.py b/pyfpdb/PartyPokerToFpdb.py
index 4cf64547..3d5a959b 100755
--- a/pyfpdb/PartyPokerToFpdb.py
+++ b/pyfpdb/PartyPokerToFpdb.py
@@ -55,22 +55,22 @@ class PartyPoker(HandHistoryConverter):
     # $5 USD NL Texas Hold'em - Saturday, July 25, 07:53:52 EDT 2009
     # NL Texas Hold'em $1 USD Buy-in Trny:45685440 Level:8  Blinds-Antes(600/1 200 -50) - Sunday, May 17, 11:25:07 MSKS 2009
     re_GameInfoRing     = re.compile("""
-            (?P<CURRENCY>\$|)\s*(?P<RINGLIMIT>[0-9,]+)\s*(?:USD)?\s*
-            (?P<LIMIT>(NL|PL|))\s+
+            (?P<CURRENCY>\$|)\s*(?P<RINGLIMIT>[.,0-9]+)([.,0-9/$]+)?\s*(?:USD)?\s*
+            (?P<LIMIT>(NL|PL|))\s*
             (?P<GAME>(Texas\ Hold\'em|Omaha))
             \s*\-\s*
             (?P<DATETIME>.+)
             """, re.VERBOSE)
     re_GameInfoTrny     = re.compile("""
-            (?P<LIMIT>(NL|PL|))\s+
+            (?P<LIMIT>(NL|PL|))\s*
             (?P<GAME>(Texas\ Hold\'em|Omaha))\s+
-            (?P<BUYIN>\$?[.0-9]+)\s*(?P<BUYIN_CURRENCY>USD)?\s*Buy-in\s+
+            (?:(?P<BUYIN>\$?[.,0-9]+)\s*(?P<BUYIN_CURRENCY>USD)?\s*Buy-in\s+)?
             Trny:\s?(?P<TOURNO>\d+)\s+
             Level:\s*(?P<LEVEL>\d+)\s+
-            Blinds(?:-Antes)?\(
-                (?P<SB>[.0-9 ]+)\s*
-                /(?P<BB>[.0-9 ]+)
-                (?:\s*-\s*(?P<ANTE>[.0-9 ]+)\$?)?
+            ((Blinds|Stakes)(?:-Antes)?)\(
+                (?P<SB>[.,0-9 ]+)\s*
+                /(?P<BB>[.,0-9 ]+)
+                (?:\s*-\s*(?P<ANTE>[.,0-9 ]+)\$?)?
             \)
             \s*\-\s*
             (?P<DATETIME>.+)
@@ -85,10 +85,9 @@ class PartyPoker(HandHistoryConverter):
           re.VERBOSE)
 
     re_HandInfo     = re.compile("""
-            ^Table\s+
-            (?P<TTYPE>[a-zA-Z0-9 ]+)\s+
+            ^Table\s+(?P<TTYPE>[$a-zA-Z0-9 ]+)\s+
             (?: \#|\(|)(?P<TABLE>\d+)\)?\s+
-            (?:[^ ]+\s+\#(?P<MTTTABLE>\d+).+)? # table number for mtt
+            (?:[a-zA-Z0-9 ]+\s+\#(?P<MTTTABLE>\d+).+)?
             (\(No\sDP\)\s)?
             \((?P<PLAY>Real|Play)\s+Money\)\s+ # FIXME: check if play money is correct
             Seat\s+(?P<BUTTON>\d+)\sis\sthe\sbutton
@@ -136,17 +135,17 @@ class PartyPoker(HandHistoryConverter):
             log.debug("CUR_SYM: '%s'" % subst['CUR_SYM'])
             log.debug("CUR: '%s'" % subst['CUR'])
             self.re_PostSB = re.compile(
-                r"^%(PLYR)s posts small blind \[%(CUR_SYM)s(?P<SB>[.0-9]+) ?%(CUR)s\]\." %  subst,
+                r"^%(PLYR)s posts small blind \[%(CUR_SYM)s(?P<SB>[.,0-9]+) ?%(CUR)s\]\." %  subst,
                 re.MULTILINE)
             self.re_PostBB = re.compile(
-                r"^%(PLYR)s posts big blind \[%(CUR_SYM)s(?P<BB>[.0-9]+) ?%(CUR)s\]\." %  subst,
+                r"^%(PLYR)s posts big blind \[%(CUR_SYM)s(?P<BB>[.,0-9]+) ?%(CUR)s\]\." %  subst,
                 re.MULTILINE)
             # NOTE: comma is used as a fraction part delimeter in re below
             self.re_PostDead = re.compile(
                 r"^%(PLYR)s posts big blind \+ dead \[(?P<BBNDEAD>[.,0-9]+) ?%(CUR_SYM)s\]\." %  subst,
                 re.MULTILINE)
             self.re_Antes = re.compile(
-                r"^%(PLYR)s posts ante \[%(CUR_SYM)s(?P<ANTE>[.0-9]+) ?%(CUR)s\]" %  subst,
+                r"^%(PLYR)s posts ante \[%(CUR_SYM)s(?P<ANTE>[.,0-9]+) ?%(CUR)s\]" %  subst,
                 re.MULTILINE)
             self.re_HeroCards = re.compile(
                 r"^Dealt to %(PLYR)s \[\s*(?P<NEWCARDS>.+)\s*\]" % subst,
@@ -310,6 +309,10 @@ class PartyPoker(HandHistoryConverter):
                 hand.handid = info[key]
             if key == 'TABLE':
                 hand.tablename = info[key]
+            if key == 'MTTTABLE':
+            	if info[key] != None:
+            		hand.tablename = info[key]
+            		hand.tourNo = info['TABLE']
             if key == 'BUTTON':
                 hand.buttonpos = info[key]
             if key == 'TOURNO':
@@ -317,8 +320,11 @@ class PartyPoker(HandHistoryConverter):
             if key == 'BUYIN':
                 # FIXME: it's dirty hack T_T
                 # code below assumes that tournament rake is equal to zero
-                cur = info[key][0] if info[key][0] not in '0123456789' else ''
-                hand.buyin = info[key] + '+%s0' % cur
+                if info[key] == None:
+                    hand.buyin = '$0+$0'
+                else:
+                    cur = info[key][0] if info[key][0] not in '0123456789' else ''
+                    hand.buyin = info[key] + '+%s0' % cur
             if key == 'LEVEL':
                 hand.level = info[key]
             if key == 'PLAY' and info['PLAY'] != 'Real':

From 53153bd00a18f26d5d8718f33df08aa70062b9e6 Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Sat, 23 Jan 2010 16:32:32 +0100
Subject: [PATCH 102/320] Fixed limit and freeroll support for Partypoker
 tourney's

---
 pyfpdb/Charset.py          | 52 ++++++++++++++++++++++++++++++++++++++
 pyfpdb/PartyPokerToFpdb.py | 38 ++++++++++++++++------------
 2 files changed, 74 insertions(+), 16 deletions(-)
 create mode 100644 pyfpdb/Charset.py

diff --git a/pyfpdb/Charset.py b/pyfpdb/Charset.py
new file mode 100644
index 00000000..f8043876
--- /dev/null
+++ b/pyfpdb/Charset.py
@@ -0,0 +1,52 @@
+#!/usr/bin/python
+
+#Copyright 2010 Mika Bostrom
+#This program is free software: you can redistribute it and/or modify
+#it under the terms of the GNU Affero General Public License as published by
+#the Free Software Foundation, version 3 of the License.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU Affero General Public License
+#along with this program. If not, see <http://www.gnu.org/licenses/>.
+#In the "official" distribution you can find the license in
+#agpl-3.0.txt in the docs folder of the package.
+
+# String manipulation
+import codecs
+
+# Settings
+import Configuration
+
+encoder_to_utf = codecs.lookup('utf-8')
+encoder_to_sys = codecs.lookup(Configuration.LOCALE_ENCODING)
+
+# I'm saving a few cycles with this one
+not_needed = False
+if Configuration.LOCALE_ENCODING == 'utf-8':
+    not_needed = True
+
+def to_utf8(s):
+    if not_needed: return s
+
+    try:
+        #(_out, _len) = encoder_to_utf.encode(s)
+        _out = unicode(s, Configuration.LOCALE_ENCODING).encode('utf-8')
+        return _out
+    except UnicodeDecodeError:
+        print 'Could not convert: "%s"' % s
+        raise
+
+def to_gui(s):
+    if not_needed: return s
+
+    try:
+        (_out, _len) = encoder_to_sys.encode(s)
+        return _out
+    except UnicodeDecodeError:
+        print 'Could not convert: "%s"' % s
+        raise
+
diff --git a/pyfpdb/PartyPokerToFpdb.py b/pyfpdb/PartyPokerToFpdb.py
index 4cf64547..3d5a959b 100755
--- a/pyfpdb/PartyPokerToFpdb.py
+++ b/pyfpdb/PartyPokerToFpdb.py
@@ -55,22 +55,22 @@ class PartyPoker(HandHistoryConverter):
     # $5 USD NL Texas Hold'em - Saturday, July 25, 07:53:52 EDT 2009
     # NL Texas Hold'em $1 USD Buy-in Trny:45685440 Level:8  Blinds-Antes(600/1 200 -50) - Sunday, May 17, 11:25:07 MSKS 2009
     re_GameInfoRing     = re.compile("""
-            (?P<CURRENCY>\$|)\s*(?P<RINGLIMIT>[0-9,]+)\s*(?:USD)?\s*
-            (?P<LIMIT>(NL|PL|))\s+
+            (?P<CURRENCY>\$|)\s*(?P<RINGLIMIT>[.,0-9]+)([.,0-9/$]+)?\s*(?:USD)?\s*
+            (?P<LIMIT>(NL|PL|))\s*
             (?P<GAME>(Texas\ Hold\'em|Omaha))
             \s*\-\s*
             (?P<DATETIME>.+)
             """, re.VERBOSE)
     re_GameInfoTrny     = re.compile("""
-            (?P<LIMIT>(NL|PL|))\s+
+            (?P<LIMIT>(NL|PL|))\s*
             (?P<GAME>(Texas\ Hold\'em|Omaha))\s+
-            (?P<BUYIN>\$?[.0-9]+)\s*(?P<BUYIN_CURRENCY>USD)?\s*Buy-in\s+
+            (?:(?P<BUYIN>\$?[.,0-9]+)\s*(?P<BUYIN_CURRENCY>USD)?\s*Buy-in\s+)?
             Trny:\s?(?P<TOURNO>\d+)\s+
             Level:\s*(?P<LEVEL>\d+)\s+
-            Blinds(?:-Antes)?\(
-                (?P<SB>[.0-9 ]+)\s*
-                /(?P<BB>[.0-9 ]+)
-                (?:\s*-\s*(?P<ANTE>[.0-9 ]+)\$?)?
+            ((Blinds|Stakes)(?:-Antes)?)\(
+                (?P<SB>[.,0-9 ]+)\s*
+                /(?P<BB>[.,0-9 ]+)
+                (?:\s*-\s*(?P<ANTE>[.,0-9 ]+)\$?)?
             \)
             \s*\-\s*
             (?P<DATETIME>.+)
@@ -85,10 +85,9 @@ class PartyPoker(HandHistoryConverter):
           re.VERBOSE)
 
     re_HandInfo     = re.compile("""
-            ^Table\s+
-            (?P<TTYPE>[a-zA-Z0-9 ]+)\s+
+            ^Table\s+(?P<TTYPE>[$a-zA-Z0-9 ]+)\s+
             (?: \#|\(|)(?P<TABLE>\d+)\)?\s+
-            (?:[^ ]+\s+\#(?P<MTTTABLE>\d+).+)? # table number for mtt
+            (?:[a-zA-Z0-9 ]+\s+\#(?P<MTTTABLE>\d+).+)?
             (\(No\sDP\)\s)?
             \((?P<PLAY>Real|Play)\s+Money\)\s+ # FIXME: check if play money is correct
             Seat\s+(?P<BUTTON>\d+)\sis\sthe\sbutton
@@ -136,17 +135,17 @@ class PartyPoker(HandHistoryConverter):
             log.debug("CUR_SYM: '%s'" % subst['CUR_SYM'])
             log.debug("CUR: '%s'" % subst['CUR'])
             self.re_PostSB = re.compile(
-                r"^%(PLYR)s posts small blind \[%(CUR_SYM)s(?P<SB>[.0-9]+) ?%(CUR)s\]\." %  subst,
+                r"^%(PLYR)s posts small blind \[%(CUR_SYM)s(?P<SB>[.,0-9]+) ?%(CUR)s\]\." %  subst,
                 re.MULTILINE)
             self.re_PostBB = re.compile(
-                r"^%(PLYR)s posts big blind \[%(CUR_SYM)s(?P<BB>[.0-9]+) ?%(CUR)s\]\." %  subst,
+                r"^%(PLYR)s posts big blind \[%(CUR_SYM)s(?P<BB>[.,0-9]+) ?%(CUR)s\]\." %  subst,
                 re.MULTILINE)
             # NOTE: comma is used as a fraction part delimeter in re below
             self.re_PostDead = re.compile(
                 r"^%(PLYR)s posts big blind \+ dead \[(?P<BBNDEAD>[.,0-9]+) ?%(CUR_SYM)s\]\." %  subst,
                 re.MULTILINE)
             self.re_Antes = re.compile(
-                r"^%(PLYR)s posts ante \[%(CUR_SYM)s(?P<ANTE>[.0-9]+) ?%(CUR)s\]" %  subst,
+                r"^%(PLYR)s posts ante \[%(CUR_SYM)s(?P<ANTE>[.,0-9]+) ?%(CUR)s\]" %  subst,
                 re.MULTILINE)
             self.re_HeroCards = re.compile(
                 r"^Dealt to %(PLYR)s \[\s*(?P<NEWCARDS>.+)\s*\]" % subst,
@@ -310,6 +309,10 @@ class PartyPoker(HandHistoryConverter):
                 hand.handid = info[key]
             if key == 'TABLE':
                 hand.tablename = info[key]
+            if key == 'MTTTABLE':
+            	if info[key] != None:
+            		hand.tablename = info[key]
+            		hand.tourNo = info['TABLE']
             if key == 'BUTTON':
                 hand.buttonpos = info[key]
             if key == 'TOURNO':
@@ -317,8 +320,11 @@ class PartyPoker(HandHistoryConverter):
             if key == 'BUYIN':
                 # FIXME: it's dirty hack T_T
                 # code below assumes that tournament rake is equal to zero
-                cur = info[key][0] if info[key][0] not in '0123456789' else ''
-                hand.buyin = info[key] + '+%s0' % cur
+                if info[key] == None:
+                    hand.buyin = '$0+$0'
+                else:
+                    cur = info[key][0] if info[key][0] not in '0123456789' else ''
+                    hand.buyin = info[key] + '+%s0' % cur
             if key == 'LEVEL':
                 hand.level = info[key]
             if key == 'PLAY' and info['PLAY'] != 'Real':

From 3a03bc51a2e387d342f350762373c38898e6c272 Mon Sep 17 00:00:00 2001
From: Mika Bostrom <bostik@odin.bostik.iki.fi>
Date: Thu, 21 Jan 2010 21:24:55 +0200
Subject: [PATCH 103/320] Some character set improvements

The strings (names) as stored in database should always be UTF-8;
whatever the display locale is, we then need to convert from the storage
encoding to session encoding. When making database queries with players
names in them, the names must be reconverted to UTF-8.
---
 pyfpdb/Database.py         |  7 +++++--
 pyfpdb/Filters.py          | 15 +++++++++++----
 pyfpdb/GuiGraphViewer.py   |  3 ++-
 pyfpdb/GuiPlayerStats.py   |  3 ++-
 pyfpdb/GuiSessionViewer.py |  6 +++++-
 pyfpdb/GuiTableViewer.py   |  3 ++-
 6 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index c7b3e3b8..d5eadf7a 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -48,6 +48,7 @@ import Configuration
 import SQL
 import Card
 import Tourney
+import Charset
 from Exceptions import *
 
 log = Configuration.get_logger("logging.conf")
@@ -604,7 +605,8 @@ class Database:
             
     def get_player_id(self, config, site, player_name):
         c = self.connection.cursor()
-        c.execute(self.sql.query['get_player_id'], (player_name, site))
+        p_name = Charset.to_utf8(player_name)
+        c.execute(self.sql.query['get_player_id'], (p_name, site))
         row = c.fetchone()
         if row:
             return row[0]
@@ -617,7 +619,8 @@ class Database:
         if site_id is None:
             site_id = -1
         c = self.get_cursor()
-        c.execute(self.sql.query['get_player_names'], (like_player_name, site_id, site_id))
+        p_name = Charset.to_utf8(like_player_name)
+        c.execute(self.sql.query['get_player_names'], (p_name, site_id, site_id))
         rows = c.fetchall()
         return rows
             
diff --git a/pyfpdb/Filters.py b/pyfpdb/Filters.py
index 83721ebc..b0da336b 100644
--- a/pyfpdb/Filters.py
+++ b/pyfpdb/Filters.py
@@ -29,6 +29,7 @@ import gobject
 import Configuration
 import fpdb_db
 import FpdbSQLQueries
+import Charset
 
 class Filters(threading.Thread):
     def __init__(self, db, config, qdict, display = {}, debug=True):
@@ -242,6 +243,7 @@ class Filters(threading.Thread):
         print "DEBUG: %s was toggled %s" % (data, ("OFF", "ON")[widget.get_active()])
 
     def createPlayerLine(self, hbox, site, player):
+        print 'DEBUG :: add:"%s"' % player
         label = gtk.Label(site +" id:")
         hbox.pack_start(label, False, False, 0)
 
@@ -258,13 +260,17 @@ class Filters(threading.Thread):
         completion.set_model(liststore)
         completion.set_text_column(0)
         names = self.db.get_player_names(self.conf)  # (config=self.conf, site_id=None, like_player_name="%")
-        for n in names:
-            liststore.append(n)
+        for n in names: # list of single-element "tuples"
+            _n = Charset.to_gui(n[0])
+            _nt = (_n, )
+            liststore.append(_nt)
 
         self.__set_hero_name(pname, site)
 
     def __set_hero_name(self, w, site):
-        self.heroes[site] = w.get_text()
+        _name = w.get_text()
+        _guiname = Charset.to_gui(_name)
+        self.heroes[site] = _guiname
 #        print "DEBUG: setting heroes[%s]: %s"%(site, self.heroes[site])
 
     def __set_num_hands(self, w, val):
@@ -453,7 +459,8 @@ class Filters(threading.Thread):
             vbox.pack_start(hBox, False, True, 0)
 
             player = self.conf.supported_sites[site].screen_name
-            self.createPlayerLine(hBox, site, player)
+            _pname = Charset.to_gui(player)
+            self.createPlayerLine(hBox, site, _pname)
 
         if "GroupsAll" in display and display["GroupsAll"] == True:
             hbox = gtk.HBox(False, 0)
diff --git a/pyfpdb/GuiGraphViewer.py b/pyfpdb/GuiGraphViewer.py
index 0b2d20cd..56e41bdd 100644
--- a/pyfpdb/GuiGraphViewer.py
+++ b/pyfpdb/GuiGraphViewer.py
@@ -147,7 +147,8 @@ class GuiGraphViewer (threading.Thread):
                 if sites[site] == True:
                     sitenos.append(siteids[site])
                     c = self.db.get_cursor()
-                    c.execute(self.sql.query['getPlayerId'], (heroes[site],))
+                    _hname = Charset.to_utf8(heroes[site])
+                    c.execute(self.sql.query['getPlayerId'], (_hname,))
                     result = c.fetchall()
                     if len(result) == 1:
                         playerids.append( int(result[0][0]) )
diff --git a/pyfpdb/GuiPlayerStats.py b/pyfpdb/GuiPlayerStats.py
index e842b301..a707e609 100644
--- a/pyfpdb/GuiPlayerStats.py
+++ b/pyfpdb/GuiPlayerStats.py
@@ -190,7 +190,8 @@ class GuiPlayerStats (threading.Thread):
                 sitenos.append(siteids[site])
                 # Nasty hack to deal with multiple sites + same player name -Eric
                 que = self.sql.query['getPlayerId'] + " AND siteId=%d" % siteids[site]
-                self.cursor.execute(que, (heroes[site],))
+                _hname = Charset.to_utf8(heroes[site])
+                self.cursor.execute(que, (_hname,))
                 result = self.db.cursor.fetchall()
                 if len(result) == 1:
                     playerids.append(result[0][0])
diff --git a/pyfpdb/GuiSessionViewer.py b/pyfpdb/GuiSessionViewer.py
index d8cd7042..b5ca0867 100755
--- a/pyfpdb/GuiSessionViewer.py
+++ b/pyfpdb/GuiSessionViewer.py
@@ -47,6 +47,7 @@ import fpdb_import
 import Database
 import Filters
 import FpdbSQLQueries
+import Charset
 
 class GuiSessionViewer (threading.Thread):
     def __init__(self, config, querylist, mainwin, debug=True):
@@ -181,7 +182,10 @@ class GuiSessionViewer (threading.Thread):
         for site in sites:
             if sites[site] == True:
                 sitenos.append(siteids[site])
-                self.cursor.execute(self.sql.query['getPlayerId'], (heroes[site],))
+                _q = self.sql.query['getPlayerId']
+                _name = Charset.to_utf8(heroes[site])
+                print 'DEBUG(_name) :: %s' % _name
+                self.cursor.execute(_q, (_name,)) # arg = tuple
                 result = self.db.cursor.fetchall()
                 if len(result) == 1:
                     playerids.append(result[0][0])
diff --git a/pyfpdb/GuiTableViewer.py b/pyfpdb/GuiTableViewer.py
index 57fc772d..bfaa3824 100644
--- a/pyfpdb/GuiTableViewer.py
+++ b/pyfpdb/GuiTableViewer.py
@@ -79,7 +79,8 @@ class GuiTableViewer (threading.Thread):
         #then the data rows
         for player in range(len(self.player_names)):
             tmp=[]
-            tmp.append(self.player_names[player][0])
+            p_name = Charset.to_gui(self.player_names[player][0])
+            tmp.append(p_name)
             
             seatCount=len(self.player_names)
             if seatCount>=8:

From 7737720aa816cee3155ccd4762772e06a1d0188c Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Sat, 23 Jan 2010 16:35:57 +0100
Subject: [PATCH 104/320] Conflicts:

	pyfpdb/Charset.py
---
 pyfpdb/Charset.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pyfpdb/Charset.py b/pyfpdb/Charset.py
index f8043876..69511cdd 100644
--- a/pyfpdb/Charset.py
+++ b/pyfpdb/Charset.py
@@ -33,8 +33,7 @@ def to_utf8(s):
     if not_needed: return s
 
     try:
-        #(_out, _len) = encoder_to_utf.encode(s)
-        _out = unicode(s, Configuration.LOCALE_ENCODING).encode('utf-8')
+        (_out, _len) = encoder_to_utf.encode(s)
         return _out
     except UnicodeDecodeError:
         print 'Could not convert: "%s"' % s

From cc3811b8aae2798c76868510cbdf0c5b4dbe1b60 Mon Sep 17 00:00:00 2001
From: Mika Bostrom <bostik@odin.bostik.iki.fi>
Date: Thu, 21 Jan 2010 21:52:22 +0200
Subject: [PATCH 105/320] Add missing import

GuiPlayerStats.py didn't import the new Charset module but tried to use
the functions.
---
 pyfpdb/GuiPlayerStats.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyfpdb/GuiPlayerStats.py b/pyfpdb/GuiPlayerStats.py
index a707e609..7a3213e8 100644
--- a/pyfpdb/GuiPlayerStats.py
+++ b/pyfpdb/GuiPlayerStats.py
@@ -29,6 +29,7 @@ import fpdb_import
 import Database
 import fpdb_db
 import Filters
+import Charset
 
 colalias,colshow,colheading,colxalign,colformat,coltype = 0,1,2,3,4,5
 ranks = {'x':0, '2':2, '3':3, '4':4, '5':5, '6':6, '7':7, '8':8, '9':9, 'T':10, 'J':11, 'Q':12, 'K':13, 'A':14}

From fde2f1f710eea9a4a3775c0f8a1de1b8bbdb9e1d Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sat, 23 Jan 2010 15:30:48 +0800
Subject: [PATCH 106/320] Fix Charset import got Grapher

---
 pyfpdb/GuiGraphViewer.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyfpdb/GuiGraphViewer.py b/pyfpdb/GuiGraphViewer.py
index 56e41bdd..3351b70f 100644
--- a/pyfpdb/GuiGraphViewer.py
+++ b/pyfpdb/GuiGraphViewer.py
@@ -44,6 +44,7 @@ except ImportError, inst:
 import fpdb_import
 import Database
 import Filters
+import Charset
 
 class GuiGraphViewer (threading.Thread):
 

From c36c60155c87b4393fdfbc472472c02f1b8d9d0f Mon Sep 17 00:00:00 2001
From: Mika Bostrom <bostik@odin.bostik.iki.fi>
Date: Thu, 21 Jan 2010 21:46:14 +0200
Subject: [PATCH 107/320] Use a different "unicoder" for db strings

It seems that running encoder.encode() on a latin1/latin9 string results
in, yes a bloody UnicodeDecodeError. Decode error on .encode()...
Really. This way the modification from non-unicode string to real
unicode appears to work better.
---
 pyfpdb/Charset.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/Charset.py b/pyfpdb/Charset.py
index 69511cdd..f8043876 100644
--- a/pyfpdb/Charset.py
+++ b/pyfpdb/Charset.py
@@ -33,7 +33,8 @@ def to_utf8(s):
     if not_needed: return s
 
     try:
-        (_out, _len) = encoder_to_utf.encode(s)
+        #(_out, _len) = encoder_to_utf.encode(s)
+        _out = unicode(s, Configuration.LOCALE_ENCODING).encode('utf-8')
         return _out
     except UnicodeDecodeError:
         print 'Could not convert: "%s"' % s

From dbaad2d4302e1c9ce8069f4a6a440fa5f4bafc12 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sat, 23 Jan 2010 13:37:41 +0800
Subject: [PATCH 108/320] Remove NEWIMPORT variable.

No going back now :)
---
 pyfpdb/Configuration.py        | 1 -
 pyfpdb/HandHistoryConverter.py | 3 +--
 pyfpdb/fpdb_import.py          | 4 +---
 pyfpdb/test_PokerStars.py      | 6 +-----
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py
index 39bf5921..abd5b016 100755
--- a/pyfpdb/Configuration.py
+++ b/pyfpdb/Configuration.py
@@ -126,7 +126,6 @@ DATABASE_TYPES = (
         DATABASE_TYPE_MYSQL,
         )
 
-NEWIMPORT = True
 LOCALE_ENCODING = locale.getdefaultlocale()[1]
 
 ########################################################################
diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index 47cfd302..c0374143 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -292,8 +292,7 @@ which it expects to find at self.re_TailSplitHands -- see for e.g. Everleaf.py.
             log.info("Unsupported game type: %s" % gametype)
 
         if hand:
-            if Configuration.NEWIMPORT == False:
-                hand.writeHand(self.out_fh)
+            #hand.writeHand(self.out_fh)
             return hand
         else:
             log.info("Unsupported game type: %s" % gametype)
diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index 7c240cbe..ec480831 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -98,8 +98,6 @@ class Importer:
         for i in xrange(self.settings['threads']):
             self.writerdbs.append( Database.Database(self.config, sql = self.sql) )
 
-        self.NEWIMPORT = Configuration.NEWIMPORT
-
         clock() # init clock in windows
 
     #Set functions
@@ -433,7 +431,7 @@ class Importer:
             else:
                 self.pos_in_file[file] = 0
             hhc = obj(in_path = file, out_path = out_path, index = idx, starsArchive = self.settings['starsArchive'])
-            if hhc.getStatus() and self.NEWIMPORT == True:
+            if hhc.getStatus():
                 handlist = hhc.getProcessedHands()
                 self.pos_in_file[file] = hhc.getLastCharacterRead()
                 to_hud = []
diff --git a/pyfpdb/test_PokerStars.py b/pyfpdb/test_PokerStars.py
index 72c9049c..4244f532 100644
--- a/pyfpdb/test_PokerStars.py
+++ b/pyfpdb/test_PokerStars.py
@@ -178,11 +178,7 @@ def testDrawImport():
         (stored, dups, partial, errs, ttime) = importer.runImport()
         importer.clearFileList()
     except FpdbError:
-        if Configuration.NEWIMPORT == False:
-            #Old import code doesn't support draw
-            pass
-        else:
-            assert 0 == 1
+        assert 0 == 1
 
     # Should actually do some testing here
     assert 1 == 1

From 6dcec4800563f282502e607869df62e7b9381bb1 Mon Sep 17 00:00:00 2001
From: Mika Bostrom <bostik@odin.bostik.iki.fi>
Date: Sun, 24 Jan 2010 19:59:49 +0200
Subject: [PATCH 109/320] Use common encoding routine everywhere

The string/locale manipulation in Database.py was open-coded and did not
use Charset.to_utf8() like the rest of the code.
---
 pyfpdb/Database.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index 7194b230..2d91ff4c 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -38,7 +38,6 @@ from decimal import Decimal
 import string
 import re
 import Queue
-import codecs
 
 #    pyGTK modules
 
@@ -52,7 +51,6 @@ import Charset
 from Exceptions import *
 
 log = Configuration.get_logger("logging.conf")
-encoder = codecs.lookup('utf-8')
 
 class Database:
 
@@ -1560,7 +1558,7 @@ class Database:
 
     def insertPlayer(self, name, site_id):
         result = None
-        (_name, _len) = encoder.encode(unicode(name))
+        _name = Charset.to_utf8(name)
         c = self.get_cursor()
         q = "SELECT name, id FROM Players WHERE siteid=%s and name=%s"
         q = q.replace('%s', self.sql.query['placeholder'])

From 33277ce68b2aab6bb8fa35ddef2d6ab046d8655a Mon Sep 17 00:00:00 2001
From: Mika Bostrom <bostik@odin.bostik.iki.fi>
Date: Sun, 24 Jan 2010 21:09:30 +0200
Subject: [PATCH 110/320] Add new encoder

This encoder is used to handle input from HH conversion, which needs to
end up as UTF-8 in the database. Switch the open-coded routine from
Database.py to this common routine so all encodings now take place in
the same file.
---
 pyfpdb/Charset.py  | 10 ++++++++++
 pyfpdb/Database.py |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/Charset.py b/pyfpdb/Charset.py
index f8043876..16c236b6 100644
--- a/pyfpdb/Charset.py
+++ b/pyfpdb/Charset.py
@@ -40,6 +40,16 @@ def to_utf8(s):
         print 'Could not convert: "%s"' % s
         raise
 
+def to_db_utf8(s):
+    if not_needed: return s
+
+    try:
+        (_out, _len) = encoder_to_utf.encode(unicode(s))
+        return _out
+    except UnicodeDecodeError:
+        print 'Could not convert: "%s"' % s
+        raise
+
 def to_gui(s):
     if not_needed: return s
 
diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index 2d91ff4c..c340079c 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -1558,7 +1558,7 @@ class Database:
 
     def insertPlayer(self, name, site_id):
         result = None
-        _name = Charset.to_utf8(name)
+        _name = Charset.to_db_utf8(name)
         c = self.get_cursor()
         q = "SELECT name, id FROM Players WHERE siteid=%s and name=%s"
         q = q.replace('%s', self.sql.query['placeholder'])

From 85c9070ec8bc418237af83eb9adad8194e7cbcaa Mon Sep 17 00:00:00 2001
From: Mika Bostrom <bostik@odin.bostik.iki.fi>
Date: Sun, 24 Jan 2010 22:17:03 +0200
Subject: [PATCH 111/320] Write charmap-related errors directly to stderr

This change is needed to skip a nasty behaviour: if the string triggered
a decoding error, it will trigger one *AGAIN* if the string is printed
to console. By writing directly to sys.stderr we skip the
locale/conversion issues and get the troublesome string directly in a
file where it is stored as a raw sequence of octets.
---
 pyfpdb/Charset.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pyfpdb/Charset.py b/pyfpdb/Charset.py
index 16c236b6..86d33418 100644
--- a/pyfpdb/Charset.py
+++ b/pyfpdb/Charset.py
@@ -15,6 +15,9 @@
 #In the "official" distribution you can find the license in
 #agpl-3.0.txt in the docs folder of the package.
 
+# Error logging
+import sys
+
 # String manipulation
 import codecs
 
@@ -37,7 +40,7 @@ def to_utf8(s):
         _out = unicode(s, Configuration.LOCALE_ENCODING).encode('utf-8')
         return _out
     except UnicodeDecodeError:
-        print 'Could not convert: "%s"' % s
+        sys.stderr.write('Could not convert: "%s"\n' % s)
         raise
 
 def to_db_utf8(s):
@@ -47,7 +50,7 @@ def to_db_utf8(s):
         (_out, _len) = encoder_to_utf.encode(unicode(s))
         return _out
     except UnicodeDecodeError:
-        print 'Could not convert: "%s"' % s
+        sys.stderr.write('Could not convert: "%s"\n' % s)
         raise
 
 def to_gui(s):
@@ -57,6 +60,6 @@ def to_gui(s):
         (_out, _len) = encoder_to_sys.encode(s)
         return _out
     except UnicodeDecodeError:
-        print 'Could not convert: "%s"' % s
+        sys.stderr.write('Could not convert: "%s"\n' % s)
         raise
 

From 860b5737b7d6fda0d34da4636a14662373dc490d Mon Sep 17 00:00:00 2001
From: Mika Bostrom <bostik@odin.bostik.iki.fi>
Date: Sun, 24 Jan 2010 19:59:49 +0200
Subject: [PATCH 112/320] Use common encoding routine everywhere

The string/locale manipulation in Database.py was open-coded and did not
use Charset.to_utf8() like the rest of the code.
---
 pyfpdb/Database.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index 28f5f7a5..fc989870 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -38,7 +38,6 @@ from decimal import Decimal
 import string
 import re
 import Queue
-import codecs
 
 #    pyGTK modules
 
@@ -52,7 +51,6 @@ import Charset
 from Exceptions import *
 
 log = Configuration.get_logger("logging.conf")
-encoder = codecs.lookup('utf-8')
 
 class Database:
 
@@ -1561,7 +1559,7 @@ class Database:
 
     def insertPlayer(self, name, site_id):
         result = None
-        (_name, _len) = encoder.encode(unicode(name))
+        _name = Charset.to_utf8(name)
         c = self.get_cursor()
         q = "SELECT name, id FROM Players WHERE siteid=%s and name=%s"
         q = q.replace('%s', self.sql.query['placeholder'])

From 2c7287c35118017e4d0a89c60bb7102186e42498 Mon Sep 17 00:00:00 2001
From: Mika Bostrom <bostik@odin.bostik.iki.fi>
Date: Sun, 24 Jan 2010 21:09:30 +0200
Subject: [PATCH 113/320] Add new encoder

This encoder is used to handle input from HH conversion, which needs to
end up as UTF-8 in the database. Switch the open-coded routine from
Database.py to this common routine so all encodings now take place in
the same file.
---
 pyfpdb/Charset.py  | 10 ++++++++++
 pyfpdb/Database.py |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/Charset.py b/pyfpdb/Charset.py
index f8043876..16c236b6 100644
--- a/pyfpdb/Charset.py
+++ b/pyfpdb/Charset.py
@@ -40,6 +40,16 @@ def to_utf8(s):
         print 'Could not convert: "%s"' % s
         raise
 
+def to_db_utf8(s):
+    if not_needed: return s
+
+    try:
+        (_out, _len) = encoder_to_utf.encode(unicode(s))
+        return _out
+    except UnicodeDecodeError:
+        print 'Could not convert: "%s"' % s
+        raise
+
 def to_gui(s):
     if not_needed: return s
 
diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index fc989870..bbbb27f1 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -1559,7 +1559,7 @@ class Database:
 
     def insertPlayer(self, name, site_id):
         result = None
-        _name = Charset.to_utf8(name)
+        _name = Charset.to_db_utf8(name)
         c = self.get_cursor()
         q = "SELECT name, id FROM Players WHERE siteid=%s and name=%s"
         q = q.replace('%s', self.sql.query['placeholder'])

From b58edb53aee04344b79e9d6a4423499ff361a644 Mon Sep 17 00:00:00 2001
From: Mika Bostrom <bostik@odin.bostik.iki.fi>
Date: Sun, 24 Jan 2010 22:17:03 +0200
Subject: [PATCH 114/320] Write charmap-related errors directly to stderr

This change is needed to skip a nasty behaviour: if the string triggered
a decoding error, it will trigger one *AGAIN* if the string is printed
to console. By writing directly to sys.stderr we skip the
locale/conversion issues and get the troublesome string directly in a
file where it is stored as a raw sequence of octets.
---
 pyfpdb/Charset.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pyfpdb/Charset.py b/pyfpdb/Charset.py
index 16c236b6..86d33418 100644
--- a/pyfpdb/Charset.py
+++ b/pyfpdb/Charset.py
@@ -15,6 +15,9 @@
 #In the "official" distribution you can find the license in
 #agpl-3.0.txt in the docs folder of the package.
 
+# Error logging
+import sys
+
 # String manipulation
 import codecs
 
@@ -37,7 +40,7 @@ def to_utf8(s):
         _out = unicode(s, Configuration.LOCALE_ENCODING).encode('utf-8')
         return _out
     except UnicodeDecodeError:
-        print 'Could not convert: "%s"' % s
+        sys.stderr.write('Could not convert: "%s"\n' % s)
         raise
 
 def to_db_utf8(s):
@@ -47,7 +50,7 @@ def to_db_utf8(s):
         (_out, _len) = encoder_to_utf.encode(unicode(s))
         return _out
     except UnicodeDecodeError:
-        print 'Could not convert: "%s"' % s
+        sys.stderr.write('Could not convert: "%s"\n' % s)
         raise
 
 def to_gui(s):
@@ -57,6 +60,6 @@ def to_gui(s):
         (_out, _len) = encoder_to_sys.encode(s)
         return _out
     except UnicodeDecodeError:
-        print 'Could not convert: "%s"' % s
+        sys.stderr.write('Could not convert: "%s"\n' % s)
         raise
 

From 896de37d0d9b91aae200537dc2902e236ed83669 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Tue, 26 Jan 2010 01:00:22 +0800
Subject: [PATCH 115/320] Fix hudCache update semantics

---
 pyfpdb/fpdb_import.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index ec480831..76705839 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -449,7 +449,9 @@ class Importer:
                 # Call hudcache update if not in bulk import mode
                 # FIXME: Need to test for bulk import that isn't rebuilding the cache
                 if self.callHud:
-                    hand.updateHudCache(self.database)
+                    for hand in handlist:
+                        if hand is not None:
+                            hand.updateHudCache(self.database)
                     self.database.commit()
 
                 #pipe the Hands.id out to the HUD

From 90ea33c74b004cb770d3c1269e719791a26c18dd Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Mon, 25 Jan 2010 12:04:21 -0500
Subject: [PATCH 116/320] Needs to be executable.

---
 pyfpdb/test_PokerStars.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 pyfpdb/test_PokerStars.py

diff --git a/pyfpdb/test_PokerStars.py b/pyfpdb/test_PokerStars.py
old mode 100644
new mode 100755

From 7f04ed88f4522f7788017f9fb20c7b1d5dff3a1c Mon Sep 17 00:00:00 2001
From: Mika Bostrom <bostik@odin.bostik.iki.fi>
Date: Tue, 26 Jan 2010 08:01:46 +0200
Subject: [PATCH 117/320] Use proper encoding name

When system is unicode, the second item in locale.getdefaultlocale() is
"UTF8", not "utf-8".
---
 pyfpdb/Charset.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/Charset.py b/pyfpdb/Charset.py
index 86d33418..d49b6219 100644
--- a/pyfpdb/Charset.py
+++ b/pyfpdb/Charset.py
@@ -29,7 +29,7 @@ encoder_to_sys = codecs.lookup(Configuration.LOCALE_ENCODING)
 
 # I'm saving a few cycles with this one
 not_needed = False
-if Configuration.LOCALE_ENCODING == 'utf-8':
+if Configuration.LOCALE_ENCODING == 'UTF8':
     not_needed = True
 
 def to_utf8(s):

From 7d7ba94da13c6680247e2f6fd8f6d2e0abe53237 Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Tue, 26 Jan 2010 10:56:07 -0500
Subject: [PATCH 118/320] Fix problem with finding HHs for utf-16 files.

---
 pyfpdb/HandHistoryConverter.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index c0374143..bec2ebae 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -440,10 +440,9 @@ or None if we fail to get the info """
                     #print "trying", kodec
                     try:
                         in_fh = codecs.open(self.in_path, 'r', kodec)
-                        in_fh.seek(self.index)
-                        log.debug("Opened in_path: '%s' with %s" % (self.in_path, kodec))
-                        self.obs = in_fh.read()
-                        self.index = in_fh.tell()
+                        whole_file = in_fh.read()
+                        self.obs = whole_file[self.index:]
+                        self.index = len(whole_file)
                         in_fh.close()
                         break
                     except:

From 12c93ea9a6f50fdc7c13fd466551e43033d70a15 Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Tue, 26 Jan 2010 20:20:17 +0100
Subject: [PATCH 119/320] Support for same hero name on multiple sites also
 implemented in GuiGraph

---
 pyfpdb/GuiGraphViewer.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/GuiGraphViewer.py b/pyfpdb/GuiGraphViewer.py
index 3351b70f..ce1df577 100644
--- a/pyfpdb/GuiGraphViewer.py
+++ b/pyfpdb/GuiGraphViewer.py
@@ -149,7 +149,9 @@ class GuiGraphViewer (threading.Thread):
                     sitenos.append(siteids[site])
                     c = self.db.get_cursor()
                     _hname = Charset.to_utf8(heroes[site])
-                    c.execute(self.sql.query['getPlayerId'], (_hname,))
+                    # Nasty hack to deal with multiple sites + same player name -Eric
+                    que = self.sql.query['getPlayerId'] + " AND siteId=%d" % siteids[site]
+                    c.execute(que, (_hname,))
                     result = c.fetchall()
                     if len(result) == 1:
                         playerids.append( int(result[0][0]) )

From 4814c30d8f0b23038a704f23319e3a45eceaf07c Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Tue, 26 Jan 2010 20:25:04 +0100
Subject: [PATCH 120/320] Autocomplete Hero names only lists the valid names
 for that pokersite SiteID list needed to be filled before the Hero field was
 filled.

---
 pyfpdb/Filters.py | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/pyfpdb/Filters.py b/pyfpdb/Filters.py
index b0da336b..37a31c9e 100644
--- a/pyfpdb/Filters.py
+++ b/pyfpdb/Filters.py
@@ -51,6 +51,16 @@ class Filters(threading.Thread):
         self.heroes = {}
         self.boxes  = {}
 
+        for site in self.conf.get_supported_sites():
+            #Get db site id for filtering later
+            self.cursor.execute(self.sql.query['getSiteId'], (site,))
+            result = self.db.cursor.fetchall()
+            if len(result) == 1:
+                self.siteid[site] = result[0][0]
+            else:
+                print "Either 0 or more than one site matched - EEK"
+
+
         # text used on screen stored here so that it can be configured
         self.filterText = {'limitsall':'All', 'limitsnone':'None', 'limitsshow':'Show _Limits'
                           ,'seatsbetween':'Between:', 'seatsand':'And:', 'seatsshow':'Show Number of _Players'
@@ -259,7 +269,7 @@ class Filters(threading.Thread):
         liststore = gtk.ListStore(gobject.TYPE_STRING)
         completion.set_model(liststore)
         completion.set_text_column(0)
-        names = self.db.get_player_names(self.conf)  # (config=self.conf, site_id=None, like_player_name="%")
+        names = self.db.get_player_names(self.conf, self.siteid[site])  # (config=self.conf, site_id=None, like_player_name="%")
         for n in names: # list of single-element "tuples"
             _n = Charset.to_gui(n[0])
             _nt = (_n, )
@@ -487,12 +497,12 @@ class Filters(threading.Thread):
             vbox.pack_start(hbox, False, True, 0)
             self.createSiteLine(hbox, site)
             #Get db site id for filtering later
-            self.cursor.execute(self.sql.query['getSiteId'], (site,))
-            result = self.db.cursor.fetchall()
-            if len(result) == 1:
-                self.siteid[site] = result[0][0]
-            else:
-                print "Either 0 or more than one site matched - EEK"
+            #self.cursor.execute(self.sql.query['getSiteId'], (site,))
+            #result = self.db.cursor.fetchall()
+            #if len(result) == 1:
+            #    self.siteid[site] = result[0][0]
+            #else:
+            #    print "Either 0 or more than one site matched - EEK"
 
     def fillGamesFrame(self, vbox):
         self.cursor.execute(self.sql.query['getGames'])

From e5071d6d09dbaf831dd3033f5909075a8e4e70cf Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Tue, 26 Jan 2010 20:28:41 +0100
Subject: [PATCH 121/320] *#$@ merge

---
 run_fpdb.py | 62 ++++++++++++++++++++++++++---------------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/run_fpdb.py b/run_fpdb.py
index a5c06952..eef325c9 100755
--- a/run_fpdb.py
+++ b/run_fpdb.py
@@ -1,31 +1,31 @@
-#!/usr/bin/python
-
-#Copyright 2008 Carl Gherardi
-#This program is free software: you can redistribute it and/or modify
-#it under the terms of the GNU Affero General Public License as published by
-#the Free Software Foundation, version 3 of the License.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU Affero General Public License
-#along with this program. If not, see <http://www.gnu.org/licenses/>.
-#In the "official" distribution you can find the license in
-#agpl-3.0.txt in the docs folder of the package.
-
-
-import os
-import sys
-
-# sys.path[0] holds the dir run_fpdb.py was in
-sys.path[0] = sys.path[0]+os.sep+"pyfpdb"
-
-import fpdb
-
-
-if __name__ == "__main__":
-    me = fpdb.fpdb()
-    me.main()
-    exit()
+#!/usr/bin/python
+
+#Copyright 2008 Carl Gherardi
+#This program is free software: you can redistribute it and/or modify
+#it under the terms of the GNU Affero General Public License as published by
+#the Free Software Foundation, version 3 of the License.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU Affero General Public License
+#along with this program. If not, see <http://www.gnu.org/licenses/>.
+#In the "official" distribution you can find the license in
+#agpl-3.0.txt in the docs folder of the package.
+
+
+import os
+import sys
+
+# sys.path[0] holds the dir run_fpdb.py was in
+sys.path[0] = sys.path[0]+os.sep+"pyfpdb"
+
+import fpdb
+
+
+if __name__ == "__main__":
+    me = fpdb.fpdb()
+    me.main()
+    exit()

From ff9305924ca10c4583fedf157467b6cfff037b31 Mon Sep 17 00:00:00 2001
From: Mika Bostrom <bostik@odin.bostik.iki.fi>
Date: Tue, 26 Jan 2010 08:01:46 +0200
Subject: [PATCH 122/320] Use proper encoding name

When system is unicode, the second item in locale.getdefaultlocale() is
"UTF8", not "utf-8".
---
 pyfpdb/Charset.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/Charset.py b/pyfpdb/Charset.py
index 86d33418..d49b6219 100644
--- a/pyfpdb/Charset.py
+++ b/pyfpdb/Charset.py
@@ -29,7 +29,7 @@ encoder_to_sys = codecs.lookup(Configuration.LOCALE_ENCODING)
 
 # I'm saving a few cycles with this one
 not_needed = False
-if Configuration.LOCALE_ENCODING == 'utf-8':
+if Configuration.LOCALE_ENCODING == 'UTF8':
     not_needed = True
 
 def to_utf8(s):

From 5c88c6b0ada42cef0d5a496012fbd08c2bca23f5 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Tue, 26 Jan 2010 21:02:37 +0000
Subject: [PATCH 123/320] put database directory next to HUD_config.xml file

---
 pyfpdb/Configuration.py |  6 ++----
 pyfpdb/fpdb_db.py       | 22 ++++++++++++++++------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py
index abd5b016..80ef0277 100755
--- a/pyfpdb/Configuration.py
+++ b/pyfpdb/Configuration.py
@@ -113,10 +113,6 @@ log = get_logger("logging.conf")
 APPLICATION_NAME_SHORT = 'fpdb'
 APPLICATION_VERSION = 'xx.xx.xx'
 
-DIR_SELF = os.path.dirname(get_exec_path())
-#TODO: imo no good idea to place 'database' in parent dir
-DIR_DATABASES = os.path.join(os.path.dirname(DIR_SELF), 'database')
-
 DATABASE_TYPE_POSTGRESQL = 'postgresql'
 DATABASE_TYPE_SQLITE = 'sqlite'
 DATABASE_TYPE_MYSQL = 'mysql'
@@ -429,6 +425,8 @@ class Config:
 
         self.doc = doc
         self.file = file
+        self.dir = os.path.dirname(self.file)
+        self.dir_databases = os.path.join(self.dir, 'database')
         self.supported_sites = {}
         self.supported_games = {}
         self.supported_databases = {}        # databaseName --> Database instance
diff --git a/pyfpdb/fpdb_db.py b/pyfpdb/fpdb_db.py
index 9f6993b9..514823af 100644
--- a/pyfpdb/fpdb_db.py
+++ b/pyfpdb/fpdb_db.py
@@ -41,6 +41,10 @@ except ImportError:
 import FpdbSQLQueries
 import Configuration
 
+
+DB_VERSION = 118
+
+
 # Variance created as sqlite has a bunch of undefined aggregate functions.
 
 class VARIANCE:
@@ -74,6 +78,7 @@ class fpdb_db:
         if config is None:
             raise FpdbError('Configuration not defined')
 
+        self.config = config
         self.settings = {}
         self.settings['os'] = "linuxmac" if os.name != "nt" else "windows"
 
@@ -95,6 +100,8 @@ class fpdb_db:
         self.user = user
         self.password = password
         self.database = database
+        createTables = False
+        
         if backend == fpdb_db.MYSQL_INNODB:
             import MySQLdb
             if use_pool:
@@ -154,10 +161,12 @@ class fpdb_db:
             else:
                 logging.warning("SQLite won't work well without 'sqlalchemy' installed.")
 
-            if not os.path.isdir(Configuration.DIR_DATABASES) and not database ==  ":memory:":
-                print "Creating directory: '%s'" % (Configuration.DIR_DATABASES)
-                os.mkdir(Configuration.DIR_DATABASES)
-                database = os.path.join(Configuration.DIR_DATABASES, database)
+            if not os.path.isdir(self.config.dir_databases) and not database ==  ":memory:":
+                print "Creating directory: '%s'" % (self.config.dir_databases)
+                logging.info("Creating directory: '%s'" % (self.config.dir_databases))
+                os.mkdir(self.config.dir_databases)
+                database = os.path.join(self.config.dir_databases, database)
+                createTables = True
             self.db = sqlite3.connect(database, detect_types=sqlite3.PARSE_DECLTYPES )
             sqlite3.register_converter("bool", lambda x: bool(int(x)))
             sqlite3.register_adapter(bool, lambda x: "1" if x else "0")
@@ -179,8 +188,9 @@ class fpdb_db:
         try:
             self.cursor.execute("SELECT * FROM Settings")
             settings = self.cursor.fetchone()
-            if settings[0] != 118:
-                print "outdated or too new database version - please recreate tables"
+            if settings[0] != DB_VERSION:
+                logging.error("outdated or too new database version (%s) - please recreate tables"
+                              % (settings[0]))
                 self.wrongDbVersion = True
         except:# _mysql_exceptions.ProgrammingError:
             if database !=  ":memory:": print "failed to read settings table - please recreate tables"

From de2b807c9b5d98d7f71ff2d4fb221dfa1d74676b Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Tue, 26 Jan 2010 21:54:58 +0000
Subject: [PATCH 124/320] refine hud_config handling some more (copies .exmaple
 to proper dir)

---
 pyfpdb/Configuration.py | 20 ++++++++++++--------
 run_fpdb.py             |  5 ++++-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py
index 80ef0277..11d38bf4 100755
--- a/pyfpdb/Configuration.py
+++ b/pyfpdb/Configuration.py
@@ -56,8 +56,7 @@ def get_exec_path():
     if hasattr(sys, "frozen"):  # compiled by py2exe
         return os.path.dirname(sys.executable)
     else:
-        pathname = os.path.dirname(sys.argv[0])
-        return os.path.abspath(pathname)
+        return sys.path[0]
 
 def get_config(file_name, fallback = True):
     """Looks in cwd and in self.default_config_path for a config file."""
@@ -78,14 +77,19 @@ def get_config(file_name, fallback = True):
 #    OK, fall back to the .example file, should be in the start dir
     if os.path.exists(file_name + ".example"):
         try:
-            shutil.copyfile(file_name + ".example", file_name)
+            shutil.copyfile(file_name + ".example", config_path)
             print "No %s found, using %s.example.\n" % (file_name, file_name)
-            print "A %s file has been created.  You will probably have to edit it." % file_name
-            sys.stderr.write("No %s found, using %s.example.\n" % (file_name, file_name) )
+            print "Config file has been created at %s.\nYou will probably have to edit it." % config_path
+            sys.stderr.write("No %s found, copying %s.example.\n" % (file_name, file_name) )
+            file_name = config_path
         except:
-            print "No %s found, cannot fall back. Exiting.\n" % file_name
-            sys.stderr.write("No %s found, cannot fall back. Exiting.\n" % file_name)
+            print "Error copying .example file, cannot fall back. Exiting.\n"
+            sys.stderr.write("Error copying .example file, cannot fall back. Exiting.\n")
             sys.exit()
+    else:
+        print "No %s found, cannot fall back. Exiting.\n" % file_name
+        sys.stderr.write("No %s found, cannot fall back. Exiting.\n" % file_name)
+        sys.exit()
     return file_name
 
 def get_logger(file_name, config = "config", fallback = False):
@@ -408,7 +412,7 @@ class Config:
                 sys.stderr.write("Configuration file %s not found.  Using defaults." % (file))
                 file = None
 
-        if file is None: file = get_config("HUD_config.xml")
+        if file is None: file = get_config("HUD_config.xml", True)
 
 #    Parse even if there was no real config file found and we are using the example
 #    If using the example, we'll edit it later
diff --git a/run_fpdb.py b/run_fpdb.py
index a5c06952..24f6a4dd 100755
--- a/run_fpdb.py
+++ b/run_fpdb.py
@@ -19,8 +19,11 @@
 import os
 import sys
 
-# sys.path[0] holds the dir run_fpdb.py was in
+# sys.path[0] holds the directory run_fpdb.py is in
 sys.path[0] = sys.path[0]+os.sep+"pyfpdb"
+os.chdir(sys.path[0])
+#print "sys.path[0] =", sys.path[0], "cwd =", os.getcwd()
+
 
 import fpdb
 

From b248270135cb2ebdab3ece41a87a8c6c6ef1e5c1 Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Tue, 26 Jan 2010 23:34:08 +0100
Subject: [PATCH 125/320] Sorting routine caused errors when sorted on
 gametype, since it used the starthand sort routine

---
 pyfpdb/GuiPlayerStats.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/GuiPlayerStats.py b/pyfpdb/GuiPlayerStats.py
index 7a3213e8..a8f85c60 100644
--- a/pyfpdb/GuiPlayerStats.py
+++ b/pyfpdb/GuiPlayerStats.py
@@ -278,7 +278,7 @@ class GuiPlayerStats (threading.Thread):
                 except:  a = 0.0
                 try:     b = float(b)
                 except:  b = 0.0
-            if n == 0:
+            if n == 0 and grid == 1: #make sure it only works on the starting hands
                 a1,a2,a3 = ranks[a[0]], ranks[a[1]], (a+'o')[2]
                 b1,b2,b3 = ranks[b[0]], ranks[b[1]], (b+'o')[2]
                 if a1 > b1 or ( a1 == b1 and (a2 > b2 or (a2 == b2 and a3 > b3) ) ):

From f5c910bff07dcac1ecb1196da967143761f21aa3 Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Tue, 26 Jan 2010 23:36:38 +0100
Subject: [PATCH 126/320] clean-up code to get playerId in gui-stats and
 gui-graphs

---
 pyfpdb/GuiGraphViewer.py | 10 +++-------
 pyfpdb/GuiPlayerStats.py | 11 ++++-------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/pyfpdb/GuiGraphViewer.py b/pyfpdb/GuiGraphViewer.py
index ce1df577..f0eca2f1 100644
--- a/pyfpdb/GuiGraphViewer.py
+++ b/pyfpdb/GuiGraphViewer.py
@@ -147,14 +147,10 @@ class GuiGraphViewer (threading.Thread):
             for site in sites:
                 if sites[site] == True:
                     sitenos.append(siteids[site])
-                    c = self.db.get_cursor()
                     _hname = Charset.to_utf8(heroes[site])
-                    # Nasty hack to deal with multiple sites + same player name -Eric
-                    que = self.sql.query['getPlayerId'] + " AND siteId=%d" % siteids[site]
-                    c.execute(que, (_hname,))
-                    result = c.fetchall()
-                    if len(result) == 1:
-                        playerids.append( int(result[0][0]) )
+                    result = self.db.get_player_id(self.conf, site, _hname)
+                    if result is not None:
+                        playerids.append(int(result))
 
             if not sitenos:
                 #Should probably pop up here.
diff --git a/pyfpdb/GuiPlayerStats.py b/pyfpdb/GuiPlayerStats.py
index a8f85c60..2a6ac03f 100644
--- a/pyfpdb/GuiPlayerStats.py
+++ b/pyfpdb/GuiPlayerStats.py
@@ -41,7 +41,7 @@ class GuiPlayerStats (threading.Thread):
         self.conf = config
         self.main_window = mainwin
         self.sql = querylist
-
+        
         self.liststore = []   # gtk.ListStore[]         stores the contents of the grids
         self.listcols = []    # gtk.TreeViewColumn[][]  stores the columns in the grids
 
@@ -189,13 +189,10 @@ class GuiPlayerStats (threading.Thread):
         for site in sites:
             if sites[site] == True:
                 sitenos.append(siteids[site])
-                # Nasty hack to deal with multiple sites + same player name -Eric
-                que = self.sql.query['getPlayerId'] + " AND siteId=%d" % siteids[site]
                 _hname = Charset.to_utf8(heroes[site])
-                self.cursor.execute(que, (_hname,))
-                result = self.db.cursor.fetchall()
-                if len(result) == 1:
-                    playerids.append(result[0][0])
+                result = self.db.get_player_id(self.conf, site, _hname)
+                if result is not None:
+                    playerids.append(int(result))
 
         if not sitenos:
             #Should probably pop up here.

From 47baee65f91fd1a2b6d9ce96052ca8c76b47b395 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Tue, 26 Jan 2010 22:46:48 +0000
Subject: [PATCH 127/320] add tourneyid to hands table (REQUIRES REIMPORT) and
 fix sqlite db access

---
 pyfpdb/Database.py |  1 +
 pyfpdb/SQL.py      |  6 +++++-
 pyfpdb/fpdb_db.py  | 14 ++++++++------
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index 7194b230..c24d13fb 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -1286,6 +1286,7 @@ class Database:
                 p['tableName'], 
                 p['gameTypeId'], 
                 p['siteHandNo'], 
+                0, # tourneyId: 0 means not a tourney hand
                 p['handStart'], 
                 datetime.today(), #importtime
                 p['seats'],
diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py
index 5913c624..5ff4c8e6 100644
--- a/pyfpdb/SQL.py
+++ b/pyfpdb/SQL.py
@@ -214,6 +214,7 @@ class Sql:
                             id BIGINT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
                             tableName VARCHAR(22) NOT NULL,
                             siteHandNo BIGINT NOT NULL,
+                            tourneyId INT UNSIGNED NOT NULL, 
                             gametypeId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (gametypeId) REFERENCES Gametypes(id),
                             handStart DATETIME NOT NULL,
                             importTime DATETIME NOT NULL,
@@ -249,6 +250,7 @@ class Sql:
                             id BIGSERIAL, PRIMARY KEY (id),
                             tableName VARCHAR(22) NOT NULL,
                             siteHandNo BIGINT NOT NULL,
+                            tourneyId INT NOT NULL,
                             gametypeId INT NOT NULL, FOREIGN KEY (gametypeId) REFERENCES Gametypes(id),
                             handStart timestamp without time zone NOT NULL,
                             importTime timestamp without time zone NOT NULL,
@@ -283,6 +285,7 @@ class Sql:
                             id INTEGER PRIMARY KEY,
                             tableName TEXT(22) NOT NULL,
                             siteHandNo INT NOT NULL,
+                            tourneyId INT NOT NULL,
                             gametypeId INT NOT NULL,
                             handStart REAL NOT NULL,
                             importTime REAL NOT NULL,
@@ -3437,6 +3440,7 @@ class Sql:
                                             tablename,
                                             gametypeid,
                                             sitehandno,
+                                            tourneyId,
                                             handstart,
                                             importtime,
                                             seats,
@@ -3467,7 +3471,7 @@ class Sql:
                                              VALUES
                                               (%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)"""
 
 
         self.query['store_hands_players'] = """INSERT INTO HandsPlayers (
diff --git a/pyfpdb/fpdb_db.py b/pyfpdb/fpdb_db.py
index 514823af..bdbf430c 100644
--- a/pyfpdb/fpdb_db.py
+++ b/pyfpdb/fpdb_db.py
@@ -154,19 +154,21 @@ class fpdb_db:
                     print msg
                     raise FpdbError(msg)
         elif backend == fpdb_db.SQLITE:
-            logging.info("Connecting to SQLite:%(database)s" % {'database':database})
+            logging.info("Connecting to SQLite: %(database)s" % {'database':database})
             import sqlite3
             if use_pool:
                 sqlite3 = pool.manage(sqlite3, pool_size=1)
             else:
                 logging.warning("SQLite won't work well without 'sqlalchemy' installed.")
 
-            if not os.path.isdir(self.config.dir_databases) and not database ==  ":memory:":
-                print "Creating directory: '%s'" % (self.config.dir_databases)
-                logging.info("Creating directory: '%s'" % (self.config.dir_databases))
-                os.mkdir(self.config.dir_databases)
+            if database != ":memory:":
+                if not os.path.isdir(self.config.dir_databases):
+                    print "Creating directory: '%s'" % (self.config.dir_databases)
+                    logging.info("Creating directory: '%s'" % (self.config.dir_databases))
+                    os.mkdir(self.config.dir_databases)
+                    createTables = True # not needed? just test for no settings table
                 database = os.path.join(self.config.dir_databases, database)
-                createTables = True
+            logging.info("  sqlite db: " + database)
             self.db = sqlite3.connect(database, detect_types=sqlite3.PARSE_DECLTYPES )
             sqlite3.register_converter("bool", lambda x: bool(int(x)))
             sqlite3.register_adapter(bool, lambda x: "1" if x else "0")

From 11bc48e126dd961fe58dece3ebd519d35edf0056 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Tue, 26 Jan 2010 23:54:04 +0000
Subject: [PATCH 128/320] merge fpdb_db.py into Database.py

---
 pyfpdb/Database.py       | 206 +++++++++++++++++++++++++++++++++----
 pyfpdb/Filters.py        |   8 +-
 pyfpdb/GuiAutoImport.py  |   1 -
 pyfpdb/GuiPlayerStats.py |   1 -
 pyfpdb/Hand.py           |   2 +-
 pyfpdb/SQL.py            |  21 ++++
 pyfpdb/Tourney.py        |   2 +-
 pyfpdb/fpdb.py           |   1 -
 pyfpdb/fpdb_db.py        | 213 ---------------------------------------
 pyfpdb/fpdb_import.py    |   1 -
 10 files changed, 215 insertions(+), 241 deletions(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index c24d13fb..2c649dc4 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -39,11 +39,30 @@ import string
 import re
 import Queue
 import codecs
+import logging
+import math
+
 
 #    pyGTK modules
 
+
+#    Other library modules
+try:
+    import sqlalchemy.pool as pool
+    use_pool = True
+except ImportError:
+    logging.info("Not using sqlalchemy connection pool.")
+    use_pool = False
+
+try:
+    from numpy import var
+    use_numpy = True
+except ImportError:
+    logging.info("Not using numpy to define variance in sqlite.")
+    use_numpy = False
+
+
 #    FreePokerTools modules
-import fpdb_db
 import Configuration
 import SQL
 import Card
@@ -54,6 +73,27 @@ from Exceptions import *
 log = Configuration.get_logger("logging.conf")
 encoder = codecs.lookup('utf-8')
 
+
+DB_VERSION = 118
+
+
+# Variance created as sqlite has a bunch of undefined aggregate functions.
+
+class VARIANCE:
+    def __init__(self):
+        self.store = []
+
+    def step(self, value):
+        self.store.append(value)
+
+    def finalize(self):
+        return float(var(self.store))
+
+class sqlitemath:
+    def mod(self, a, b):
+        return a%b
+
+
 class Database:
 
     MYSQL_INNODB = 2
@@ -190,7 +230,22 @@ class Database:
         log.info("Creating Database instance, sql = %s" % sql)
         self.config = c
         self.__connected = False
-        self.fdb = fpdb_db.fpdb_db()   # sets self.fdb.db self.fdb.cursor and self.fdb.sql
+        self.settings = {}
+        self.settings['os'] = "linuxmac" if os.name != "nt" else "windows"
+        db_params = c.get_db_parameters()
+        self.import_options = c.get_import_parameters()
+        self.backend = db_params['db-backend']
+        self.db_server = db_params['db-server']
+        self.database = db_params['db-databaseName']
+        self.host = db_params['db-host']
+
+        # where possible avoid creating new SQL instance by using the global one passed in
+        if sql is None:
+            self.sql = SQL.Sql(db_server = self.db_server)
+        else:
+            self.sql = sql
+
+        # connect to db
         self.do_connect(c)
         
         if self.backend == self.PGSQL:
@@ -200,12 +255,6 @@ class Database:
             #ISOLATION_LEVEL_SERIALIZABLE   = 2
 
 
-        # where possible avoid creating new SQL instance by using the global one passed in
-        if sql is None:
-            self.sql = SQL.Sql(db_server = self.db_server)
-        else:
-            self.sql = sql
-
         if self.backend == self.SQLITE and self.database == ':memory:' and self.wrongDbVersion:
             log.info("sqlite/:memory: - creating")
             self.recreate_tables()
@@ -228,8 +277,6 @@ class Database:
         self.h_date_ndays_ago = 'd000000'  # date N days ago ('d' + YYMMDD) for hero
         self.date_nhands_ago = {}          # dates N hands ago per player - not used yet
 
-        self.cursor = self.fdb.cursor
-
         self.saveActions = False if self.import_options['saveActions'] == False else True
 
         self.connection.rollback()  # make sure any locks taken so far are released
@@ -240,14 +287,20 @@ class Database:
         self.hud_style = style
 
     def do_connect(self, c):
+        if c is None:
+            raise FpdbError('Configuration not defined')
+
+        db = c.get_db_parameters()
         try:
-            self.fdb.do_connect(c)
+            self.connect(backend=db['db-backend'],
+                         host=db['db-host'],
+                         database=db['db-databaseName'],
+                         user=db['db-user'],
+                         password=db['db-password'])
         except:
             # error during connect
             self.__connected = False
             raise
-        self.connection = self.fdb.db
-        self.wrongDbVersion = self.fdb.wrongDbVersion
 
         db_params = c.get_db_parameters()
         self.import_options = c.get_import_parameters()
@@ -257,11 +310,118 @@ class Database:
         self.host = db_params['db-host']
         self.__connected = True
 
+    def connect(self, backend=None, host=None, database=None,
+                user=None, password=None):
+        """Connects a database with the given parameters"""
+        if backend is None:
+            raise FpdbError('Database backend not defined')
+        self.backend = backend
+        self.host = host
+        self.user = user
+        self.password = password
+        self.database = database
+        self.connection = None
+        self.cursor     = None
+        
+        if backend == Database.MYSQL_INNODB:
+            import MySQLdb
+            if use_pool:
+                MySQLdb = pool.manage(MySQLdb, pool_size=5)
+            try:
+                self.connection = MySQLdb.connect(host=host, user=user, passwd=password, db=database, use_unicode=True)
+            #TODO: Add port option
+            except MySQLdb.Error, ex:
+                if ex.args[0] == 1045:
+                    raise FpdbMySQLAccessDenied(ex.args[0], ex.args[1])
+                elif ex.args[0] == 2002 or ex.args[0] == 2003: # 2002 is no unix socket, 2003 is no tcp socket
+                    raise FpdbMySQLNoDatabase(ex.args[0], ex.args[1])
+                else:
+                    print "*** WARNING UNKNOWN MYSQL ERROR", ex
+        elif backend == Database.PGSQL:
+            import psycopg2
+            import psycopg2.extensions
+            if use_pool:
+                psycopg2 = pool.manage(psycopg2, pool_size=5)
+            psycopg2.extensions.register_type(psycopg2.extensions.UNICODE)
+            # If DB connection is made over TCP, then the variables
+            # host, user and password are required
+            # For local domain-socket connections, only DB name is
+            # needed, and everything else is in fact undefined and/or
+            # flat out wrong
+            # sqlcoder: This database only connect failed in my windows setup??
+            # Modifed it to try the 4 parameter style if the first connect fails - does this work everywhere?
+            connected = False
+            if self.host == "localhost" or self.host == "127.0.0.1":
+                try:
+                    self.connection = psycopg2.connect(database = database)
+                    connected = True
+                except:
+                    # direct connection failed so try user/pass/... version
+                    pass
+            if not connected:
+                try:
+                    self.connection = psycopg2.connect(host = host,
+                                               user = user,
+                                               password = password,
+                                               database = database)
+                except Exception, ex:
+                    if 'Connection refused' in ex.args[0]:
+                        # meaning eg. db not running
+                        raise FpdbPostgresqlNoDatabase(errmsg = ex.args[0])
+                    elif 'password authentication' in ex.args[0]:
+                        raise FpdbPostgresqlAccessDenied(errmsg = ex.args[0])
+                    else:
+                        msg = ex.args[0]
+                    print msg
+                    raise FpdbError(msg)
+        elif backend == Database.SQLITE:
+            logging.info("Connecting to SQLite: %(database)s" % {'database':database})
+            import sqlite3
+            if use_pool:
+                sqlite3 = pool.manage(sqlite3, pool_size=1)
+            else:
+                logging.warning("SQLite won't work well without 'sqlalchemy' installed.")
+
+            if database != ":memory:":
+                if not os.path.isdir(self.config.dir_databases):
+                    print "Creating directory: '%s'" % (self.config.dir_databases)
+                    logging.info("Creating directory: '%s'" % (self.config.dir_databases))
+                    os.mkdir(self.config.dir_databases)
+                database = os.path.join(self.config.dir_databases, database)
+            logging.info("  sqlite db: " + database)
+            self.connection = sqlite3.connect(database, detect_types=sqlite3.PARSE_DECLTYPES )
+            sqlite3.register_converter("bool", lambda x: bool(int(x)))
+            sqlite3.register_adapter(bool, lambda x: "1" if x else "0")
+            self.connection.create_function("floor", 1, math.floor)
+            tmp = sqlitemath()
+            self.connection.create_function("mod", 2, tmp.mod)
+            if use_numpy:
+                self.connection.create_aggregate("variance", 1, VARIANCE)
+            else:
+                logging.warning("Some database functions will not work without NumPy support")
+        else:
+            raise FpdbError("unrecognised database backend:"+backend)
+
+        self.cursor = self.connection.cursor()
+        self.cursor.execute(self.sql.query['set tx level'])
+        self.wrongDbVersion = False
+        try:
+            self.cursor.execute("SELECT * FROM Settings")
+            settings = self.cursor.fetchone()
+            if settings[0] != DB_VERSION:
+                logging.error("outdated or too new database version (%s) - please recreate tables"
+                              % (settings[0]))
+                self.wrongDbVersion = True
+        except:# _mysql_exceptions.ProgrammingError:
+            if database !=  ":memory:": print "failed to read settings table - please recreate tables"
+            self.wrongDbVersion = True
+    #end def connect
+
     def commit(self):
-        self.fdb.db.commit()
+        self.connection.commit()
 
     def rollback(self):
-        self.fdb.db.rollback()
+        self.connection.rollback()
 
     def connected(self):
         return self.__connected
@@ -274,11 +434,18 @@ class Database:
 
     def disconnect(self, due_to_error=False):
         """Disconnects the DB (rolls back if param is true, otherwise commits"""
-        self.fdb.disconnect(due_to_error)
+        if due_to_error:
+            self.connection.rollback()
+        else:
+            self.connection.commit()
+        self.cursor.close()
+        self.connection.close()
     
     def reconnect(self, due_to_error=False):
         """Reconnects the DB"""
-        self.fdb.reconnect(due_to_error=False)
+        #print "started reconnect"
+        self.disconnect(due_to_error)
+        self.connect(self.backend, self.host, self.database, self.user, self.password)
     
     def get_backend_name(self):
         """Returns the name of the currently used backend"""
@@ -291,6 +458,9 @@ class Database:
         else:
             raise FpdbError("invalid backend")
 
+    def get_db_info(self):
+        return (self.host, self.database, self.user, self.password)
+
     def get_table_name(self, hand_id):
         c = self.connection.cursor()
         c.execute(self.sql.query['get_table_name'], (hand_id, ))
@@ -1267,7 +1437,7 @@ class Database:
         try:
             self.get_cursor().execute(self.sql.query['lockForInsert'])
         except:
-            print "Error during fdb.lock_for_insert:", str(sys.exc_value)
+            print "Error during lock_for_insert:", str(sys.exc_value)
     #end def lock_for_insert
 
 ###########################
diff --git a/pyfpdb/Filters.py b/pyfpdb/Filters.py
index b0da336b..3a331bfd 100644
--- a/pyfpdb/Filters.py
+++ b/pyfpdb/Filters.py
@@ -27,8 +27,8 @@ import gobject
 #import pokereval
 
 import Configuration
-import fpdb_db
-import FpdbSQLQueries
+import Database
+import SQL
 import Charset
 
 class Filters(threading.Thread):
@@ -790,10 +790,10 @@ def main(argv=None):
     config = Configuration.Config()
     db = None
 
-    db = fpdb_db.fpdb_db()
+    db = Database.Database()
     db.do_connect(config)
 
-    qdict = FpdbSQLQueries.FpdbSQLQueries(db.get_backend_name())
+    qdict = SQL.SQL(db.get_backend_name())
 
     i = Filters(db, config, qdict)
     main_window = gtk.Window()
diff --git a/pyfpdb/GuiAutoImport.py b/pyfpdb/GuiAutoImport.py
index 517293ec..f9f1c335 100755
--- a/pyfpdb/GuiAutoImport.py
+++ b/pyfpdb/GuiAutoImport.py
@@ -300,7 +300,6 @@ if __name__== "__main__":
     (options, argv) = parser.parse_args()
 
     config = Configuration.Config()
-#    db = fpdb_db.fpdb_db()
 
     settings = {}
     settings['minPrint'] = options.minPrint
diff --git a/pyfpdb/GuiPlayerStats.py b/pyfpdb/GuiPlayerStats.py
index 7a3213e8..c634538e 100644
--- a/pyfpdb/GuiPlayerStats.py
+++ b/pyfpdb/GuiPlayerStats.py
@@ -27,7 +27,6 @@ from time import time, strftime
 import Card
 import fpdb_import
 import Database
-import fpdb_db
 import Filters
 import Charset
 
diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index d2b795e6..3906b00c 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -205,7 +205,7 @@ dealt   whether they were seen in a 'dealt to' line
     def insert(self, db):
         """ Function to insert Hand into database
 Should not commit, and do minimal selects. Callers may want to cache commits
-db: a connected fpdb_db object"""
+db: a connected Database object"""
 
 
         self.stats.getStats(self)
diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py
index 5ff4c8e6..43925c01 100644
--- a/pyfpdb/SQL.py
+++ b/pyfpdb/SQL.py
@@ -58,6 +58,27 @@ class Sql:
         self.query['drop_table'] = """DROP TABLE IF EXISTS """   
 
 
+        ##################################################################
+        # Set transaction isolation level
+        ##################################################################
+
+        if db_server == 'mysql' or db_server == 'postgresql':
+            self.query['set tx level'] = """SET SESSION TRANSACTION
+            ISOLATION LEVEL READ COMMITTED"""
+        elif db_server == 'sqlite':
+            self.query['set tx level'] = """ """
+
+
+        ################################
+        # Select basic info
+        ################################
+
+        self.query['getSiteId'] = """SELECT id from Sites where name = %s"""
+
+        self.query['getGames'] = """SELECT DISTINCT category from Gametypes"""
+        
+        self.query['getLimits'] = """SELECT DISTINCT bigBlind from Gametypes ORDER by bigBlind DESC"""
+
         ################################
         # Create Settings
         ################################
diff --git a/pyfpdb/Tourney.py b/pyfpdb/Tourney.py
index 8f7e59c5..281a6710 100644
--- a/pyfpdb/Tourney.py
+++ b/pyfpdb/Tourney.py
@@ -185,7 +185,7 @@ class Tourney(object):
     def old_insert_from_Hand(self, db):
         """ Function to insert Hand into database
 Should not commit, and do minimal selects. Callers may want to cache commits
-db: a connected fpdb_db object"""
+db: a connected Database object"""
         # TODO:
         # Players - base playerid and siteid tuple
         sqlids = db.getSqlPlayerIDs([p[1] for p in self.players], self.siteId)
diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py
index bff044d5..5136d56b 100755
--- a/pyfpdb/fpdb.py
+++ b/pyfpdb/fpdb.py
@@ -112,7 +112,6 @@ import GuiGraphViewer
 import GuiSessionViewer
 import SQL
 import Database
-import FpdbSQLQueries
 import Configuration
 import Exceptions
 
diff --git a/pyfpdb/fpdb_db.py b/pyfpdb/fpdb_db.py
index bdbf430c..2c70dd55 100644
--- a/pyfpdb/fpdb_db.py
+++ b/pyfpdb/fpdb_db.py
@@ -16,219 +16,6 @@
 #In the "official" distribution you can find the license in
 #agpl-3.0.txt in the docs folder of the package.
 
-import os
-import re
-import sys
-import logging
-import math
-from time import time, strftime
-from Exceptions import *
 
-try:
-    import sqlalchemy.pool as pool
-    use_pool = True
-except ImportError:
-    logging.info("Not using sqlalchemy connection pool.")
-    use_pool = False
-
-try:
-    from numpy import var
-    use_numpy = True
-except ImportError:
-    logging.info("Not using numpy to define variance in sqlite.")
-    use_numpy = False
-
-import FpdbSQLQueries
-import Configuration
-
-
-DB_VERSION = 118
-
-
-# Variance created as sqlite has a bunch of undefined aggregate functions.
-
-class VARIANCE:
-    def __init__(self):
-        self.store = []
-
-    def step(self, value):
-        self.store.append(value)
-
-    def finalize(self):
-        return float(var(self.store))
-
-class sqlitemath:
-    def mod(self, a, b):
-        return a%b
-
-class fpdb_db:
-    MYSQL_INNODB = 2
-    PGSQL = 3
-    SQLITE = 4
-
-    def __init__(self):
-        """Simple constructor, doesnt really do anything"""
-        self.db             = None
-        self.cursor         = None
-        self.sql            = {}
-    #end def __init__
-
-    def do_connect(self, config=None):
-        """Connects a database using information in config"""
-        if config is None:
-            raise FpdbError('Configuration not defined')
-
-        self.config = config
-        self.settings = {}
-        self.settings['os'] = "linuxmac" if os.name != "nt" else "windows"
-
-        db = config.get_db_parameters()
-        self.connect(backend=db['db-backend'],
-                     host=db['db-host'],
-                     database=db['db-databaseName'],
-                     user=db['db-user'],
-                     password=db['db-password'])
-    #end def do_connect
-
-    def connect(self, backend=None, host=None, database=None,
-                user=None, password=None):
-        """Connects a database with the given parameters"""
-        if backend is None:
-            raise FpdbError('Database backend not defined')
-        self.backend = backend
-        self.host = host
-        self.user = user
-        self.password = password
-        self.database = database
-        createTables = False
-        
-        if backend == fpdb_db.MYSQL_INNODB:
-            import MySQLdb
-            if use_pool:
-                MySQLdb = pool.manage(MySQLdb, pool_size=5)
-            try:
-                self.db = MySQLdb.connect(host=host, user=user, passwd=password, db=database, use_unicode=True)
-            #TODO: Add port option
-            except MySQLdb.Error, ex:
-                if ex.args[0] == 1045:
-                    raise FpdbMySQLAccessDenied(ex.args[0], ex.args[1])
-                elif ex.args[0] == 2002 or ex.args[0] == 2003: # 2002 is no unix socket, 2003 is no tcp socket
-                    raise FpdbMySQLNoDatabase(ex.args[0], ex.args[1])
-                else:
-                    print "*** WARNING UNKNOWN MYSQL ERROR", ex
-        elif backend == fpdb_db.PGSQL:
-            import psycopg2
-            import psycopg2.extensions
-            if use_pool:
-                psycopg2 = pool.manage(psycopg2, pool_size=5)
-            psycopg2.extensions.register_type(psycopg2.extensions.UNICODE)
-            # If DB connection is made over TCP, then the variables
-            # host, user and password are required
-            # For local domain-socket connections, only DB name is
-            # needed, and everything else is in fact undefined and/or
-            # flat out wrong
-            # sqlcoder: This database only connect failed in my windows setup??
-            # Modifed it to try the 4 parameter style if the first connect fails - does this work everywhere?
-            connected = False
-            if self.host == "localhost" or self.host == "127.0.0.1":
-                try:
-                    self.db = psycopg2.connect(database = database)
-                    connected = True
-                except:
-                    # direct connection failed so try user/pass/... version
-                    pass
-            if not connected:
-                try:
-                    self.db = psycopg2.connect(host = host,
-                                               user = user,
-                                               password = password,
-                                               database = database)
-                except Exception, ex:
-                    if 'Connection refused' in ex.args[0]:
-                        # meaning eg. db not running
-                        raise FpdbPostgresqlNoDatabase(errmsg = ex.args[0])
-                    elif 'password authentication' in ex.args[0]:
-                        raise FpdbPostgresqlAccessDenied(errmsg = ex.args[0])
-                    else:
-                        msg = ex.args[0]
-                    print msg
-                    raise FpdbError(msg)
-        elif backend == fpdb_db.SQLITE:
-            logging.info("Connecting to SQLite: %(database)s" % {'database':database})
-            import sqlite3
-            if use_pool:
-                sqlite3 = pool.manage(sqlite3, pool_size=1)
-            else:
-                logging.warning("SQLite won't work well without 'sqlalchemy' installed.")
-
-            if database != ":memory:":
-                if not os.path.isdir(self.config.dir_databases):
-                    print "Creating directory: '%s'" % (self.config.dir_databases)
-                    logging.info("Creating directory: '%s'" % (self.config.dir_databases))
-                    os.mkdir(self.config.dir_databases)
-                    createTables = True # not needed? just test for no settings table
-                database = os.path.join(self.config.dir_databases, database)
-            logging.info("  sqlite db: " + database)
-            self.db = sqlite3.connect(database, detect_types=sqlite3.PARSE_DECLTYPES )
-            sqlite3.register_converter("bool", lambda x: bool(int(x)))
-            sqlite3.register_adapter(bool, lambda x: "1" if x else "0")
-            self.db.create_function("floor", 1, math.floor)
-            tmp = sqlitemath()
-            self.db.create_function("mod", 2, tmp.mod)
-            if use_numpy:
-                self.db.create_aggregate("variance", 1, VARIANCE)
-            else:
-                logging.warning("Some database functions will not work without NumPy support")
-        else:
-            raise FpdbError("unrecognised database backend:"+backend)
-
-        self.cursor = self.db.cursor()
-        # Set up query dictionary as early in the connection process as we can.
-        self.sql = FpdbSQLQueries.FpdbSQLQueries(self.get_backend_name())
-        self.cursor.execute(self.sql.query['set tx level'])
-        self.wrongDbVersion = False
-        try:
-            self.cursor.execute("SELECT * FROM Settings")
-            settings = self.cursor.fetchone()
-            if settings[0] != DB_VERSION:
-                logging.error("outdated or too new database version (%s) - please recreate tables"
-                              % (settings[0]))
-                self.wrongDbVersion = True
-        except:# _mysql_exceptions.ProgrammingError:
-            if database !=  ":memory:": print "failed to read settings table - please recreate tables"
-            self.wrongDbVersion = True
-    #end def connect
-
-    def disconnect(self, due_to_error=False):
-        """Disconnects the DB"""
-        if due_to_error:
-            self.db.rollback()
-        else:
-            self.db.commit()
-        self.cursor.close()
-        self.db.close()
-    #end def disconnect
-
-    def reconnect(self, due_to_error=False):
-        """Reconnects the DB"""
-        #print "started fpdb_db.reconnect"
-        self.disconnect(due_to_error)
-        self.connect(self.backend, self.host, self.database, self.user, self.password)
-
-    def get_backend_name(self):
-        """Returns the name of the currently used backend"""
-        if self.backend==2:
-            return "MySQL InnoDB"
-        elif self.backend==3:
-            return "PostgreSQL"
-        elif self.backend==4:
-            return "SQLite"
-        else:
-            raise FpdbError("invalid backend")
-    #end def get_backend_name
-
-    def get_db_info(self):
-        return (self.host, self.database, self.user, self.password)
-    #end def get_db_info
 
 #end class fpdb_db
diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index 76705839..fe66fcda 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -35,7 +35,6 @@ import gtk
 
 #    fpdb/FreePokerTools modules
 
-import fpdb_db
 import Database
 import Configuration
 import Exceptions

From 5a9836862f20dc157f4e53e7580821985d035fb4 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Wed, 27 Jan 2010 00:48:02 +0000
Subject: [PATCH 129/320] sqlite mods, made sqlite the default in
 HUD_config.xml.example - works (roughly) straight out of the box

---
 pyfpdb/Database.py            | 28 ++++++++++++++++++++++++----
 pyfpdb/HUD_config.xml.example |  4 ++--
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index 2c649dc4..ddd810ca 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -74,7 +74,7 @@ log = Configuration.get_logger("logging.conf")
 encoder = codecs.lookup('utf-8')
 
 
-DB_VERSION = 118
+DB_VERSION = 119
 
 
 # Variance created as sqlite has a bunch of undefined aggregate functions.
@@ -404,6 +404,10 @@ class Database:
 
         self.cursor = self.connection.cursor()
         self.cursor.execute(self.sql.query['set tx level'])
+        self.check_version(database=database, create=True)
+
+
+    def check_version(self, database, create):
         self.wrongDbVersion = False
         try:
             self.cursor.execute("SELECT * FROM Settings")
@@ -413,8 +417,23 @@ class Database:
                               % (settings[0]))
                 self.wrongDbVersion = True
         except:# _mysql_exceptions.ProgrammingError:
-            if database !=  ":memory:": print "failed to read settings table - please recreate tables"
-            self.wrongDbVersion = True
+            if database !=  ":memory:":
+                if create:
+                    print "Failed to read settings table - recreating tables"
+                    log.info("failed to read settings table - recreating tables")
+                    self.recreate_tables()
+                    self.check_version(database=database, create=False)
+                    if not self.wrongDbVersion:
+                        msg = "Edit your screen_name and hand history path in the supported_sites "\
+                              +"section of the \nPreferences window (Main menu) before trying to import hands"
+                        print "\n%s" % msg
+                        log.warning(msg)
+                else:
+                    print "Failed to read settings table - please recreate tables"
+                    log.info("failed to read settings table - please recreate tables")
+                    self.wrongDbVersion = True
+            else:
+                self.wrongDbVersion = True
     #end def connect
 
     def commit(self):
@@ -1016,6 +1035,7 @@ class Database:
         self.create_tables()
         self.createAllIndexes()
         self.commit()
+        print "Finished recreating tables"
         log.info("Finished recreating tables")
     #end def recreate_tables
 
@@ -1281,7 +1301,7 @@ class Database:
     
     def fillDefaultData(self):
         c = self.get_cursor() 
-        c.execute("INSERT INTO Settings (version) VALUES (118);")
+        c.execute("INSERT INTO Settings (version) VALUES (%s);" % (DB_VERSION))
         c.execute("INSERT INTO Sites (name,currency) VALUES ('Full Tilt Poker', 'USD')")
         c.execute("INSERT INTO Sites (name,currency) VALUES ('PokerStars', 'USD')")
         c.execute("INSERT INTO Sites (name,currency) VALUES ('Everleaf', 'USD')")
diff --git a/pyfpdb/HUD_config.xml.example b/pyfpdb/HUD_config.xml.example
index 3acfd812..8b53e609 100644
--- a/pyfpdb/HUD_config.xml.example
+++ b/pyfpdb/HUD_config.xml.example
@@ -588,8 +588,8 @@ Left-Drag to Move"
     </hhcs>
 
     <supported_databases>
-        <database db_name="fpdb" db_server="mysql" db_ip="localhost" db_user="fpdb" db_pass="YOUR MYSQL PASSWORD"></database>
-        <!-- <database db_ip="localhost" db_name="fpdb" db_pass="fpdb" db_server="sqlite" db_user="fpdb"/> -->
+        <!-- <database db_name="fpdb" db_server="mysql" db_ip="localhost" db_user="fpdb" db_pass="YOUR MYSQL PASSWORD"></database> -->
+        <database db_ip="localhost" db_server="sqlite" db_name="fpdb.db3" db_user="fpdb" db_pass="fpdb"/>
     </supported_databases>
 
 </FreePokerToolsConfig>

From 241dc1e717e276d675ce71c65a7e7921e1edba86 Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Sat, 23 Jan 2010 16:24:00 +0100
Subject: [PATCH 130/320] Fixed limit and freeroll support for Partypoker
 tourney's

---
 pyfpdb/PartyPokerToFpdb.py | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/pyfpdb/PartyPokerToFpdb.py b/pyfpdb/PartyPokerToFpdb.py
index 4cf64547..3d5a959b 100755
--- a/pyfpdb/PartyPokerToFpdb.py
+++ b/pyfpdb/PartyPokerToFpdb.py
@@ -55,22 +55,22 @@ class PartyPoker(HandHistoryConverter):
     # $5 USD NL Texas Hold'em - Saturday, July 25, 07:53:52 EDT 2009
     # NL Texas Hold'em $1 USD Buy-in Trny:45685440 Level:8  Blinds-Antes(600/1 200 -50) - Sunday, May 17, 11:25:07 MSKS 2009
     re_GameInfoRing     = re.compile("""
-            (?P<CURRENCY>\$|)\s*(?P<RINGLIMIT>[0-9,]+)\s*(?:USD)?\s*
-            (?P<LIMIT>(NL|PL|))\s+
+            (?P<CURRENCY>\$|)\s*(?P<RINGLIMIT>[.,0-9]+)([.,0-9/$]+)?\s*(?:USD)?\s*
+            (?P<LIMIT>(NL|PL|))\s*
             (?P<GAME>(Texas\ Hold\'em|Omaha))
             \s*\-\s*
             (?P<DATETIME>.+)
             """, re.VERBOSE)
     re_GameInfoTrny     = re.compile("""
-            (?P<LIMIT>(NL|PL|))\s+
+            (?P<LIMIT>(NL|PL|))\s*
             (?P<GAME>(Texas\ Hold\'em|Omaha))\s+
-            (?P<BUYIN>\$?[.0-9]+)\s*(?P<BUYIN_CURRENCY>USD)?\s*Buy-in\s+
+            (?:(?P<BUYIN>\$?[.,0-9]+)\s*(?P<BUYIN_CURRENCY>USD)?\s*Buy-in\s+)?
             Trny:\s?(?P<TOURNO>\d+)\s+
             Level:\s*(?P<LEVEL>\d+)\s+
-            Blinds(?:-Antes)?\(
-                (?P<SB>[.0-9 ]+)\s*
-                /(?P<BB>[.0-9 ]+)
-                (?:\s*-\s*(?P<ANTE>[.0-9 ]+)\$?)?
+            ((Blinds|Stakes)(?:-Antes)?)\(
+                (?P<SB>[.,0-9 ]+)\s*
+                /(?P<BB>[.,0-9 ]+)
+                (?:\s*-\s*(?P<ANTE>[.,0-9 ]+)\$?)?
             \)
             \s*\-\s*
             (?P<DATETIME>.+)
@@ -85,10 +85,9 @@ class PartyPoker(HandHistoryConverter):
           re.VERBOSE)
 
     re_HandInfo     = re.compile("""
-            ^Table\s+
-            (?P<TTYPE>[a-zA-Z0-9 ]+)\s+
+            ^Table\s+(?P<TTYPE>[$a-zA-Z0-9 ]+)\s+
             (?: \#|\(|)(?P<TABLE>\d+)\)?\s+
-            (?:[^ ]+\s+\#(?P<MTTTABLE>\d+).+)? # table number for mtt
+            (?:[a-zA-Z0-9 ]+\s+\#(?P<MTTTABLE>\d+).+)?
             (\(No\sDP\)\s)?
             \((?P<PLAY>Real|Play)\s+Money\)\s+ # FIXME: check if play money is correct
             Seat\s+(?P<BUTTON>\d+)\sis\sthe\sbutton
@@ -136,17 +135,17 @@ class PartyPoker(HandHistoryConverter):
             log.debug("CUR_SYM: '%s'" % subst['CUR_SYM'])
             log.debug("CUR: '%s'" % subst['CUR'])
             self.re_PostSB = re.compile(
-                r"^%(PLYR)s posts small blind \[%(CUR_SYM)s(?P<SB>[.0-9]+) ?%(CUR)s\]\." %  subst,
+                r"^%(PLYR)s posts small blind \[%(CUR_SYM)s(?P<SB>[.,0-9]+) ?%(CUR)s\]\." %  subst,
                 re.MULTILINE)
             self.re_PostBB = re.compile(
-                r"^%(PLYR)s posts big blind \[%(CUR_SYM)s(?P<BB>[.0-9]+) ?%(CUR)s\]\." %  subst,
+                r"^%(PLYR)s posts big blind \[%(CUR_SYM)s(?P<BB>[.,0-9]+) ?%(CUR)s\]\." %  subst,
                 re.MULTILINE)
             # NOTE: comma is used as a fraction part delimeter in re below
             self.re_PostDead = re.compile(
                 r"^%(PLYR)s posts big blind \+ dead \[(?P<BBNDEAD>[.,0-9]+) ?%(CUR_SYM)s\]\." %  subst,
                 re.MULTILINE)
             self.re_Antes = re.compile(
-                r"^%(PLYR)s posts ante \[%(CUR_SYM)s(?P<ANTE>[.0-9]+) ?%(CUR)s\]" %  subst,
+                r"^%(PLYR)s posts ante \[%(CUR_SYM)s(?P<ANTE>[.,0-9]+) ?%(CUR)s\]" %  subst,
                 re.MULTILINE)
             self.re_HeroCards = re.compile(
                 r"^Dealt to %(PLYR)s \[\s*(?P<NEWCARDS>.+)\s*\]" % subst,
@@ -310,6 +309,10 @@ class PartyPoker(HandHistoryConverter):
                 hand.handid = info[key]
             if key == 'TABLE':
                 hand.tablename = info[key]
+            if key == 'MTTTABLE':
+            	if info[key] != None:
+            		hand.tablename = info[key]
+            		hand.tourNo = info['TABLE']
             if key == 'BUTTON':
                 hand.buttonpos = info[key]
             if key == 'TOURNO':
@@ -317,8 +320,11 @@ class PartyPoker(HandHistoryConverter):
             if key == 'BUYIN':
                 # FIXME: it's dirty hack T_T
                 # code below assumes that tournament rake is equal to zero
-                cur = info[key][0] if info[key][0] not in '0123456789' else ''
-                hand.buyin = info[key] + '+%s0' % cur
+                if info[key] == None:
+                    hand.buyin = '$0+$0'
+                else:
+                    cur = info[key][0] if info[key][0] not in '0123456789' else ''
+                    hand.buyin = info[key] + '+%s0' % cur
             if key == 'LEVEL':
                 hand.level = info[key]
             if key == 'PLAY' and info['PLAY'] != 'Real':

From fb7aae91862c37bb4a0c56a43d22b1bc6ab82c81 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Wed, 27 Jan 2010 13:04:13 +0800
Subject: [PATCH 131/320] clean-up code to get playerId in gui-stats and
 gui-graphs

Conflicts:

	pyfpdb/GuiGraphViewer.py
---
 pyfpdb/GuiGraphViewer.py |  8 +++-----
 pyfpdb/GuiPlayerStats.py | 11 ++++-------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/pyfpdb/GuiGraphViewer.py b/pyfpdb/GuiGraphViewer.py
index 3351b70f..f0eca2f1 100644
--- a/pyfpdb/GuiGraphViewer.py
+++ b/pyfpdb/GuiGraphViewer.py
@@ -147,12 +147,10 @@ class GuiGraphViewer (threading.Thread):
             for site in sites:
                 if sites[site] == True:
                     sitenos.append(siteids[site])
-                    c = self.db.get_cursor()
                     _hname = Charset.to_utf8(heroes[site])
-                    c.execute(self.sql.query['getPlayerId'], (_hname,))
-                    result = c.fetchall()
-                    if len(result) == 1:
-                        playerids.append( int(result[0][0]) )
+                    result = self.db.get_player_id(self.conf, site, _hname)
+                    if result is not None:
+                        playerids.append(int(result))
 
             if not sitenos:
                 #Should probably pop up here.
diff --git a/pyfpdb/GuiPlayerStats.py b/pyfpdb/GuiPlayerStats.py
index 7a3213e8..13ddf21a 100644
--- a/pyfpdb/GuiPlayerStats.py
+++ b/pyfpdb/GuiPlayerStats.py
@@ -41,7 +41,7 @@ class GuiPlayerStats (threading.Thread):
         self.conf = config
         self.main_window = mainwin
         self.sql = querylist
-
+        
         self.liststore = []   # gtk.ListStore[]         stores the contents of the grids
         self.listcols = []    # gtk.TreeViewColumn[][]  stores the columns in the grids
 
@@ -189,13 +189,10 @@ class GuiPlayerStats (threading.Thread):
         for site in sites:
             if sites[site] == True:
                 sitenos.append(siteids[site])
-                # Nasty hack to deal with multiple sites + same player name -Eric
-                que = self.sql.query['getPlayerId'] + " AND siteId=%d" % siteids[site]
                 _hname = Charset.to_utf8(heroes[site])
-                self.cursor.execute(que, (_hname,))
-                result = self.db.cursor.fetchall()
-                if len(result) == 1:
-                    playerids.append(result[0][0])
+                result = self.db.get_player_id(self.conf, site, _hname)
+                if result is not None:
+                    playerids.append(int(result))
 
         if not sitenos:
             #Should probably pop up here.

From 6c5c479ee884bd0efb23cac1b609ada1cac5fb95 Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Tue, 26 Jan 2010 20:25:04 +0100
Subject: [PATCH 132/320] Autocomplete Hero names only lists the valid names
 for that pokersite SiteID list needed to be filled before the Hero field was
 filled.

---
 pyfpdb/Filters.py | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/pyfpdb/Filters.py b/pyfpdb/Filters.py
index b0da336b..37a31c9e 100644
--- a/pyfpdb/Filters.py
+++ b/pyfpdb/Filters.py
@@ -51,6 +51,16 @@ class Filters(threading.Thread):
         self.heroes = {}
         self.boxes  = {}
 
+        for site in self.conf.get_supported_sites():
+            #Get db site id for filtering later
+            self.cursor.execute(self.sql.query['getSiteId'], (site,))
+            result = self.db.cursor.fetchall()
+            if len(result) == 1:
+                self.siteid[site] = result[0][0]
+            else:
+                print "Either 0 or more than one site matched - EEK"
+
+
         # text used on screen stored here so that it can be configured
         self.filterText = {'limitsall':'All', 'limitsnone':'None', 'limitsshow':'Show _Limits'
                           ,'seatsbetween':'Between:', 'seatsand':'And:', 'seatsshow':'Show Number of _Players'
@@ -259,7 +269,7 @@ class Filters(threading.Thread):
         liststore = gtk.ListStore(gobject.TYPE_STRING)
         completion.set_model(liststore)
         completion.set_text_column(0)
-        names = self.db.get_player_names(self.conf)  # (config=self.conf, site_id=None, like_player_name="%")
+        names = self.db.get_player_names(self.conf, self.siteid[site])  # (config=self.conf, site_id=None, like_player_name="%")
         for n in names: # list of single-element "tuples"
             _n = Charset.to_gui(n[0])
             _nt = (_n, )
@@ -487,12 +497,12 @@ class Filters(threading.Thread):
             vbox.pack_start(hbox, False, True, 0)
             self.createSiteLine(hbox, site)
             #Get db site id for filtering later
-            self.cursor.execute(self.sql.query['getSiteId'], (site,))
-            result = self.db.cursor.fetchall()
-            if len(result) == 1:
-                self.siteid[site] = result[0][0]
-            else:
-                print "Either 0 or more than one site matched - EEK"
+            #self.cursor.execute(self.sql.query['getSiteId'], (site,))
+            #result = self.db.cursor.fetchall()
+            #if len(result) == 1:
+            #    self.siteid[site] = result[0][0]
+            #else:
+            #    print "Either 0 or more than one site matched - EEK"
 
     def fillGamesFrame(self, vbox):
         self.cursor.execute(self.sql.query['getGames'])

From e0d11fe9a3a1bf945d0de47e0ffaa3e074096a7c Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Tue, 26 Jan 2010 10:56:07 -0500
Subject: [PATCH 133/320] Fix problem with finding HHs for utf-16 files.

---
 pyfpdb/HandHistoryConverter.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index c0374143..bec2ebae 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -440,10 +440,9 @@ or None if we fail to get the info """
                     #print "trying", kodec
                     try:
                         in_fh = codecs.open(self.in_path, 'r', kodec)
-                        in_fh.seek(self.index)
-                        log.debug("Opened in_path: '%s' with %s" % (self.in_path, kodec))
-                        self.obs = in_fh.read()
-                        self.index = in_fh.tell()
+                        whole_file = in_fh.read()
+                        self.obs = whole_file[self.index:]
+                        self.index = len(whole_file)
                         in_fh.close()
                         break
                     except:

From 30de5142dba66468236c09eb2079ba7a099d2800 Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Wed, 27 Jan 2010 00:57:58 -0500
Subject: [PATCH 134/320] Ugly fix to ugly edge case where winner voluntarily
 showed cards.

---
 pyfpdb/FulltiltToFpdb.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index 1721236a..44b6890e 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -268,7 +268,8 @@ class Fulltilt(HandHistoryConverter):
 
         players = []
         for a in m:
-            hand.addPlayer(int(a.group('SEAT')), a.group('PNAME'), a.group('CASH'))
+            if not re.search(" collected", a.group('PNAME')):
+                hand.addPlayer(int(a.group('SEAT')), a.group('PNAME'), a.group('CASH'))
 
     def markStreets(self, hand):
         # PREFLOP = ** Dealing down cards **

From d75e5e39208f13877ebeda46000d3fb6d4088236 Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Wed, 27 Jan 2010 01:10:58 -0500
Subject: [PATCH 135/320] Fixed typos, pylint complaints, and obsolete TODOs.

---
 pyfpdb/FulltiltToFpdb.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index 44b6890e..eeefbf90 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -18,12 +18,10 @@
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ########################################################################
 
-import sys
 import logging
 from HandHistoryConverter import *
 
 # Fulltilt HH Format converter
-# TODO: cat tourno and table to make table name for tournaments
 
 class Fulltilt(HandHistoryConverter):
     
@@ -191,7 +189,6 @@ class Fulltilt(HandHistoryConverter):
         if mg['TOURNO'] is None:  info['type'] = "ring"
         else:                     info['type'] = "tour"
         # NB: SB, BB must be interpreted as blinds or bets depending on limit type.
-#        if info['type'] == "tour": return None # importer is screwed on tournies, pass on those hands so we don't interrupt other autoimporting
         return info
 
     def readHandInfo(self, hand):
@@ -266,7 +263,6 @@ class Fulltilt(HandHistoryConverter):
         else:   #if hand.gametype['type'] == "tour"
             m = self.re_TourneyPlayerInfo.finditer(hand.handText)
 
-        players = []
         for a in m:
             if not re.search(" collected", a.group('PNAME')):
                 hand.addPlayer(int(a.group('SEAT')), a.group('PNAME'), a.group('CASH'))
@@ -423,7 +419,6 @@ class Fulltilt(HandHistoryConverter):
             hand.mixed = self.mixes[m.groupdict()['MIXED']]
 
     def readSummaryInfo(self, summaryInfoList):
-        starttime = time.time()
         self.status = True
 
         m = re.search("Tournament Summary", summaryInfoList[0])
@@ -543,14 +538,14 @@ class Fulltilt(HandHistoryConverter):
                         tourney.buyin = 100*Decimal(re.sub(u',', u'', "%s" % mg['BUYIN']))
                     else :
                         if 100*Decimal(re.sub(u',', u'', "%s" % mg['BUYIN'])) != tourney.buyin:
-                            log.error( "Conflict between buyins read in topline (%s) and in BuyIn field (%s)" % (touney.buyin, 100*Decimal(re.sub(u',', u'', "%s" % mg['BUYIN']))) )
+                            log.error( "Conflict between buyins read in topline (%s) and in BuyIn field (%s)" % (tourney.buyin, 100*Decimal(re.sub(u',', u'', "%s" % mg['BUYIN']))) )
                             tourney.subTourneyBuyin = 100*Decimal(re.sub(u',', u'', "%s" % mg['BUYIN']))
                 if mg['FEE'] is not None:
                     if tourney.fee is None:
                         tourney.fee = 100*Decimal(re.sub(u',', u'', "%s" % mg['FEE']))
                     else :
                         if 100*Decimal(re.sub(u',', u'', "%s" % mg['FEE'])) != tourney.fee:
-                            log.error( "Conflict between fees read in topline (%s) and in BuyIn field (%s)" % (touney.fee, 100*Decimal(re.sub(u',', u'', "%s" % mg['FEE']))) )
+                            log.error( "Conflict between fees read in topline (%s) and in BuyIn field (%s)" % (tourney.fee, 100*Decimal(re.sub(u',', u'', "%s" % mg['FEE']))) )
                             tourney.subTourneyFee = 100*Decimal(re.sub(u',', u'', "%s" % mg['FEE']))
 
         if tourney.buyin is None:

From 8dea5092455f02c32ffd4d5554b65b3b5aec43b9 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Wed, 27 Jan 2010 18:02:30 +0800
Subject: [PATCH 136/320] FulltiltToFpdb: partially fix player ids

_mysql_exceptions.IntegrityError: (1062, "Duplicate entry 'romatrifon (small blind) showed -1' for key 'name'")

Previous regex was matching past the name.
---
 pyfpdb/FulltiltToFpdb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index 1721236a..28c2c57e 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -68,7 +68,7 @@ class Fulltilt(HandHistoryConverter):
                                     ''', re.VERBOSE)
     re_Button       = re.compile('^The button is in seat #(?P<BUTTON>\d+)', re.MULTILINE)
     re_PlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\$(?P<CASH>[,.0-9]+)\)$', re.MULTILINE)
-    re_TourneyPlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\$?(?P<CASH>[,.0-9]+)\)', re.MULTILINE)
+    re_TourneyPlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\$?(?P<CASH>[,.0-9]+)\)$', re.MULTILINE)
     re_Board        = re.compile(r"\[(?P<CARDS>.+)\]")
 
     #static regex for tourney purpose

From 929e182a28ecd163accbab6d615d25b504ca9f64 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Wed, 27 Jan 2010 18:20:48 +0800
Subject: [PATCH 137/320] FulltiltToFpdb: Fix tourney player matching for
 players sitting out

---
 pyfpdb/FulltiltToFpdb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index 28c2c57e..19f834e6 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -68,7 +68,7 @@ class Fulltilt(HandHistoryConverter):
                                     ''', re.VERBOSE)
     re_Button       = re.compile('^The button is in seat #(?P<BUTTON>\d+)', re.MULTILINE)
     re_PlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\$(?P<CASH>[,.0-9]+)\)$', re.MULTILINE)
-    re_TourneyPlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\$?(?P<CASH>[,.0-9]+)\)$', re.MULTILINE)
+    re_TourneyPlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\$?(?P<CASH>[,.0-9]+)\)(, is sitting out)?$', re.MULTILINE)
     re_Board        = re.compile(r"\[(?P<CARDS>.+)\]")
 
     #static regex for tourney purpose

From 080b7f80c9c2653539b070d6e80b3edb30e19a02 Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Wed, 27 Jan 2010 09:23:12 -0500
Subject: [PATCH 138/320] Compile the " collected" reg ex.

---
 pyfpdb/FulltiltToFpdb.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index eeefbf90..1ea4f322 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -112,6 +112,7 @@ class Fulltilt(HandHistoryConverter):
 # These regexes are for FTP only
     re_Mixed        = re.compile(r'\s\-\s(?P<MIXED>HA|HORSE|HOSE)\s\-\s', re.VERBOSE)
     re_Max          = re.compile("(?P<MAX>\d+)( max)?", re.MULTILINE)
+    re_Collected    = re.compile(" collected")
     # NB: if we ever match "Full Tilt Poker" we should also match "FullTiltPoker", which PT Stud erroneously exports.
 
 
@@ -255,7 +256,6 @@ class Fulltilt(HandHistoryConverter):
 #TODO: Need some date functions to convert to different timezones (Date::Manip for perl rocked for this)
         #hand.starttime = "%d/%02d/%02d %d:%02d:%02d ET" %(int(m.group('YEAR')), int(m.group('MON')), int(m.group('DAY')),
                             ##int(m.group('HR')), int(m.group('MIN')), int(m.group('SEC')))
-#FIXME:        hand.buttonpos = int(m.group('BUTTON'))
 
     def readPlayerStacks(self, hand):
         if hand.gametype['type'] == "ring" :
@@ -264,7 +264,7 @@ class Fulltilt(HandHistoryConverter):
             m = self.re_TourneyPlayerInfo.finditer(hand.handText)
 
         for a in m:
-            if not re.search(" collected", a.group('PNAME')):
+            if not self.re_Collected.search(a.group('PNAME')):
                 hand.addPlayer(int(a.group('SEAT')), a.group('PNAME'), a.group('CASH'))
 
     def markStreets(self, hand):

From cd05c1da48c2a61fb871b88eb506536abd56b5ee Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 28 Jan 2010 01:36:42 +0800
Subject: [PATCH 139/320] Remove unused variable

---
 pyfpdb/PokerStarsToFpdb.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
index 09bd0390..2a4fbdb6 100755
--- a/pyfpdb/PokerStarsToFpdb.py
+++ b/pyfpdb/PokerStarsToFpdb.py
@@ -237,7 +237,6 @@ class PokerStars(HandHistoryConverter):
     def readPlayerStacks(self, hand):
         log.debug("readPlayerStacks")
         m = self.re_PlayerInfo.finditer(hand.handText)
-        players = []
         for a in m:
             hand.addPlayer(int(a.group('SEAT')), a.group('PNAME'), a.group('CASH'))
 

From 6f78749ebdb79b0e2bb0ab9d12367d2399272532 Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Wed, 27 Jan 2010 18:37:23 +0100
Subject: [PATCH 140/320] Default graph created for empty data query

---
 pyfpdb/GuiGraphViewer.py | 36 ++++++++++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/pyfpdb/GuiGraphViewer.py b/pyfpdb/GuiGraphViewer.py
index f0eca2f1..ce9648ae 100644
--- a/pyfpdb/GuiGraphViewer.py
+++ b/pyfpdb/GuiGraphViewer.py
@@ -176,17 +176,46 @@ class GuiGraphViewer (threading.Thread):
             (green, blue, red) = self.getRingProfitGraph(playerids, sitenos, limits, games)
             print "Graph generated in: %s" %(time() - starttime)
 
-            self.ax.set_title("Profit graph for ring games")
 
             #Set axis labels and grid overlay properites
             self.ax.set_xlabel("Hands", fontsize = 12)
             self.ax.set_ylabel("$", fontsize = 12)
             self.ax.grid(color='g', linestyle=':', linewidth=0.2)
             if green == None or green == []:
+                self.ax.set_title("No Data for Player(s) Found")
+                green = ([    0.,     0.,     0.,     0.,   500.,  1000.,   900.,   800.,
+                            700.,   600.,   500.,   400.,   300.,   200.,   100.,     0.,
+                            500.,  1000.,  1000.,  1000.,  1000.,  1000.,  1000.,  1000.,
+                            1000., 1000.,  1000.,  1000.,  1000.,  1000.,   875.,   750.,
+                            625.,   500.,   375.,   250.,   125.,     0.,     0.,     0.,
+                            0.,   500.,  1000.,   900.,   800.,   700.,   600.,   500.,
+                            400.,   300.,   200.,   100.,     0.,   500.,  1000.,  1000.])
+                red   =  ([    0.,     0.,     0.,     0.,   500.,  1000.,   900.,   800.,
+                            700.,   600.,   500.,   400.,   300.,   200.,   100.,     0.,
+                            0.,   0.,     0.,     0.,     0.,     0.,   125.,   250.,
+                            375.,   500.,   500.,   500.,   500.,   500.,   500.,   500.,
+                            500.,   500.,   375.,   250.,   125.,     0.,     0.,     0.,
+                            0.,   500.,  1000.,   900.,   800.,   700.,   600.,   500.,
+                            400.,   300.,   200.,   100.,     0.,   500.,  1000.,  1000.])
+                blue =    ([    0.,     0.,     0.,     0.,   500.,  1000.,   900.,   800.,
+                              700.,   600.,   500.,   400.,   300.,   200.,   100.,     0.,
+                              0.,     0.,     0.,     0.,     0.,     0.,   125.,   250.,
+                              375.,   500.,   625.,   750.,   875.,  1000.,   875.,   750.,
+                              625.,   500.,   375.,   250.,   125.,     0.,     0.,     0.,
+                            0.,   500.,  1000.,   900.,   800.,   700.,   600.,   500.,
+                            400.,   300.,   200.,   100.,     0.,   500.,  1000.,  1000.])
+
+                self.ax.plot(green, color='green', label='Hands: %d\nProfit: $%.2f' %(len(green), green[-1]))
+                self.ax.plot(blue, color='blue', label='Showdown: $%.2f' %(blue[-1]))
+                self.ax.plot(red, color='red', label='Non-showdown: $%.2f' %(red[-1]))
+                self.graphBox.add(self.canvas)
+                self.canvas.show()
+                self.canvas.draw()
 
                 #TODO: Do something useful like alert user
-                print "No hands returned by graph query"
+                #print "No hands returned by graph query"
             else:
+                self.ax.set_title("Profit graph for ring games")
                 #text = "Profit: $%.2f\nTotal Hands: %d" %(green[-1], len(green))
                 #self.ax.annotate(text,
                 #                 xy=(10, -10),
@@ -203,7 +232,6 @@ class GuiGraphViewer (threading.Thread):
                 else:
                     self.ax.legend(loc='best', fancybox=True, shadow=True, prop=FontProperties(size='smaller'))
 
-
                 self.graphBox.add(self.canvas)
                 self.canvas.show()
                 self.canvas.draw()
@@ -292,7 +320,7 @@ class GuiGraphViewer (threading.Thread):
         self.db.rollback()
 
         if winnings == ():
-            return None
+            return (None, None, None)
 
         green = map(lambda x:float(x[1]), winnings)
         blue  = map(lambda x: float(x[1]) if x[2] == True  else 0.0, winnings)

From a9f2a261d454a4e4455904e882f79905a11cd8e5 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 28 Jan 2010 01:44:14 +0800
Subject: [PATCH 141/320] Regex fix for Fulltilt player names

"Seat 7: moletrapper collected ($2.50)"
vs
"Seat 7: moletrapper ($2.50)"

The regex update should match the second and not the first.
---
 pyfpdb/FulltiltToFpdb.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index 146fe217..2802f465 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -65,8 +65,8 @@ class Fulltilt(HandHistoryConverter):
                                          (\s\((?P<TURBO>Turbo)\))?)|(?P<UNREADABLE_INFO>.+))
                                     ''', re.VERBOSE)
     re_Button       = re.compile('^The button is in seat #(?P<BUTTON>\d+)', re.MULTILINE)
-    re_PlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\$(?P<CASH>[,.0-9]+)\)$', re.MULTILINE)
-    re_TourneyPlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\$?(?P<CASH>[,.0-9]+)\)(, is sitting out)?$', re.MULTILINE)
+    re_PlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) (?! collected )?\(\$(?P<CASH>[,.0-9]+)\)$', re.MULTILINE)
+    re_TourneyPlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) (?! collected )?\(\$?(?P<CASH>[,.0-9]+)\)(, is sitting out)?$', re.MULTILINE)
     re_Board        = re.compile(r"\[(?P<CARDS>.+)\]")
 
     #static regex for tourney purpose
@@ -264,8 +264,7 @@ class Fulltilt(HandHistoryConverter):
             m = self.re_TourneyPlayerInfo.finditer(hand.handText)
 
         for a in m:
-            if not self.re_Collected.search(a.group('PNAME')):
-                hand.addPlayer(int(a.group('SEAT')), a.group('PNAME'), a.group('CASH'))
+            hand.addPlayer(int(a.group('SEAT')), a.group('PNAME'), a.group('CASH'))
 
     def markStreets(self, hand):
         # PREFLOP = ** Dealing down cards **

From 93729a479806b59a02425b30ab77ced645e0e5a1 Mon Sep 17 00:00:00 2001
From: Eric Blade <blade.eric@gmail.com>
Date: Wed, 27 Jan 2010 13:42:03 -0500
Subject: [PATCH 142/320] merge

---
 run_fpdb.py | 68 ++++++++++++++++++++++++++---------------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/run_fpdb.py b/run_fpdb.py
index 24f6a4dd..78e2803b 100755
--- a/run_fpdb.py
+++ b/run_fpdb.py
@@ -1,34 +1,34 @@
-#!/usr/bin/python
-
-#Copyright 2008 Carl Gherardi
-#This program is free software: you can redistribute it and/or modify
-#it under the terms of the GNU Affero General Public License as published by
-#the Free Software Foundation, version 3 of the License.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU Affero General Public License
-#along with this program. If not, see <http://www.gnu.org/licenses/>.
-#In the "official" distribution you can find the license in
-#agpl-3.0.txt in the docs folder of the package.
-
-
-import os
-import sys
-
-# sys.path[0] holds the directory run_fpdb.py is in
-sys.path[0] = sys.path[0]+os.sep+"pyfpdb"
-os.chdir(sys.path[0])
-#print "sys.path[0] =", sys.path[0], "cwd =", os.getcwd()
-
-
-import fpdb
-
-
-if __name__ == "__main__":
-    me = fpdb.fpdb()
-    me.main()
-    exit()
+#!/usr/bin/python
+
+#Copyright 2008 Carl Gherardi
+#This program is free software: you can redistribute it and/or modify
+#it under the terms of the GNU Affero General Public License as published by
+#the Free Software Foundation, version 3 of the License.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU Affero General Public License
+#along with this program. If not, see <http://www.gnu.org/licenses/>.
+#In the "official" distribution you can find the license in
+#agpl-3.0.txt in the docs folder of the package.
+
+
+import os
+import sys
+
+# sys.path[0] holds the directory run_fpdb.py is in
+sys.path[0] = sys.path[0]+os.sep+"pyfpdb"
+os.chdir(sys.path[0])
+#print "sys.path[0] =", sys.path[0], "cwd =", os.getcwd()
+
+
+import fpdb
+
+
+if __name__ == "__main__":
+    me = fpdb.fpdb()
+    me.main()
+    exit()

From 1df418c8e4cf761007c708f4092fa5dbea5c2d16 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Wed, 27 Jan 2010 23:48:39 +0000
Subject: [PATCH 143/320] create fpdb dir if required, improve sqlite
 performance :-)

---
 pyfpdb/Configuration.py | 22 ++++++++---
 pyfpdb/Database.py      | 85 +++++++++++++++++++++++++----------------
 pyfpdb/HUD_main.py      |  5 ++-
 3 files changed, 72 insertions(+), 40 deletions(-)

diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py
index 11d38bf4..09f7ca2e 100755
--- a/pyfpdb/Configuration.py
+++ b/pyfpdb/Configuration.py
@@ -60,12 +60,14 @@ def get_exec_path():
 
 def get_config(file_name, fallback = True):
     """Looks in cwd and in self.default_config_path for a config file."""
-    config_path = os.path.join(get_exec_path(), file_name)
+    exec_dir = get_exec_path()
+    config_path = os.path.join(exec_dir, file_name)
 #    print "config_path=", config_path
     if os.path.exists(config_path):    # there is a file in the cwd
         return config_path             # so we use it
     else: # no file in the cwd, look where it should be in the first place
-        config_path = os.path.join(get_default_config_path(), file_name)
+        default_dir = get_default_config_path()
+        config_path = os.path.join(default_dir, file_name)
 #        print "config path 2=", config_path
         if os.path.exists(config_path):
             return config_path
@@ -77,14 +79,24 @@ def get_config(file_name, fallback = True):
 #    OK, fall back to the .example file, should be in the start dir
     if os.path.exists(file_name + ".example"):
         try:
+            print ""
+            if not os.path.isdir(default_dir):
+                msg = "Creating directory: '%s'" % (default_dir)
+                print msg
+                logging.info(msg)
+                os.mkdir(default_dir)
             shutil.copyfile(file_name + ".example", config_path)
-            print "No %s found, using %s.example.\n" % (file_name, file_name)
-            print "Config file has been created at %s.\nYou will probably have to edit it." % config_path
-            sys.stderr.write("No %s found, copying %s.example.\n" % (file_name, file_name) )
+            msg = "No %s found in %s or %s\n" % (file_name, exec_dir, default_dir) \
+                  + "Config file has been created at %s.\n" % config_path \
+                  + "Edit your screen_name and hand history path in the supported_sites "\
+                  + "section of the \nPreferences window (Main menu) before trying to import hands."
+            print msg
+            logging.info(msg)
             file_name = config_path
         except:
             print "Error copying .example file, cannot fall back. Exiting.\n"
             sys.stderr.write("Error copying .example file, cannot fall back. Exiting.\n")
+            sys.stderr.write( str(sys.exc_info()) )
             sys.exit()
     else:
         print "No %s found, cannot fall back. Exiting.\n" % file_name
diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index f17f1d33..54690979 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -39,40 +39,38 @@ import string
 import re
 import Queue
 import codecs
-import logging
 import math
 
 
 #    pyGTK modules
 
 
+#    FreePokerTools modules
+import SQL
+import Card
+import Tourney
+import Charset
+from Exceptions import *
+import Configuration
+log = Configuration.get_logger("logging.conf","db")
+
+
 #    Other library modules
 try:
     import sqlalchemy.pool as pool
     use_pool = True
 except ImportError:
-    logging.info("Not using sqlalchemy connection pool.")
+    log.info("Not using sqlalchemy connection pool.")
     use_pool = False
 
 try:
     from numpy import var
     use_numpy = True
 except ImportError:
-    logging.info("Not using numpy to define variance in sqlite.")
+    log.info("Not using numpy to define variance in sqlite.")
     use_numpy = False
 
 
-#    FreePokerTools modules
-import Configuration
-import SQL
-import Card
-import Tourney
-import Charset
-from Exceptions import *
-
-log = Configuration.get_logger("logging.conf")
-
-
 DB_VERSION = 119
 
 
@@ -374,20 +372,20 @@ class Database:
                     print msg
                     raise FpdbError(msg)
         elif backend == Database.SQLITE:
-            logging.info("Connecting to SQLite: %(database)s" % {'database':database})
+            log.info("Connecting to SQLite: %(database)s" % {'database':database})
             import sqlite3
             if use_pool:
                 sqlite3 = pool.manage(sqlite3, pool_size=1)
             else:
-                logging.warning("SQLite won't work well without 'sqlalchemy' installed.")
+                log.warning("SQLite won't work well without 'sqlalchemy' installed.")
 
             if database != ":memory:":
                 if not os.path.isdir(self.config.dir_databases):
                     print "Creating directory: '%s'" % (self.config.dir_databases)
-                    logging.info("Creating directory: '%s'" % (self.config.dir_databases))
+                    log.info("Creating directory: '%s'" % (self.config.dir_databases))
                     os.mkdir(self.config.dir_databases)
                 database = os.path.join(self.config.dir_databases, database)
-            logging.info("  sqlite db: " + database)
+            log.info("  sqlite db: " + database)
             self.connection = sqlite3.connect(database, detect_types=sqlite3.PARSE_DECLTYPES )
             sqlite3.register_converter("bool", lambda x: bool(int(x)))
             sqlite3.register_adapter(bool, lambda x: "1" if x else "0")
@@ -397,7 +395,10 @@ class Database:
             if use_numpy:
                 self.connection.create_aggregate("variance", 1, VARIANCE)
             else:
-                logging.warning("Some database functions will not work without NumPy support")
+                log.warning("Some database functions will not work without NumPy support")
+            self.cursor = self.connection.cursor()
+            self.cursor.execute('PRAGMA temp_store=2')  # use memory for temp tables/indexes
+            self.cursor.execute('PRAGMA synchronous=0') # don't wait for file writes to finish
         else:
             raise FpdbError("unrecognised database backend:"+backend)
 
@@ -412,7 +413,7 @@ class Database:
             self.cursor.execute("SELECT * FROM Settings")
             settings = self.cursor.fetchone()
             if settings[0] != DB_VERSION:
-                logging.error("outdated or too new database version (%s) - please recreate tables"
+                log.error("outdated or too new database version (%s) - please recreate tables"
                               % (settings[0]))
                 self.wrongDbVersion = True
         except:# _mysql_exceptions.ProgrammingError:
@@ -422,11 +423,6 @@ class Database:
                     log.info("failed to read settings table - recreating tables")
                     self.recreate_tables()
                     self.check_version(database=database, create=False)
-                    if not self.wrongDbVersion:
-                        msg = "Edit your screen_name and hand history path in the supported_sites "\
-                              +"section of the \nPreferences window (Main menu) before trying to import hands"
-                        print "\n%s" % msg
-                        log.warning(msg)
                 else:
                     print "Failed to read settings table - please recreate tables"
                     log.info("failed to read settings table - please recreate tables")
@@ -436,7 +432,27 @@ class Database:
     #end def connect
 
     def commit(self):
-        self.connection.commit()
+        if self.backend != self.SQLITE:
+            self.connection.commit()
+        else:
+            # sqlite commits can fail because of shared locks on the database (SQLITE_BUSY)
+            # re-try commit if it fails in case this happened
+            maxtimes = 5
+            pause = 1
+            ok = False
+            for i in xrange(maxtimes):
+                try:
+                    ret = self.connection.commit()
+                    log.debug("commit finished ok, i = "+str(i))
+                    ok = True
+                except:
+                    log.debug("commit "+str(i)+" failed: info=" + str(sys.exc_info())
+                                  + " value=" + str(sys.exc_value))
+                    sleep(pause)
+                if ok: break
+            if not ok:
+                log.debug("commit failed")
+                raise FpdbError('sqlite commit failed')
 
     def rollback(self):
         self.connection.rollback()
@@ -1750,7 +1766,10 @@ class Database:
 
     def insertPlayer(self, name, site_id):
         result = None
-        _name = Charset.to_db_utf8(name)
+        if self.backend == self.SQLITE:
+            _name = name
+        else:
+            _name = Charset.to_db_utf8(name)
         c = self.get_cursor()
         q = "SELECT name, id FROM Players WHERE siteid=%s and name=%s"
         q = q.replace('%s', self.sql.query['placeholder'])
@@ -1906,7 +1925,7 @@ class Database:
     # end def send_finish_msg():
 
     def tRecogniseTourneyType(self, tourney):
-        logging.debug("Database.tRecogniseTourneyType")
+        log.debug("Database.tRecogniseTourneyType")
         typeId = 1
         # Check if Tourney exists, and if so retrieve TTypeId : in that case, check values of the ttype
         cursor = self.get_cursor()
@@ -1922,10 +1941,10 @@ class Database:
         try:
             len(result)
             typeId = result[0]
-            logging.debug("Tourney found in db with Tourney_Type_ID = %d" % typeId)
+            log.debug("Tourney found in db with Tourney_Type_ID = %d" % typeId)
             for ev in expectedValues :
                 if ( getattr( tourney, expectedValues.get(ev) ) <> result[ev] ):
-                    logging.debug("TypeId mismatch : wrong %s : Tourney=%s / db=%s" % (expectedValues.get(ev), getattr( tourney, expectedValues.get(ev)), result[ev]) )
+                    log.debug("TypeId mismatch : wrong %s : Tourney=%s / db=%s" % (expectedValues.get(ev), getattr( tourney, expectedValues.get(ev)), result[ev]) )
                     typeIdMatch = False
                     #break
         except:
@@ -1935,7 +1954,7 @@ class Database:
         if typeIdMatch == False :
             # Check for an existing TTypeId that matches tourney info (buyin/fee, knockout, rebuy, speed, matrix, shootout)
             # if not found create it
-            logging.debug("Searching for a TourneyTypeId matching TourneyType data")
+            log.debug("Searching for a TourneyTypeId matching TourneyType data")
             cursor.execute (self.sql.query['getTourneyTypeId'].replace('%s', self.sql.query['placeholder']), 
                             (tourney.siteId, tourney.buyin, tourney.fee, tourney.isKO,
                              tourney.isRebuy, tourney.speed, tourney.isHU, tourney.isShootout, tourney.isMatrix)
@@ -1945,9 +1964,9 @@ class Database:
             try:
                 len(result)
                 typeId = result[0]
-                logging.debug("Existing Tourney Type Id found : %d" % typeId)
+                log.debug("Existing Tourney Type Id found : %d" % typeId)
             except TypeError: #this means we need to create a new entry
-                logging.debug("Tourney Type Id not found : create one")
+                log.debug("Tourney Type Id not found : create one")
                 cursor.execute (self.sql.query['insertTourneyTypes'].replace('%s', self.sql.query['placeholder']),
                                 (tourney.siteId, tourney.buyin, tourney.fee, tourney.isKO, tourney.isRebuy,
                                  tourney.speed, tourney.isHU, tourney.isShootout, tourney.isMatrix)
diff --git a/pyfpdb/HUD_main.py b/pyfpdb/HUD_main.py
index 62025018..3fcd0fca 100755
--- a/pyfpdb/HUD_main.py
+++ b/pyfpdb/HUD_main.py
@@ -204,6 +204,7 @@ class HUD_main(object):
 
 #        get basic info about the new hand from the db
 #        if there is a db error, complain, skip hand, and proceed
+            log.info("HUD_main.read_stdin: hand processing starting ...")
             try:
                 (table_name, max, poker_game, type, site_id, site_name, num_seats, tour_number, tab_number) = \
                                 self.db_connection.get_table_info(new_hand_id)
@@ -230,6 +231,7 @@ class HUD_main(object):
                 try:
                     self.db_connection.init_hud_stat_vars( self.hud_dict[temp_key].hud_params['hud_days']
                                                      , self.hud_dict[temp_key].hud_params['h_hud_days'])
+                    t4 = time.time()
                     stat_dict = self.db_connection.get_stats_from_hand(new_hand_id, type, self.hud_dict[temp_key].hud_params, self.hero_ids[site_id])
                     self.hud_dict[temp_key].stat_dict = stat_dict
                 except KeyError:    # HUD instance has been killed off, key is stale
@@ -238,6 +240,7 @@ class HUD_main(object):
                     # Unlocks table, copied from end of function
                     self.db_connection.connection.rollback()
                     return
+                t5 = time.time()
                 cards      = self.db_connection.get_cards(new_hand_id)
                 comm_cards = self.db_connection.get_common_cards(new_hand_id)
                 if comm_cards != {}: # stud!
@@ -250,10 +253,8 @@ class HUD_main(object):
             else:
                 # get stats using default params--also get cards
                 self.db_connection.init_hud_stat_vars( self.hud_params['hud_days'], self.hud_params['h_hud_days'] )
-                t4 = time.time()
                 stat_dict = self.db_connection.get_stats_from_hand(new_hand_id, type, self.hud_params
                                                                   ,self.hero_ids[site_id], num_seats)
-                t5 = time.time()
                 cards      = self.db_connection.get_cards(new_hand_id)
                 comm_cards = self.db_connection.get_common_cards(new_hand_id)
                 if comm_cards != {}: # stud!

From d50e70fdd475730da6e0baa3576f9abb9d599870 Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Wed, 27 Jan 2010 20:10:07 -0500
Subject: [PATCH 144/320] Another fix of FTP playername reg ex.

---
 pyfpdb/FulltiltToFpdb.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index 2802f465..00344755 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -65,8 +65,8 @@ class Fulltilt(HandHistoryConverter):
                                          (\s\((?P<TURBO>Turbo)\))?)|(?P<UNREADABLE_INFO>.+))
                                     ''', re.VERBOSE)
     re_Button       = re.compile('^The button is in seat #(?P<BUTTON>\d+)', re.MULTILINE)
-    re_PlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) (?! collected )?\(\$(?P<CASH>[,.0-9]+)\)$', re.MULTILINE)
-    re_TourneyPlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) (?! collected )?\(\$?(?P<CASH>[,.0-9]+)\)(, is sitting out)?$', re.MULTILINE)
+    re_PlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.{3,12}) \(\$(?P<CASH>[,.0-9]+)\)$', re.MULTILINE)
+    re_TourneyPlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.{3,12}) \(\$?(?P<CASH>[,.0-9]+)\)(, is sitting out)?$', re.MULTILINE)
     re_Board        = re.compile(r"\[(?P<CARDS>.+)\]")
 
     #static regex for tourney purpose
@@ -112,7 +112,6 @@ class Fulltilt(HandHistoryConverter):
 # These regexes are for FTP only
     re_Mixed        = re.compile(r'\s\-\s(?P<MIXED>HA|HORSE|HOSE)\s\-\s', re.VERBOSE)
     re_Max          = re.compile("(?P<MAX>\d+)( max)?", re.MULTILINE)
-    re_Collected    = re.compile(" collected")
     # NB: if we ever match "Full Tilt Poker" we should also match "FullTiltPoker", which PT Stud erroneously exports.
 
 

From 92e20bcd125bd0897ff0256d9caccf108e7d6eeb Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Wed, 27 Jan 2010 23:16:11 -0500
Subject: [PATCH 145/320] Add more chars to player name in prev commit.

---
 pyfpdb/FulltiltToFpdb.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index 00344755..d5499636 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -65,8 +65,8 @@ class Fulltilt(HandHistoryConverter):
                                          (\s\((?P<TURBO>Turbo)\))?)|(?P<UNREADABLE_INFO>.+))
                                     ''', re.VERBOSE)
     re_Button       = re.compile('^The button is in seat #(?P<BUTTON>\d+)', re.MULTILINE)
-    re_PlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.{3,12}) \(\$(?P<CASH>[,.0-9]+)\)$', re.MULTILINE)
-    re_TourneyPlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.{3,12}) \(\$?(?P<CASH>[,.0-9]+)\)(, is sitting out)?$', re.MULTILINE)
+    re_PlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.{3,15}) \(\$(?P<CASH>[,.0-9]+)\)$', re.MULTILINE)
+    re_TourneyPlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.{3,15}) \(\$?(?P<CASH>[,.0-9]+)\)(, is sitting out)?$', re.MULTILINE)
     re_Board        = re.compile(r"\[(?P<CARDS>.+)\]")
 
     #static regex for tourney purpose

From 7c90102677281e3f2653681e74824949daad8b4f Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 28 Jan 2010 15:13:49 +0800
Subject: [PATCH 146/320] Preliminary Carbon functions.

- Add the SITEID for Carbon

- Add function addAllIn():
"For sites which record "all in" as a special action, which can mean either "calls and is all in" or "raises all in".
"
---
 pyfpdb/Hand.py | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 7023d50c..ec84707e 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -43,7 +43,7 @@ class Hand(object):
     LCS = {'H':'h', 'D':'d', 'C':'c', 'S':'s'}
     SYMBOL = {'USD': '$', 'EUR': u'$', 'T$': '', 'play': ''}
     MS = {'horse' : 'HORSE', '8game' : '8-Game', 'hose'  : 'HOSE', 'ha': 'HA'}
-    SITEIDS = {'Fulltilt':1, 'PokerStars':2, 'Everleaf':3, 'Win2day':4, 'OnGame':5, 'UltimateBet':6, 'Betfair':7, 'Absolute':8, 'PartyPoker':9 }
+    SITEIDS = {'Fulltilt':1, 'PokerStars':2, 'Everleaf':3, 'Win2day':4, 'OnGame':5, 'UltimateBet':6, 'Betfair':7, 'Absolute':8, 'PartyPoker':9, 'Carbon':10 }
 
 
     def __init__(self, sitename, gametype, handText, builtFrom = "HHC"):
@@ -289,6 +289,24 @@ If a player has None chips he won't be added."""
             c = c.replace(k,v)
         return c
 
+    def addAllIn(self, street, player, amount):
+        """\
+For sites (currently only Carbon Poker) which record "all in" as a special action, which can mean either "calls and is all in" or "raises all in".
+"""
+        self.checkPlayerExists(player)
+        amount = re.sub(u',', u'', amount) #some sites have commas
+        Ai = Decimal(amount)
+        Bp = self.lastBet[street]
+        Bc = reduce(operator.add, self.bets[street][player], 0)
+        C = Bp - Bc
+        if Ai <= C:
+            self.addCall(street, player, amount)
+        elif Bp == 0:
+            self.addBet(street, player, amount)
+        else:
+            Rb = Ai - C
+            self._addRaise(street, player, C, Rb, Ai)
+
     def addAnte(self, player, ante):
         log.debug("%s %s antes %s" % ('BLINDSANTES', player, ante))
         if player is not None:

From 803fcec6dc85fb248a7d98c22d59646faab10a69 Mon Sep 17 00:00:00 2001
From: Eric Blade <blade.eric@gmail.com>
Date: Thu, 28 Jan 2010 04:45:33 -0500
Subject: [PATCH 147/320] make hud_main call with full path in windows, as has
 been done in unix

---
 pyfpdb/GuiAutoImport.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/GuiAutoImport.py b/pyfpdb/GuiAutoImport.py
index f9f1c335..628f7b7f 100755
--- a/pyfpdb/GuiAutoImport.py
+++ b/pyfpdb/GuiAutoImport.py
@@ -194,7 +194,7 @@ class GuiAutoImport (threading.Thread):
                 widget.set_label(u'  _Stop Autoimport  ')
                 if self.pipe_to_hud is None:
                     if os.name == 'nt':
-                        command = "python HUD_main.py " + self.settings['cl_options']
+                        command = "python "+sys.path[0]+"\\HUD_main.py " + self.settings['cl_options']
                         bs = 0
                     else:
                         command = os.path.join(sys.path[0], 'HUD_main.py')

From 997483f909fb6ef27b798429a650fcfde1e7db1f Mon Sep 17 00:00:00 2001
From: Eric Blade <blade.eric@gmail.com>
Date: Thu, 28 Jan 2010 05:19:19 -0500
Subject: [PATCH 148/320] make import timer work again

---
 pyfpdb/fpdb_import.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index fe66fcda..1df0ad7a 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -365,7 +365,7 @@ class Importer:
                             pass
                         (stored, duplicates, partial, errors, ttime) = self.import_file_dict(self.database, file, self.filelist[file][0], self.filelist[file][1], None)
                         try:
-                            if not os.path.isdir(file):
+                            if not os.path.isdir(file): # Note: This assumes that whatever calls us has an "addText" func
                                 self.caller.addText(" %d stored, %d duplicates, %d partial, %d errors (time = %f)" % (stored, duplicates, partial, errors, ttime))
                         except KeyError: # TODO: Again, what error happens here? fix when we find out ..
                             pass
@@ -402,7 +402,7 @@ class Importer:
             return (0,0,0,0,0)
 
         conv = None
-        (stored, duplicates, partial, errors, ttime) = (0, 0, 0, 0, 0)
+        (stored, duplicates, partial, errors, ttime) = (0, 0, 0, 0, time())
 
         file =  file.decode(Configuration.LOCALE_ENCODING)
 
@@ -440,6 +440,7 @@ class Importer:
                         #try, except duplicates here?
                         hand.prepInsert(self.database)
                         hand.insert(self.database)
+
                         if self.callHud and hand.dbid_hands != 0:
                             to_hud.append(hand.dbid_hands)
                     else:
@@ -463,10 +464,12 @@ class Importer:
             else:
                 # conversion didn't work
                 # TODO: appropriate response?
-                return (0, 0, 0, 1, 0)
+                return (0, 0, 0, 1, time() - ttime)
         else:
             log.warning("Unknown filter filter_name:'%s' in filter:'%s'" %(filter_name, filter))
-            return (0, 0, 0, 1, 0)
+            return (0, 0, 0, 1, time() - ttime)
+
+        ttime = time() - ttime
 
         #This will barf if conv.getStatus != True
         return (stored, duplicates, partial, errors, ttime)

From 2be8b9d33be280e1f0edaa4f83e6a552dabcb2a8 Mon Sep 17 00:00:00 2001
From: Eric Blade <blade.eric@gmail.com>
Date: Thu, 28 Jan 2010 05:19:39 -0500
Subject: [PATCH 149/320] get fpdb icon from absolute path instead of relative
 to cwd

---
 pyfpdb/fpdb.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py
index 5136d56b..f202698d 100755
--- a/pyfpdb/fpdb.py
+++ b/pyfpdb/fpdb.py
@@ -769,7 +769,7 @@ class fpdb:
             self.status_bar.show()
 
         if self.db is not None and self.db.connected:
-            self.status_bar.set_text("Status: Connected to %s database named %s on host %s" 
+            self.status_bar.set_text("Status: Connected to %s database named %s on host %s"
                                      % (self.db.get_backend_name(),self.db.database, self.db.host))
             # rollback to make sure any locks are cleared:
             self.db.rollback()
@@ -902,8 +902,8 @@ This program is licensed under the AGPL3, see docs"""+os.sep+"agpl-3.0.txt")
         self.load_profile()
 
         self.statusIcon = gtk.StatusIcon()
-        if os.path.exists('../gfx/fpdb-cards.png'):
-            self.statusIcon.set_from_file('../gfx/fpdb-cards.png')
+        if os.path.exists(os.path.join(sys.path[0], '../gfx/fpdb-cards.png')):
+            self.statusIcon.set_from_file(os.path.join(sys.path[0], '../gfx/fpdb-cards.png'))
         elif os.path.exists('/usr/share/pixmaps/fpdb-cards.png'):
             self.statusIcon.set_from_file('/usr/share/pixmaps/fpdb-cards.png')
         else:

From d36ac3f92707fbfbf9c7c78ee65b8a9302304321 Mon Sep 17 00:00:00 2001
From: Eric Blade <blade.eric@gmail.com>
Date: Thu, 28 Jan 2010 05:55:06 -0500
Subject: [PATCH 150/320] rename DuplicateError to FpdbHandDuplicate, add
 matching FpdbHandError and FpdbHandPartial (not sure where to implement
 catching those though)

---
 pyfpdb/Exceptions.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/Exceptions.py b/pyfpdb/Exceptions.py
index fd7c20e3..789c7b83 100644
--- a/pyfpdb/Exceptions.py
+++ b/pyfpdb/Exceptions.py
@@ -48,5 +48,11 @@ class FpdbPostgresqlNoDatabase(FpdbDatabaseError):
     def __str__(self):
         return repr(self.value +" " + self.errmsg)
 
-class DuplicateError(FpdbError):
+class FpdbHandError(FpdbError):
+    pass
+
+class FpdbHandDuplicate(FpdbHandError):
+    pass
+
+class FpdbHandPartial(FpdbHandError):
     pass

From 3381527afc14f6a1fbfac49078f99bd41f294323 Mon Sep 17 00:00:00 2001
From: Eric Blade <blade.eric@gmail.com>
Date: Thu, 28 Jan 2010 05:56:17 -0500
Subject: [PATCH 151/320] raise FpdbHandDuplicate error on duplicate insert
 attempt, catch it in import_file_dict, increment duplicates count

---
 pyfpdb/Hand.py        | 12 +++++-------
 pyfpdb/fpdb_import.py | 15 +++++++++------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 7023d50c..4fdc555e 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -229,8 +229,7 @@ db: a connected Database object"""
             # TourneysPlayers
         else:
             log.info("Hand.insert(): hid #: %s is a duplicate" % hh['siteHandNo'])
-            #Raise Duplicate exception?
-            pass
+            raise FpdbHandDuplicate(hh['siteHandNo'])
 
     def updateHudCache(self, db):
         db.storeHudCache(self.dbid_gt, self.dbid_pids, self.starttime, self.stats.getHandsPlayers())
@@ -618,7 +617,7 @@ class HoldemOmahaHand(Hand):
         if builtFrom == "HHC":
             hhc.readHandInfo(self)
             if self.gametype['type'] == 'tour':
-                self.tablename = "%s %s" % (self.tourNo, self.tablename)    
+                self.tablename = "%s %s" % (self.tourNo, self.tablename)
             hhc.readPlayerStacks(self)
             hhc.compilePlayerRegexs(self)
             hhc.markStreets(self)
@@ -914,7 +913,7 @@ class DrawHand(Hand):
         if builtFrom == "HHC":
             hhc.readHandInfo(self)
             if self.gametype['type'] == 'tour':
-                self.tablename = "%s %s" % (self.tourNo, self.tablename)    
+                self.tablename = "%s %s" % (self.tourNo, self.tablename)
             hhc.readPlayerStacks(self)
             hhc.compilePlayerRegexs(self)
             hhc.markStreets(self)
@@ -1110,7 +1109,7 @@ class StudHand(Hand):
         if builtFrom == "HHC":
             hhc.readHandInfo(self)
             if self.gametype['type'] == 'tour':
-                self.tablename = "%s %s" % (self.tourNo, self.tablename)    
+                self.tablename = "%s %s" % (self.tourNo, self.tablename)
             hhc.readPlayerStacks(self)
             hhc.compilePlayerRegexs(self)
             hhc.markStreets(self)
@@ -1202,7 +1201,7 @@ Add a complete on [street] by [player] to [amountTo]
         # showdownPot INT,                 /* pot size at sd/street7 */
         return (0,0,0,0,0)
 
-    
+
     def writeHand(self, fh=sys.__stdout__):
         # PokerStars format.
 
@@ -1597,4 +1596,3 @@ ORDER BY
 
 
     return h
-
diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index 1df0ad7a..859a6bc0 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -437,13 +437,15 @@ class Importer:
 
                 for hand in handlist:
                     if hand is not None:
-                        #try, except duplicates here?
                         hand.prepInsert(self.database)
-                        hand.insert(self.database)
-
-                        if self.callHud and hand.dbid_hands != 0:
-                            to_hud.append(hand.dbid_hands)
-                    else:
+                        try:
+                            hand.insert(self.database)
+                        except Exceptions.FpdbHandDuplicate:
+                            duplicates += 1
+                        else:
+                            if self.callHud and hand.dbid_hands != 0:
+                                to_hud.append(hand.dbid_hands)
+                    else: # TODO: Treat empty as an error, or just ignore?
                         log.error("Hand processed but empty")
                 self.database.commit()
                 # Call hudcache update if not in bulk import mode
@@ -461,6 +463,7 @@ class Importer:
 
                 errors = getattr(hhc, 'numErrors')
                 stored = getattr(hhc, 'numHands')
+                stored -= duplicates
             else:
                 # conversion didn't work
                 # TODO: appropriate response?

From ad75bedbf14e83f290c341ac9b008b3d48d1a149 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 28 Jan 2010 21:36:02 +0800
Subject: [PATCH 152/320] CarbonToFpdb.py - Converter for Carbon poker

Currently only supports NLHE cash games. Further hand hstories required.

Plugin contributed by Matthew Boss.
---
 pyfpdb/CarbonToFpdb.py | 346 ++++++++++++++++++++++++++++++++---------
 pyfpdb/Database.py     |   1 +
 pyfpdb/Hand.py         |   2 +-
 3 files changed, 272 insertions(+), 77 deletions(-)

diff --git a/pyfpdb/CarbonToFpdb.py b/pyfpdb/CarbonToFpdb.py
index cc7afb81..0640d157 100644
--- a/pyfpdb/CarbonToFpdb.py
+++ b/pyfpdb/CarbonToFpdb.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
-#    Copyright 2008, Carl Gherardi
-
+# -*- coding: utf-8 -*-
+#
+#    Copyright 2010, Matthew Boss
 #    
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -18,93 +19,286 @@
 
 ########################################################################
 
-#    Standard Library modules
-import Configuration
-import traceback
+# This code is based heavily on EverleafToFpdb.py, by Carl Gherardi
+#
+# OUTSTANDING MATTERS
+#
+# -- No siteID assigned
+# -- No support for games other than NL hold 'em cash. Hand histories for other
+#    games required
+# -- No support for limit hold 'em yet, though this would be easy to add
+# -- No support for tournaments (see also the last item below)
+# -- Assumes that the currency of ring games is USD
+# -- Only works for 'gametype="2"'. What is 'gametype'?
+# -- Only accepts 'realmoney="true"'
+# -- A hand's time-stamp does not record seconds past the minute (a
+#    limitation of the history format)
+# -- No support for a bring-in or for antes (is the latter in fact unnecessary
+#    for hold 'em on Carbon?)
+# -- hand.maxseats can only be guessed at
+# -- The last hand in a history file will often be incomplete and is therefore
+#    rejected
+# -- Is behaviour currently correct when someone shows an uncalled hand?
+# -- Information may be lost when the hand ID is converted from the native form
+#    xxxxxxxx-yyy(y*) to xxxxxxxxyyy(y*) (in principle this should be stored as
+#    a string, but the database does not support this). Is there a possibility
+#    of collision between hand IDs that ought to be distinct?
+# -- Cannot parse tables that run it twice (nor is this likely ever to be
+#    possible)
+# -- Cannot parse hands in which someone is all in in one of the blinds. Until
+#    this is corrected tournaments will be unparseable
+
 import sys
-import re
-import xml.dom.minidom
-from xml.dom.minidom import Node
-from HandHistoryConverter import HandHistoryConverter
+import logging
+from HandHistoryConverter import *
+from decimal import Decimal
 
-# Carbon format looks like:
+class Carbon(HandHistoryConverter):
 
-# 1) <description type="Holdem" stakes="No Limit ($0.25/$0.50)"/>
-# 2) <game id="14902583-5578" starttime="20081006145401" numholecards="2" gametype="2" realmoney="true" data="20081006|Niagara Falls (14902583)|14902583|14902583-5578|false">
-# 3)  <players dealer="8">
-#                <player seat="3" nickname="PlayerInSeat3" balance="$43.29" dealtin="true" />
-#                ...
-# 4) <round id="BLINDS" sequence="1">
-#                <event sequence="1" type="SMALL_BLIND" player="0" amount="0.25"/>
-#                <event sequence="2" type="BIG_BLIND" player="1" amount="0.50"/>
-# 5) <round id="PREFLOP" sequence="2">
-#                <event sequence="3" type="CALL" player="2" amount="0.50"/>
-# 6) <round id="POSTFLOP" sequence="3">
-#           <event sequence="16" type="BET" player="3" amount="1.00"/>
-#           ....
-#	    <cards type="COMMUNITY" cards="7d,Jd,Jh"/>
+    sitename = "Carbon"
+    filetype = "text"
+    codepage = "cp1252"
+    siteID   = 11
 
-# The full sequence for a NHLE cash game is:
-# BLINDS, PREFLOP, POSTFLOP, POSTTURN, POSTRIVER, SHOWDOWN, END_OF_GAME
-# This sequence can be terminated after BLINDS at any time by END_OF_FOLDED_GAME
+    # Static regexes
+    re_SplitHands = re.compile(r'</game>\n+(?=<game)')
+    re_TailSplitHands = re.compile(r'(</game>)')
+    re_GameInfo = re.compile(r'<description type="(?P<GAME>[a-zA-Z ]+)" stakes="(?P<LIMIT>[a-zA-Z ]+) \(\$(?P<SB>[.0-9]+)/\$(?P<BB>[.0-9]+)\)"/>', re.MULTILINE)
+    re_HandInfo = re.compile(r'<game id="(?P<HID1>[0-9]+)-(?P<HID2>[0-9]+)" starttime="(?P<DATETIME>[0-9]+)" numholecards="2" gametype="2" realmoney="true" data="[0-9]+\|(?P<TABLE>[^\(]+)', re.MULTILINE)
+    re_Button = re.compile(r'<players dealer="(?P<BUTTON>[0-9]+)">')
+    re_PlayerInfo = re.compile(r'<player seat="(?P<SEAT>[0-9]+)" nickname="(?P<PNAME>.+)" balance="\$(?P<CASH>[.0-9]+)" dealtin="(?P<DEALTIN>(true|false))" />', re.MULTILINE)
+    re_Board = re.compile(r'<cards type="COMMUNITY" cards="(?P<CARDS>[^"]+)"', re.MULTILINE)
+    re_EndOfHand = re.compile(r'<round id="END_OF_GAME"', re.MULTILINE)
 
+    # The following are also static regexes: there is no need to call
+    # compilePlayerRegexes (which does nothing), since players are identified
+    # not by name but by seat number
+    re_PostSB = re.compile(r'<event sequence="[0-9]+" type="(SMALL_BLIND|RETURN_BLIND)" player="(?P<PSEAT>[0-9])" amount="(?P<SB>[.0-9]+)"/>', re.MULTILINE)
+    re_PostBB = re.compile(r'<event sequence="[0-9]+" type="(BIG_BLIND|INITIAL_BLIND)" player="(?P<PSEAT>[0-9])" amount="(?P<BB>[.0-9]+)"/>', re.MULTILINE)
+    re_PostBoth = re.compile(r'<event sequence="[0-9]+" type="(RETURN_BLIND)" player="(?P<PSEAT>[0-9])" amount="(?P<SBBB>[.0-9]+)"/>', re.MULTILINE)
+    #re_Antes = ???
+    #re_BringIn = ???
+    re_HeroCards = re.compile(r'<cards type="HOLE" cards="(?P<CARDS>.+)" player="(?P<PSEAT>[0-9])"', re.MULTILINE)
+    re_Action = re.compile(r'<event sequence="[0-9]+" type="(?P<ATYPE>FOLD|CHECK|CALL|BET|RAISE|ALL_IN|SIT_OUT)" player="(?P<PSEAT>[0-9])"( amount="(?P<BET>[.0-9]+)")?/>', re.MULTILINE)
+    re_ShowdownAction = re.compile(r'<cards type="SHOWN" cards="(?P<CARDS>..,..)" player="(?P<PSEAT>[0-9])"/>', re.MULTILINE)
+    re_CollectPot = re.compile(r'<winner amount="(?P<POT>[.0-9]+)" uncalled="(true|false)" potnumber="[0-9]+" player="(?P<PSEAT>[0-9])"', re.MULTILINE)
+    re_SitsOut = re.compile(r'<event sequence="[0-9]+" type="SIT_OUT" player="(?P<PSEAT>[0-9])"/>', re.MULTILINE)
+    re_ShownCards = re.compile(r'<cards type="(SHOWN|MUCKED)" cards="(?P<CARDS>..,..)" player="(?P<PSEAT>[0-9])"/>', re.MULTILINE)
 
-class CarbonPoker(HandHistoryConverter): 
-	def __init__(self, config, filename):
-		print "Initialising Carbon Poker converter class"
-		HandHistoryConverter.__init__(self, config, filename, "Carbon") # Call super class init
-		self.setFileType("xml")
-        self.siteId   = 4 # Needs to match id entry in Sites database
+    def compilePlayerRegexs(self, hand):
+        pass
 
-	def readSupportedGames(self): 
-		pass
-	def determineGameType(self):
-		gametype = []
-		desc_node = self.doc.getElementsByTagName("description")
-		#TODO: no examples of non ring type yet
-		gametype = gametype + ["ring"]
-		type = desc_node[0].getAttribute("type")
-		if(type == "Holdem"):
-			gametype = gametype + ["hold"]
-		else:
-			print "Carbon: Unknown gametype: '%s'" % (type)
+    def playerNameFromSeatNo(self, seatNo, hand):
+        # This special function is required because Carbon Poker records
+        # actions by seat number, not by the player's name
+        for p in hand.players:
+            if p[0] == int(seatNo):
+                return p[1]
 
-		stakes = desc_node[0].getAttribute("stakes")
-		#TODO: no examples of anything except nlhe
-		m = re.match('(?P<LIMIT>No Limit)\s\(\$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+)\)', stakes)
+    def readSupportedGames(self):
+        return [["ring", "hold", "nl"],
+                ["tour", "hold", "nl"]]
 
-		if(m.group('LIMIT') == "No Limit"):
-			gametype = gametype + ["nl"]
+    def determineGameType(self, handText):
+        """return dict with keys/values:
+    'type'       in ('ring', 'tour')
+    'limitType'  in ('nl', 'cn', 'pl', 'cp', 'fl')
+    'base'       in ('hold', 'stud', 'draw')
+    'category'   in ('holdem', 'omahahi', omahahilo', 'razz', 'studhi', 'studhilo', 'fivedraw', '27_1draw', '27_3draw', 'badugi')
+    'hilo'       in ('h','l','s')
+    'smallBlind' int?
+    'bigBlind'   int?
+    'smallBet'
+    'bigBet'
+    'currency'  in ('USD', 'EUR', 'T$', <countrycode>)
+or None if we fail to get the info """
 
-		gametype = gametype + [self.float2int(m.group('SB'))]
-		gametype = gametype + [self.float2int(m.group('BB'))]
+        m = self.re_GameInfo.search(handText)
+        if not m:
+            # Information about the game type appears only at the beginning of
+            # a hand history file; hence it is not supplied with the second
+            # and subsequent hands. In these cases we use the value previously
+            # stored.
+            return self.info
+        self.info = {}
+        mg = m.groupdict()
 
-		return gametype
+        limits = { 'No Limit':'nl', 'Limit':'fl' }
+        games = {              # base, category
+                    'Holdem' : ('hold','holdem'),
+         'Holdem Tournament' : ('hold','holdem') }
 
-	def readPlayerStacks(self):
-		pass
-	def readBlinds(self):
-		pass
-	def readAction(self):
-		pass
+        if 'LIMIT' in mg:
+            self.info['limitType'] = limits[mg['LIMIT']]
+        if 'GAME' in mg:
+            (self.info['base'], self.info['category']) = games[mg['GAME']]
+        if 'SB' in mg:
+            self.info['sb'] = mg['SB']
+        if 'BB' in mg:
+            self.info['bb'] = mg['BB']
+        if mg['GAME'] == 'Holdem Tournament':
+            self.info['type'] = 'tour'
+            self.info['currency'] = 'T$'
+        else:
+            self.info['type'] = 'ring'
+            self.info['currency'] = 'USD'
 
-	# Override read function as xml.minidom barfs on the Carbon layout
-        # This is pretty dodgy
-	def readFile(self, filename):
-		print "Carbon: Reading file: '%s'" %(filename)
-		infile=open(filename, "rU")
-		self.obs = infile.read()
-		infile.close()
-		self.obs = "<CarbonHHFile>\n" + self.obs + "</CarbonHHFile>"
-		try:
-			doc = xml.dom.minidom.parseString(self.obs)
-			self.doc = doc
-		except:
-			traceback.print_exc(file=sys.stderr)
+        return self.info
+
+    def readHandInfo(self, hand):
+        m = self.re_HandInfo.search(hand.handText)
+        if m is None:
+            logging.info("Didn't match re_HandInfo")
+            logging.info(hand.handText)
+            return None
+        logging.debug("HID %s-%s, Table %s" % (m.group('HID1'),
+                      m.group('HID2'), m.group('TABLE')[:-1]))
+        hand.handid = m.group('HID1') + m.group('HID2')
+        hand.tablename = m.group('TABLE')[:-1]
+        hand.maxseats = 2 # This value may be increased as necessary
+        hand.starttime = datetime.datetime.strptime(m.group('DATETIME')[:12],
+                                                    '%Y%m%d%H%M')
+        # Check that the hand is complete up to the awarding of the pot; if
+        # not, the hand is unparseable
+        if self.re_EndOfHand.search(hand.handText) is None:
+            raise FpdbParseError(hid=m.group('HID1') + "-" + m.group('HID2'))
+
+    def readPlayerStacks(self, hand):
+        m = self.re_PlayerInfo.finditer(hand.handText)
+        for a in m:
+            seatno = int(a.group('SEAT'))
+            # It may be necessary to adjust 'hand.maxseats', which is an
+            # educated guess, starting with 2 (indicating a heads-up table) and
+            # adjusted upwards in steps to 6, then 9, then 10. An adjustment is
+            # made whenever a player is discovered whose seat number is
+            # currently above the maximum allowable for the table.
+            if seatno >= hand.maxseats:
+                if seatno > 8:
+                    hand.maxseats = 10
+                elif seatno > 5:
+                    hand.maxseats = 9
+                else:
+                    hand.maxseats = 6
+            if a.group('DEALTIN') == "true":
+                hand.addPlayer(seatno, a.group('PNAME'), a.group('CASH'))
+
+    def markStreets(self, hand):
+        #if hand.gametype['base'] == 'hold':
+        m = re.search(r'<round id="PREFLOP" sequence="[0-9]+">(?P<PREFLOP>.+(?=<round id="POSTFLOP")|.+)(<round id="POSTFLOP" sequence="[0-9]+">(?P<FLOP>.+(?=<round id="POSTTURN")|.+))?(<round id="POSTTURN" sequence="[0-9]+">(?P<TURN>.+(?=<round id="POSTRIVER")|.+))?(<round id="POSTRIVER" sequence="[0-9]+">(?P<RIVER>.+))?', hand.handText, re.DOTALL)
+        hand.addStreets(m)
+
+    def readCommunityCards(self, hand, street):
+        m = self.re_Board.search(hand.streets[street])
+        if street == 'FLOP':
+            hand.setCommunityCards(street, m.group('CARDS').split(','))
+        elif street in ('TURN','RIVER'):
+            hand.setCommunityCards(street, [m.group('CARDS').split(',')[-1]])
+
+    def readAntes(self, hand):
+        pass # ???
+
+    def readBringIn(self, hand):
+        pass # ???
+
+    def readBlinds(self, hand):
+        try:
+            m = self.re_PostSB.search(hand.handText)
+            hand.addBlind(self.playerNameFromSeatNo(m.group('PSEAT'), hand),
+                          'small blind', m.group('SB'))
+        except: # no small blind
+            hand.addBlind(None, None, None)
+        for a in self.re_PostBB.finditer(hand.handText):
+            hand.addBlind(self.playerNameFromSeatNo(a.group('PSEAT'), hand),
+                          'big blind', a.group('BB'))
+        for a in self.re_PostBoth.finditer(hand.handText):
+            bb = Decimal(self.info['bb'])
+            amount = Decimal(a.group('SBBB'))
+            if amount < bb:
+                hand.addBlind(self.playerNameFromSeatNo(a.group('PSEAT'),
+                              hand), 'small blind', a.group('SBBB'))
+            elif amount == bb:
+                hand.addBlind(self.playerNameFromSeatNo(a.group('PSEAT'),
+                              hand), 'big blind', a.group('SBBB'))
+            else:
+                hand.addBlind(self.playerNameFromSeatNo(a.group('PSEAT'),
+                              hand), 'both', a.group('SBBB'))
+
+    def readButton(self, hand):
+        hand.buttonpos = int(self.re_Button.search(hand.handText).group('BUTTON'))
+
+    def readHeroCards(self, hand):
+        m = self.re_HeroCards.search(hand.handText)
+        if m:
+            hand.hero = self.playerNameFromSeatNo(m.group('PSEAT'), hand)
+            cards = m.group('CARDS').split(',')
+            hand.addHoleCards('PREFLOP', hand.hero, closed=cards, shown=False,
+                              mucked=False, dealt=True)
+
+    def readAction(self, hand, street):
+        logging.debug("readAction (%s)" % street)
+        m = self.re_Action.finditer(hand.streets[street])
+        for action in m:
+            logging.debug("%s %s" % (action.group('ATYPE'),
+                                     action.groupdict()))
+            player = self.playerNameFromSeatNo(action.group('PSEAT'), hand)
+            if action.group('ATYPE') == 'RAISE':
+                hand.addCallandRaise(street, player, action.group('BET'))
+            elif action.group('ATYPE') == 'CALL':
+                hand.addCall(street, player, action.group('BET'))
+            elif action.group('ATYPE') == 'BET':
+                hand.addBet(street, player, action.group('BET'))
+            elif action.group('ATYPE') in ('FOLD', 'SIT_OUT'):
+                hand.addFold(street, player)
+            elif action.group('ATYPE') == 'CHECK':
+                hand.addCheck(street, player)
+            elif action.group('ATYPE') == 'ALL_IN':
+                hand.addAllIn(street, player, action.group('BET'))
+            else:
+                logging.debug("Unimplemented readAction: %s %s"
+                              % (action.group('PSEAT'),action.group('ATYPE'),))
+
+    def readShowdownActions(self, hand):
+        for shows in self.re_ShowdownAction.finditer(hand.handText):
+            cards = shows.group('CARDS').split(',')
+            hand.addShownCards(cards,
+                               self.playerNameFromSeatNo(shows.group('PSEAT'),
+                                                         hand))
+
+    def readCollectPot(self, hand):
+        pots = [Decimal(0) for n in range(hand.maxseats)]
+        for m in self.re_CollectPot.finditer(hand.handText):
+            pots[int(m.group('PSEAT'))] += Decimal(m.group('POT'))
+        # Regarding the processing logic for "committed", see Pot.end() in
+        # Hand.py
+        committed = sorted([(v,k) for (k,v) in hand.pot.committed.items()])
+        for p in range(hand.maxseats):
+            pname = self.playerNameFromSeatNo(p, hand)
+            if committed[-1][1] == pname:
+                pots[p] -= committed[-1][0] - committed[-2][0]
+            if pots[p] > 0:
+                hand.addCollectPot(player=pname, pot=pots[p])
+
+    def readShownCards(self, hand):
+        for m in self.re_ShownCards.finditer(hand.handText):
+            cards = m.group('CARDS').split(',')
+            hand.addShownCards(cards=cards, player=self.playerNameFromSeatNo(m.group('PSEAT'), hand))
 
 if __name__ == "__main__":
-	c = Configuration.Config()
-	e = CarbonPoker(c, "regression-test-files/carbon-poker/Niagara Falls (15245216).xml") 
-	e.processFile()
-	print str(e)
+    parser = OptionParser()
+    parser.add_option("-i", "--input", dest="ipath", help="parse input hand history", default="-")
+    parser.add_option("-o", "--output", dest="opath", help="output translation to", default="-")
+    parser.add_option("-f", "--follow", dest="follow", help="follow (tail -f) the input", action="store_true", default=False)
+    parser.add_option("-q", "--quiet", action="store_const", const=logging.CRITICAL, dest="verbosity", default=logging.INFO)
+    parser.add_option("-v", "--verbose", action="store_const", const=logging.INFO, dest="verbosity")
+    parser.add_option("--vv", action="store_const", const=logging.DEBUG, dest="verbosity")
+
+    (options, args) = parser.parse_args()
+
+    LOG_FILENAME = './logging.out'
+    logging.basicConfig(filename=LOG_FILENAME, level=options.verbosity)
+
+    e = Carbon(in_path = options.ipath,
+               out_path = options.opath,
+               follow = options.follow,
+               autostart = True)
 
diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index 20807583..5cd25d9d 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -1311,6 +1311,7 @@ class Database:
         c.execute("INSERT INTO Sites (name,currency) VALUES ('Absolute', 'USD')")
         c.execute("INSERT INTO Sites (name,currency) VALUES ('PartyPoker', 'USD')")
         c.execute("INSERT INTO Sites (name,currency) VALUES ('Partouche', 'EUR')")
+        c.execute("INSERT INTO Sites (name,currency) VALUES ('Carbon', 'USD')")
         if self.backend == self.SQLITE:
             c.execute("INSERT INTO TourneyTypes (id, siteId, buyin, fee) VALUES (NULL, 1, 0, 0);")
         elif self.backend == self.PGSQL:
diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index ec84707e..93661d70 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -43,7 +43,7 @@ class Hand(object):
     LCS = {'H':'h', 'D':'d', 'C':'c', 'S':'s'}
     SYMBOL = {'USD': '$', 'EUR': u'$', 'T$': '', 'play': ''}
     MS = {'horse' : 'HORSE', '8game' : '8-Game', 'hose'  : 'HOSE', 'ha': 'HA'}
-    SITEIDS = {'Fulltilt':1, 'PokerStars':2, 'Everleaf':3, 'Win2day':4, 'OnGame':5, 'UltimateBet':6, 'Betfair':7, 'Absolute':8, 'PartyPoker':9, 'Carbon':10 }
+    SITEIDS = {'Fulltilt':1, 'PokerStars':2, 'Everleaf':3, 'Win2day':4, 'OnGame':5, 'UltimateBet':6, 'Betfair':7, 'Absolute':8, 'PartyPoker':9, 'Partouche':10, 'Carbon':11 }
 
 
     def __init__(self, sitename, gametype, handText, builtFrom = "HHC"):

From cee610d40158ea34e6d745e88e67b4bd7a78f88e Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 28 Jan 2010 22:11:04 +0800
Subject: [PATCH 153/320] Add Carbon bits to example config file

---
 pyfpdb/HUD_config.xml.example | 38 +++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/pyfpdb/HUD_config.xml.example b/pyfpdb/HUD_config.xml.example
index 8b53e609..5a72c4c6 100644
--- a/pyfpdb/HUD_config.xml.example
+++ b/pyfpdb/HUD_config.xml.example
@@ -445,6 +445,43 @@ Left-Drag to Move"
                 <location seat="9" x="70" y="53">  </location>
             </layout>
         </site>
+
+
+        <site HH_path="C:/Program Files/Carbon Poker/HandHistory/YOUR SCREEN NAME HERE/" converter="CarbonToFpdb" decoder="everleaf_decode_table" enabled="True" screen_name="YOUR SCREEN NAME HERE" site_name="Carbon" site_path="C:/Program Files/Carbin/" supported_games="holdem" table_finder="Carbon Poker.exe">
+            <layout fav_seat="0" height="547" max="8" width="794">
+                <location seat="1" x="640" y="64">  </location>
+                <location seat="2" x="650" y="230"> </location>
+                <location seat="3" x="650" y="385"> </location>
+                <location seat="4" x="588" y="425"> </location>
+                <location seat="5" x="92" y="425"> </location>
+                <location seat="6" x="0" y="373"> </location>
+                <location seat="7" x="0" y="223"> </location>
+                <location seat="8" x="25" y="50">  </location>
+            </layout>
+            <layout fav_seat="0" height="547" max="6" width="794">
+                <location seat="1" x="640" y="58"> </location>
+                <location seat="2" x="654" y="288"> </location>
+                <location seat="3" x="615" y="424"> </location>
+                <location seat="4" x="70" y="421"> </location>
+                <location seat="5" x="0" y="280"> </location>
+                <location seat="6" x="70" y="58"> </location>
+            </layout>
+            <layout fav_seat="0" height="547" max="2" width="794">
+                <location seat="1" x="651" y="288"> </location>
+                <location seat="2" x="10" y="288"> </location>
+            </layout>
+            <layout fav_seat="0" height="547" max="9" width="794">
+                <location seat="1" x="634" y="38">  </location>
+                <location seat="2" x="667" y="184"> </location>
+                <location seat="3" x="667" y="321"> </location>
+                <location seat="4" x="667" y="445"> </location>
+                <location seat="5" x="337" y="459"> </location>
+                <location seat="6" x="0" y="400"> </location>
+                <location seat="7" x="0" y="322"> </location>
+                <location seat="8" x="0" y="181">  </location>
+                <location seat="9" x="70" y="53">  </location>
+            </layout>
+        </site>
     </supported_sites>
 
     <supported_games>
@@ -585,6 +622,7 @@ Left-Drag to Move"
         <hhc site="PartyPoker" converter="PartyPokerToFpdb"/>
         <hhc site="Betfair" converter="BetfairToFpdb"/>
         <hhc site="Partouche" converter="PartoucheToFpdb"/>
+        <hhc site="Carbon" converter="CarbonToFpdb"/>
     </hhcs>
 
     <supported_databases>

From 28a7d1e3533e01aeafe4ef587893dc08640894af Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 28 Jan 2010 23:38:52 +0800
Subject: [PATCH 154/320] Hopefully fully fix the FTP playername parsing.

Split hand text for FTP, as the regex matches the player names incorrectly, and differentiating the lines is non-trivial.

The split should ensure that only the first version is available
---
 pyfpdb/FulltiltToFpdb.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index d5499636..2ee8bdd5 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -257,10 +257,13 @@ class Fulltilt(HandHistoryConverter):
                             ##int(m.group('HR')), int(m.group('MIN')), int(m.group('SEC')))
 
     def readPlayerStacks(self, hand):
+        # Split hand text for FTP, as the regex matches the player names incorrectly
+        # in the summary section
+        pre, post = hand.handText.split('SUMMARY')
         if hand.gametype['type'] == "ring" :
-            m = self.re_PlayerInfo.finditer(hand.handText)
+            m = self.re_PlayerInfo.finditer(pre)
         else:   #if hand.gametype['type'] == "tour"
-            m = self.re_TourneyPlayerInfo.finditer(hand.handText)
+            m = self.re_TourneyPlayerInfo.finditer(pre)
 
         for a in m:
             hand.addPlayer(int(a.group('SEAT')), a.group('PNAME'), a.group('CASH'))

From 7570db60f6ae673fc1f37990fd03265c5a0d5faa Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Thu, 28 Jan 2010 14:37:45 -0500
Subject: [PATCH 155/320] Make the StudMucked not crash with newimport.

---
 pyfpdb/Mucked.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/Mucked.py b/pyfpdb/Mucked.py
index dd424e63..c072fb54 100755
--- a/pyfpdb/Mucked.py
+++ b/pyfpdb/Mucked.py
@@ -128,7 +128,8 @@ class Stud_mucked(Aux_Window):
         self.container.show_all()
 
     def update_data(self, new_hand_id, db_connection):
-        self.mucked_cards.update_data(new_hand_id, db_connection)
+#    uncomment next line when action is available in the db
+#        self.mucked_cards.update_data(new_hand_id, db_connection)
         self.mucked_list.update_data(new_hand_id, db_connection)
         
     def update_gui(self, new_hand_id):

From e29491c25cc3cfc32dff4dfc375c2a56400a21df Mon Sep 17 00:00:00 2001
From: Eric Blade <blade.eric@gmail.com>
Date: Thu, 28 Jan 2010 20:29:43 -0500
Subject: [PATCH 156/320] use getpreferredencoding() instead of
 getdefaultlocale() to get LOCALE_ENCODING, default to cp1252 if it comes back
 with US-ASCII (Mac)

---
 pyfpdb/Configuration.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py
index 09f7ca2e..9c14d16f 100644
--- a/pyfpdb/Configuration.py
+++ b/pyfpdb/Configuration.py
@@ -138,7 +138,11 @@ DATABASE_TYPES = (
         DATABASE_TYPE_MYSQL,
         )
 
-LOCALE_ENCODING = locale.getdefaultlocale()[1]
+#LOCALE_ENCODING = locale.getdefaultlocale()[1]
+LOCALE_ENCODING = locale.getpreferredencoding()
+if LOCALE_ENCODING == "US-ASCII":
+    print "Default encoding set to US-ASCII, defaulting to CP1252 instead -- If you're not on a Mac, please report this problem."
+    LOCALE_ENCODING = "cp1252"
 
 ########################################################################
 def string_to_bool(string, default=True):

From bacca69c4925dfd7e609f046586ec067fc525228 Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Wed, 27 Jan 2010 18:37:23 +0100
Subject: [PATCH 157/320] Default graph created for empty data query

---
 pyfpdb/GuiGraphViewer.py | 36 ++++++++++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/pyfpdb/GuiGraphViewer.py b/pyfpdb/GuiGraphViewer.py
index f0eca2f1..ce9648ae 100644
--- a/pyfpdb/GuiGraphViewer.py
+++ b/pyfpdb/GuiGraphViewer.py
@@ -176,17 +176,46 @@ class GuiGraphViewer (threading.Thread):
             (green, blue, red) = self.getRingProfitGraph(playerids, sitenos, limits, games)
             print "Graph generated in: %s" %(time() - starttime)
 
-            self.ax.set_title("Profit graph for ring games")
 
             #Set axis labels and grid overlay properites
             self.ax.set_xlabel("Hands", fontsize = 12)
             self.ax.set_ylabel("$", fontsize = 12)
             self.ax.grid(color='g', linestyle=':', linewidth=0.2)
             if green == None or green == []:
+                self.ax.set_title("No Data for Player(s) Found")
+                green = ([    0.,     0.,     0.,     0.,   500.,  1000.,   900.,   800.,
+                            700.,   600.,   500.,   400.,   300.,   200.,   100.,     0.,
+                            500.,  1000.,  1000.,  1000.,  1000.,  1000.,  1000.,  1000.,
+                            1000., 1000.,  1000.,  1000.,  1000.,  1000.,   875.,   750.,
+                            625.,   500.,   375.,   250.,   125.,     0.,     0.,     0.,
+                            0.,   500.,  1000.,   900.,   800.,   700.,   600.,   500.,
+                            400.,   300.,   200.,   100.,     0.,   500.,  1000.,  1000.])
+                red   =  ([    0.,     0.,     0.,     0.,   500.,  1000.,   900.,   800.,
+                            700.,   600.,   500.,   400.,   300.,   200.,   100.,     0.,
+                            0.,   0.,     0.,     0.,     0.,     0.,   125.,   250.,
+                            375.,   500.,   500.,   500.,   500.,   500.,   500.,   500.,
+                            500.,   500.,   375.,   250.,   125.,     0.,     0.,     0.,
+                            0.,   500.,  1000.,   900.,   800.,   700.,   600.,   500.,
+                            400.,   300.,   200.,   100.,     0.,   500.,  1000.,  1000.])
+                blue =    ([    0.,     0.,     0.,     0.,   500.,  1000.,   900.,   800.,
+                              700.,   600.,   500.,   400.,   300.,   200.,   100.,     0.,
+                              0.,     0.,     0.,     0.,     0.,     0.,   125.,   250.,
+                              375.,   500.,   625.,   750.,   875.,  1000.,   875.,   750.,
+                              625.,   500.,   375.,   250.,   125.,     0.,     0.,     0.,
+                            0.,   500.,  1000.,   900.,   800.,   700.,   600.,   500.,
+                            400.,   300.,   200.,   100.,     0.,   500.,  1000.,  1000.])
+
+                self.ax.plot(green, color='green', label='Hands: %d\nProfit: $%.2f' %(len(green), green[-1]))
+                self.ax.plot(blue, color='blue', label='Showdown: $%.2f' %(blue[-1]))
+                self.ax.plot(red, color='red', label='Non-showdown: $%.2f' %(red[-1]))
+                self.graphBox.add(self.canvas)
+                self.canvas.show()
+                self.canvas.draw()
 
                 #TODO: Do something useful like alert user
-                print "No hands returned by graph query"
+                #print "No hands returned by graph query"
             else:
+                self.ax.set_title("Profit graph for ring games")
                 #text = "Profit: $%.2f\nTotal Hands: %d" %(green[-1], len(green))
                 #self.ax.annotate(text,
                 #                 xy=(10, -10),
@@ -203,7 +232,6 @@ class GuiGraphViewer (threading.Thread):
                 else:
                     self.ax.legend(loc='best', fancybox=True, shadow=True, prop=FontProperties(size='smaller'))
 
-
                 self.graphBox.add(self.canvas)
                 self.canvas.show()
                 self.canvas.draw()
@@ -292,7 +320,7 @@ class GuiGraphViewer (threading.Thread):
         self.db.rollback()
 
         if winnings == ():
-            return None
+            return (None, None, None)
 
         green = map(lambda x:float(x[1]), winnings)
         blue  = map(lambda x: float(x[1]) if x[2] == True  else 0.0, winnings)

From a23d96e85d2a12902d43c4c5f6912fc664d9dfd6 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Fri, 29 Jan 2010 17:00:37 +0800
Subject: [PATCH 158/320] Add Carbon back in as default data.

Also add PKR
---
 pyfpdb/Database.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index ee43079c..a8456294 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -1328,6 +1328,8 @@ class Database:
         c.execute("INSERT INTO Sites (name,currency) VALUES ('Absolute', 'USD')")
         c.execute("INSERT INTO Sites (name,currency) VALUES ('PartyPoker', 'USD')")
         c.execute("INSERT INTO Sites (name,currency) VALUES ('Partouche', 'EUR')")
+        c.execute("INSERT INTO Sites (name,currency) VALUES ('Carbon', 'USD')")
+        c.execute("INSERT INTO Sites (name,currency) VALUES ('PKR', 'USD')")
         if self.backend == self.SQLITE:
             c.execute("INSERT INTO TourneyTypes (id, siteId, buyin, fee) VALUES (NULL, 1, 0, 0);")
         elif self.backend == self.PGSQL:

From 52a176fd0a6ea3efb274120ddcf1c9ba2108eafb Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Fri, 29 Jan 2010 09:12:08 +0000
Subject: [PATCH 159/320] tidy up filter, add ability to refresh (eg after
 importing more gametypes)

---
 pyfpdb/Filters.py | 143 ++++++++++++++++++++++++++++++++++++----------
 1 file changed, 112 insertions(+), 31 deletions(-)

diff --git a/pyfpdb/Filters.py b/pyfpdb/Filters.py
index fa6d2400..7f75cc4e 100644
--- a/pyfpdb/Filters.py
+++ b/pyfpdb/Filters.py
@@ -42,6 +42,26 @@ class Filters(threading.Thread):
         self.conf = db.config
         self.display = display
 
+        # text used on screen stored here so that it can be configured
+        self.filterText = {'limitsall':'All', 'limitsnone':'None', 'limitsshow':'Show _Limits'
+                          ,'seatsbetween':'Between:', 'seatsand':'And:', 'seatsshow':'Show Number of _Players'
+                          ,'playerstitle':'Hero:', 'sitestitle':'Sites:', 'gamestitle':'Games:'
+                          ,'limitstitle':'Limits:', 'seatstitle':'Number of Players:'
+                          ,'groupstitle':'Grouping:', 'posnshow':'Show Position Stats:'
+                          ,'datestitle':'Date:'
+                          ,'groupsall':'All Players'
+                          ,'limitsFL':'FL', 'limitsNL':'NL', 'limitsPL':'PL', 'ring':'Ring', 'tour':'Tourney'
+                          }
+
+        # Outer Packing box
+        self.mainVBox = gtk.VBox(False, 0)
+
+        self.label = {}
+        self.callback = {}
+
+        self.make_filter()
+        
+    def make_filter(self):
         self.sites  = {}
         self.games  = {}
         self.limits = {}
@@ -60,16 +80,6 @@ class Filters(threading.Thread):
             else:
                 print "Either 0 or more than one site matched - EEK"
 
-
-        # text used on screen stored here so that it can be configured
-        self.filterText = {'limitsall':'All', 'limitsnone':'None', 'limitsshow':'Show _Limits'
-                          ,'seatsbetween':'Between:', 'seatsand':'And:', 'seatsshow':'Show Number of _Players'
-                          ,'limitstitle':'Limits:', 'seatstitle':'Number of Players:'
-                          ,'groupstitle':'Grouping:', 'posnshow':'Show Position Stats:'
-                          ,'groupsall':'All Players'
-                          ,'limitsFL':'FL', 'limitsNL':'NL', 'limitsPL':'PL', 'ring':'Ring', 'tour':'Tourney'
-                          }
-
         # For use in date ranges.
         self.start_date = gtk.Entry(max=12)
         self.end_date = gtk.Entry(max=12)
@@ -80,34 +90,28 @@ class Filters(threading.Thread):
         self.sbGroups = {}
         self.numHands = 0
 
-        # Outer Packing box
-        self.mainVBox = gtk.VBox(False, 0)
-
-        playerFrame = gtk.Frame("Hero:")
+        playerFrame = gtk.Frame()
         playerFrame.set_label_align(0.0, 0.0)
         vbox = gtk.VBox(False, 0)
 
         self.fillPlayerFrame(vbox, self.display)
         playerFrame.add(vbox)
-        self.boxes['player'] = vbox
 
-        sitesFrame = gtk.Frame("Sites:")
+        sitesFrame = gtk.Frame()
         sitesFrame.set_label_align(0.0, 0.0)
         vbox = gtk.VBox(False, 0)
 
         self.fillSitesFrame(vbox)
         sitesFrame.add(vbox)
-        self.boxes['sites'] = vbox
 
         # Game types
-        gamesFrame = gtk.Frame("Games:")
+        gamesFrame = gtk.Frame()
         gamesFrame.set_label_align(0.0, 0.0)
         gamesFrame.show()
         vbox = gtk.VBox(False, 0)
 
         self.fillGamesFrame(vbox)
         gamesFrame.add(vbox)
-        self.boxes['games'] = vbox
 
         # Limits
         limitsFrame = gtk.Frame()
@@ -144,14 +148,13 @@ class Filters(threading.Thread):
         groupsFrame.add(vbox)
 
         # Date
-        dateFrame = gtk.Frame("Date:")
+        dateFrame = gtk.Frame()
         dateFrame.set_label_align(0.0, 0.0)
         dateFrame.show()
         vbox = gtk.VBox(False, 0)
 
         self.fillDateFrame(vbox)
         dateFrame.add(vbox)
-        self.boxes['date'] = vbox
 
         # Buttons
         self.Button1=gtk.Button("Unnamed 1")
@@ -192,6 +195,17 @@ class Filters(threading.Thread):
         if "Button2" not in self.display or self.display["Button2"] == False:
             self.Button2.hide()
 
+        if 'button1' in self.label and self.label['button1']:
+            self.Button1.set_label( self.label['button1'] )
+        if 'button2' in self.label and self.label['button2']:
+            self.Button2.set_label( self.label['button2'] )
+        if 'button1' in self.callback and self.callback['button1']:
+            self.Button1.connect("clicked", self.callback['button1'], "clicked")
+            self.Button1.set_sensitive(True)
+        if 'button2' in self.callback and self.callback['button2']:
+            self.Button2.connect("clicked", self.callback['button2'], "clicked")
+            self.Button2.set_sensitive(True)
+
     def get_vbox(self):
         """returns the vbox of this thread"""
         return self.mainVBox
@@ -237,17 +251,21 @@ class Filters(threading.Thread):
 
     def registerButton1Name(self, title):
         self.Button1.set_label(title)
+        self.label['button1'] = title
 
     def registerButton1Callback(self, callback):
         self.Button1.connect("clicked", callback, "clicked")
         self.Button1.set_sensitive(True)
+        self.callback['button1'] = callback
 
     def registerButton2Name(self, title):
         self.Button2.set_label(title)
+        self.label['button2'] = title
 
     def registerButton2Callback(self, callback):
         self.Button2.connect("clicked", callback, "clicked")
         self.Button2.set_sensitive(True)
+        self.callback['button2'] = callback
 
     def cardCallback(self, widget, data=None):
         print "DEBUG: %s was toggled %s" % (data, ("OFF", "ON")[widget.get_active()])
@@ -255,7 +273,7 @@ class Filters(threading.Thread):
     def createPlayerLine(self, hbox, site, player):
         print 'DEBUG :: add:"%s"' % player
         label = gtk.Label(site +" id:")
-        hbox.pack_start(label, False, False, 0)
+        hbox.pack_start(label, False, False, 3)
 
         pname = gtk.Entry()
         pname.set_text(player)
@@ -464,9 +482,22 @@ class Filters(threading.Thread):
         print "self.groups[%s] set to %s" %(group, self.groups[group])
 
     def fillPlayerFrame(self, vbox, display):
+        top_hbox = gtk.HBox(False, 0)
+        vbox.pack_start(top_hbox, False, False, 0)
+        lbl_title = gtk.Label(self.filterText['playerstitle'])
+        lbl_title.set_alignment(xalign=0.0, yalign=0.5)
+        top_hbox.pack_start(lbl_title, expand=True, padding=3)
+        showb = gtk.Button(label="refresh", stock=None, use_underline=True)
+        showb.set_alignment(xalign=1.0, yalign=0.5)
+        showb.connect('clicked', self.__refresh, 'players')
+
+        vbox1 = gtk.VBox(False, 0)
+        vbox.pack_start(vbox1, False, False, 0)
+        self.boxes['players'] = vbox1
+
         for site in self.conf.get_supported_sites():
             hBox = gtk.HBox(False, 0)
-            vbox.pack_start(hBox, False, True, 0)
+            vbox1.pack_start(hBox, False, True, 0)
 
             player = self.conf.supported_sites[site].screen_name
             _pname = Charset.to_gui(player)
@@ -474,7 +505,7 @@ class Filters(threading.Thread):
 
         if "GroupsAll" in display and display["GroupsAll"] == True:
             hbox = gtk.HBox(False, 0)
-            vbox.pack_start(hbox, False, False, 0)
+            vbox1.pack_start(hbox, False, False, 0)
             cb = gtk.CheckButton(self.filterText['groupsall'])
             cb.connect('clicked', self.__set_group_select, 'allplayers')
             hbox.pack_start(cb, False, False, 0)
@@ -490,11 +521,30 @@ class Filters(threading.Thread):
             phands.set_width_chars(8)
             hbox.pack_start(phands, False, False, 0)
             phands.connect("changed", self.__set_num_hands, site)
+        top_hbox.pack_start(showb, expand=False, padding=1)
 
     def fillSitesFrame(self, vbox):
+        top_hbox = gtk.HBox(False, 0)
+        top_hbox.show()
+        vbox.pack_start(top_hbox, False, False, 0)
+
+        lbl_title = gtk.Label(self.filterText['sitestitle'])
+        lbl_title.set_alignment(xalign=0.0, yalign=0.5)
+        top_hbox.pack_start(lbl_title, expand=True, padding=3)
+
+        showb = gtk.Button(label="hide", stock=None, use_underline=True)
+        showb.set_alignment(xalign=1.0, yalign=0.5)
+        showb.connect('clicked', self.__toggle_box, 'sites')
+        showb.show()
+        top_hbox.pack_start(showb, expand=False, padding=1)
+
+        vbox1 = gtk.VBox(False, 0)
+        self.boxes['sites'] = vbox1
+        vbox.pack_start(vbox1, False, False, 0)
+
         for site in self.conf.get_supported_sites():
             hbox = gtk.HBox(False, 0)
-            vbox.pack_start(hbox, False, True, 0)
+            vbox1.pack_start(hbox, False, True, 0)
             self.createSiteLine(hbox, site)
             #Get db site id for filtering later
             #self.cursor.execute(self.sql.query['getSiteId'], (site,))
@@ -505,12 +555,26 @@ class Filters(threading.Thread):
             #    print "Either 0 or more than one site matched - EEK"
 
     def fillGamesFrame(self, vbox):
+        top_hbox = gtk.HBox(False, 0)
+        vbox.pack_start(top_hbox, False, False, 0)
+        lbl_title = gtk.Label(self.filterText['gamestitle'])
+        lbl_title.set_alignment(xalign=0.0, yalign=0.5)
+        top_hbox.pack_start(lbl_title, expand=True, padding=3)
+        showb = gtk.Button(label="hide", stock=None, use_underline=True)
+        showb.set_alignment(xalign=1.0, yalign=0.5)
+        showb.connect('clicked', self.__toggle_box, 'games')
+        top_hbox.pack_start(showb, expand=False, padding=1)
+
+        vbox1 = gtk.VBox(False, 0)
+        vbox.pack_start(vbox1, False, False, 0)
+        self.boxes['games'] = vbox1
+
         self.cursor.execute(self.sql.query['getGames'])
         result = self.db.cursor.fetchall()
         if len(result) >= 1:
             for line in result:
                 hbox = gtk.HBox(False, 0)
-                vbox.pack_start(hbox, False, True, 0)
+                vbox1.pack_start(hbox, False, True, 0)
                 self.createGameLine(hbox, line[0])
         else:
             print "INFO: No games returned from database"
@@ -705,8 +769,22 @@ class Filters(threading.Thread):
 
     def fillDateFrame(self, vbox):
         # Hat tip to Mika Bostrom - calendar code comes from PokerStats
+        top_hbox = gtk.HBox(False, 0)
+        vbox.pack_start(top_hbox, False, False, 0)
+        lbl_title = gtk.Label(self.filterText['datestitle'])
+        lbl_title.set_alignment(xalign=0.0, yalign=0.5)
+        top_hbox.pack_start(lbl_title, expand=True, padding=3)
+        showb = gtk.Button(label="hide", stock=None, use_underline=True)
+        showb.set_alignment(xalign=1.0, yalign=0.5)
+        showb.connect('clicked', self.__toggle_box, 'dates')
+        top_hbox.pack_start(showb, expand=False, padding=1)
+
+        vbox1 = gtk.VBox(False, 0)
+        vbox.pack_start(vbox1, False, False, 0)
+        self.boxes['dates'] = vbox1
+
         hbox = gtk.HBox()
-        vbox.pack_start(hbox, False, True, 0)
+        vbox1.pack_start(hbox, False, True, 0)
 
         lbl_start = gtk.Label('From:')
 
@@ -720,7 +798,7 @@ class Filters(threading.Thread):
 
         #New row for end date
         hbox = gtk.HBox()
-        vbox.pack_start(hbox, False, True, 0)
+        vbox1.pack_start(hbox, False, True, 0)
 
         lbl_end = gtk.Label('  To:')
         btn_end = gtk.Button()
@@ -736,10 +814,13 @@ class Filters(threading.Thread):
 
         hbox.pack_start(btn_clear, expand=False, padding=15)
 
+    def __refresh(self, widget, entry):
+        for w in self.mainVBox.get_children():
+            w.destroy()
+        self.make_filter()
+
     def __toggle_box(self, widget, entry):
-        if "Limits" not in self.display or self.display["Limits"] == False:
-            self.boxes[entry].hide()
-        elif self.boxes[entry].props.visible:
+        if self.boxes[entry].props.visible:
             self.boxes[entry].hide()
             widget.set_label("show")
         else:

From e56cb24ed11ff00416e58a99737288c0230a7b37 Mon Sep 17 00:00:00 2001
From: Eric Blade <blade.eric@gmail.com>
Date: Fri, 29 Jan 2010 12:01:51 -0500
Subject: [PATCH 160/320] to_utf8 returns what was passed in if unicode()
 errors because it's already encoded

---
 pyfpdb/Charset.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/Charset.py b/pyfpdb/Charset.py
index d49b6219..5851683a 100644
--- a/pyfpdb/Charset.py
+++ b/pyfpdb/Charset.py
@@ -42,6 +42,8 @@ def to_utf8(s):
     except UnicodeDecodeError:
         sys.stderr.write('Could not convert: "%s"\n' % s)
         raise
+    except TypeError: # TypeError is raised when we give unicode() an already encoded string
+        return s
 
 def to_db_utf8(s):
     if not_needed: return s
@@ -62,4 +64,3 @@ def to_gui(s):
     except UnicodeDecodeError:
         sys.stderr.write('Could not convert: "%s"\n' % s)
         raise
-

From 5982df0b041cfae6438f96baf89fdf859e63a6b8 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Fri, 29 Jan 2010 22:15:09 +0000
Subject: [PATCH 161/320] add test case that made me add special test for
 sqlite in insertplayers - can't repeat now so removing test. Error was that a
 unicode type (name) was encoded to UTF-8 by Charset.to_db_utf8() and then
 errored when passed to sqlite. sqlite3 can handle unicode types directly so I
 added a test to skip the to_db_utf8() if using sqlite. Perhaps problem was
 caused by moving hand history between machines (but shouldn't it still work
 anyway?)

---
 regression-test/ps-lhe-unicode1.txt | 44 +++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100755 regression-test/ps-lhe-unicode1.txt

diff --git a/regression-test/ps-lhe-unicode1.txt b/regression-test/ps-lhe-unicode1.txt
new file mode 100755
index 00000000..a8460e9d
--- /dev/null
+++ b/regression-test/ps-lhe-unicode1.txt
@@ -0,0 +1,44 @@
+PokerStars Game #28817981310:  Hold'em Limit ($0.25/$0.50) - 2009/05/31 4:38:53 ET
+Table 'Mufrid II' 6-max Seat #1 is the button
+Seat 1: AirbornMac ($16.90 in chips) 
+Seat 2: Im a Fishhhh ($6.25 in chips) 
+Seat 3: SteadyAim ($10 in chips) 
+Seat 4: DrickDaSlick ($6.40 in chips) 
+Seat 5: vik55 ($11.65 in chips) 
+Seat 6: Malbés ($9.55 in chips) 
+Im a Fishhhh: posts small blind $0.10
+SteadyAim: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to SteadyAim [5s Jc]
+DrickDaSlick: folds 
+vik55: folds 
+Malbés: raises $0.25 to $0.50
+AirbornMac: folds 
+Im a Fishhhh: calls $0.40
+SteadyAim: folds 
+*** FLOP *** [Ks 6c Qh]
+Im a Fishhhh: checks 
+Malbés: bets $0.25
+Im a Fishhhh: calls $0.25
+*** TURN *** [Ks 6c Qh] [Td]
+Im a Fishhhh: checks 
+Malbés: bets $0.50
+Im a Fishhhh: calls $0.50
+*** RIVER *** [Ks 6c Qh Td] [Kd]
+Im a Fishhhh: checks 
+Malbés: checks 
+*** SHOW DOWN ***
+Im a Fishhhh: shows [As 8h] (a pair of Kings)
+Malbés: mucks hand 
+Im a Fishhhh collected $2.65 from pot
+*** SUMMARY ***
+Total pot $2.75 | Rake $0.10 
+Board [Ks 6c Qh Td Kd]
+Seat 1: AirbornMac (button) folded before Flop (didn't bet)
+Seat 2: Im a Fishhhh (small blind) showed [As 8h] and won ($2.65) with a pair of Kings
+Seat 3: SteadyAim (big blind) folded before Flop
+Seat 4: DrickDaSlick folded before Flop (didn't bet)
+Seat 5: vik55 folded before Flop (didn't bet)
+Seat 6: Malbés mucked [7d Jd]
+
+

From 2e970baa8251c3d2319f0dbb14587099b3bc035e Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Fri, 29 Jan 2010 22:29:14 +0000
Subject: [PATCH 162/320] remove sqlite specific test to skip unicode encoding

---
 pyfpdb/Database.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index a8456294..b0a49112 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -1769,10 +1769,7 @@ class Database:
 
     def insertPlayer(self, name, site_id):
         result = None
-        if self.backend == self.SQLITE:
-            _name = name
-        else:
-            _name = Charset.to_db_utf8(name)
+        _name = Charset.to_db_utf8(name)
         c = self.get_cursor()
         q = "SELECT name, id FROM Players WHERE siteid=%s and name=%s"
         q = q.replace('%s', self.sql.query['placeholder'])

From f7ac36f3bbfe79c4da3b094aa624fdeafe503732 Mon Sep 17 00:00:00 2001
From: Eric Blade <blade.eric@gmail.com>
Date: Fri, 29 Jan 2010 17:44:58 -0500
Subject: [PATCH 163/320] add getTableTitleRe to everleaf filter, doesn't seem
 to work

---
 pyfpdb/EverleafToFpdb.py | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py
index fcd76c25..ad9d0524 100755
--- a/pyfpdb/EverleafToFpdb.py
+++ b/pyfpdb/EverleafToFpdb.py
@@ -2,12 +2,12 @@
 # -*- coding: utf-8 -*-
 #
 #    Copyright 2008, Carl Gherardi
-#    
+#
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
-#    
+#
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -25,7 +25,7 @@ from HandHistoryConverter import *
 # Class for converting Everleaf HH format.
 
 class Everleaf(HandHistoryConverter):
-    
+
     sitename = 'Everleaf'
     filetype = "text"
     codepage = "cp1252"
@@ -40,8 +40,8 @@ class Everleaf(HandHistoryConverter):
     re_Button      = re.compile(ur"^Seat (?P<BUTTON>\d+) is the button", re.MULTILINE)
     re_PlayerInfo  = re.compile(ur"^Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\s+((?:\$| €|) (?P<CASH>[.0-9]+) (USD|EUR|)|new player|All-in) \)", re.MULTILINE)
     re_Board       = re.compile(ur"\[ (?P<CARDS>.+) \]")
-    
-    
+
+
     def compilePlayerRegexs(self, hand):
         players = set([player[1] for player in hand.players])
         if not players <= self.compiledPlayers: # x <= y means 'x is subset of y'
@@ -83,30 +83,30 @@ class Everleaf(HandHistoryConverter):
     'currency'  in ('USD', 'EUR', 'T$', <countrycode>)
 or None if we fail to get the info """
         #(TODO: which parts are optional/required?)
-    
+
         # Blinds $0.50/$1 PL Omaha - 2008/12/07 - 21:59:48
         # Blinds $0.05/$0.10 NL Hold'em - 2009/02/21 - 11:21:57
         # $0.25/$0.50 7 Card Stud - 2008/12/05 - 21:43:59
-        
+
         # Tourney:
         # Everleaf Gaming Game #75065769
         # ***** Hand history for game #75065769 *****
         # Blinds 10/20 NL Hold'em - 2009/02/25 - 17:30:32
         # Table 2
         info = {'type':'ring'}
-        
+
         m = self.re_GameInfo.search(handText)
         if not m:
             return None
-        
+
         mg = m.groupdict()
-        
+
         # translations from captured groups to our info strings
         limits = { 'NL':'nl', 'PL':'pl', '':'fl' }
         games = {              # base, category
-                  "Hold'em" : ('hold','holdem'), 
-                    'Omaha' : ('hold','omahahi'), 
-                     'Razz' : ('stud','razz'), 
+                  "Hold'em" : ('hold','holdem'),
+                    'Omaha' : ('hold','omahahi'),
+                     'Razz' : ('stud','razz'),
               '7 Card Stud' : ('stud','studhi')
                }
         currencies = { u' €':'EUR', '$':'USD', '':'T$' }
@@ -123,7 +123,7 @@ or None if we fail to get the info """
             if info['currency'] == 'T$':
                 info['type'] = 'tour'
         # NB: SB, BB must be interpreted as blinds or bets depending on limit type.
-        
+
         return info
 
 
@@ -156,8 +156,8 @@ or None if we fail to get the info """
             if seatnum > 6:
                 hand.maxseats = 10 # everleaf currently does 2/6/10 games, so if seats > 6 are in use, it must be 10-max.
                 # TODO: implement lookup list by table-name to determine maxes, then fall back to 6 default/10 here, if there's no entry in the list?
-            
-        
+
+
     def markStreets(self, hand):
         # PREFLOP = ** Dealing down cards **
         # This re fails if,  say, river is missing; then we don't get the ** that starts the river.
@@ -196,7 +196,7 @@ or None if we fail to get the info """
     def readBringIn(self, hand):
         m = self.re_BringIn.search(hand.handText,re.DOTALL)
         if m:
-            logging.debug("Player bringing in: %s for %s" %(m.group('PNAME'),  m.group('BRINGIN')))        
+            logging.debug("Player bringing in: %s for %s" %(m.group('PNAME'),  m.group('BRINGIN')))
             hand.addBringIn(m.group('PNAME'),  m.group('BRINGIN'))
         else:
             logging.warning("No bringin found.")
@@ -285,6 +285,10 @@ or None if we fail to get the info """
 #                hand.addShownCards(cards=None, player=m.group('PNAME'), holeandboard=cards)
                 hand.addShownCards(cards=cards, player=m.group('PNAME'))
 
+    @staticmethod
+    def getTableTitleRe(type, table_name=None, tournament = None, table_number=None):
+        return "^%s -" % (table_name)
+
 
 
 if __name__ == "__main__":
@@ -305,4 +309,3 @@ if __name__ == "__main__":
     logging.basicConfig(filename=LOG_FILENAME,level=options.verbosity)
 
     e = Everleaf(in_path = options.ipath, out_path = options.opath, follow = options.follow, autostart=True)
-

From 72b890c56190bd5941968405748411859e073ee8 Mon Sep 17 00:00:00 2001
From: Eric Blade <blade.eric@gmail.com>
Date: Fri, 29 Jan 2010 17:45:49 -0500
Subject: [PATCH 164/320] add "HUD Test mode" checkbox to bulk import, doesn't
 currently do anything.  intent is to make the program auto open a dummy
 window for a hud to attach to, so we can bulk import files to investigate hud
 issues

---
 pyfpdb/GuiBulkImport.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/GuiBulkImport.py b/pyfpdb/GuiBulkImport.py
index a64a9425..96842134 100755
--- a/pyfpdb/GuiBulkImport.py
+++ b/pyfpdb/GuiBulkImport.py
@@ -89,7 +89,8 @@ class GuiBulkImport():
 
                 for selection in selected:
                     self.importer.addBulkImportImportFileOrDir(selection, site = sitename)
-                self.importer.setCallHud(False)
+                self.importer.setCallHud(self.cb_testmode.get_active())
+                self.importer.bHudTest = self.cb_testmode.get_active()
                 starttime = time()
 #                try:
                 (stored, dups, partial, errs, ttime) = self.importer.runImport()
@@ -228,6 +229,10 @@ class GuiBulkImport():
                           ypadding=0, yoptions=gtk.SHRINK)
         self.cb_dropindexes.show()
 
+        self.cb_testmode = gtk.CheckButton('HUD Test mode')
+        self.table.attach(self.cb_testmode, 0, 1, 2, 3, xpadding=10, ypadding=0, yoptions=gtk.SHRINK)
+        self.cb_testmode.show()
+
 #    label - filter
         self.lab_filter = gtk.Label("Site filter:")
         self.table.attach(self.lab_filter, 1, 2, 2, 3, xpadding=0, ypadding=0,

From a7d4c6243ab0b660e859827e8663425473fa3c71 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Fri, 29 Jan 2010 23:29:37 +0000
Subject: [PATCH 165/320] add assignment (but commented out) that fixes unicode
 probs for me with sqlite

---
 pyfpdb/Database.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index b0a49112..bf6c04af 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -399,6 +399,11 @@ class Database:
             self.cursor = self.connection.cursor()
             self.cursor.execute('PRAGMA temp_store=2')  # use memory for temp tables/indexes
             self.cursor.execute('PRAGMA synchronous=0') # don't wait for file writes to finish
+            
+            # sqlcoder: this assignment fixes unicode problems for me with sqlite (windows, cp1252)
+            #           feel free to remove or improve this if you understand the problems
+            #           better than me (not hard!)
+            # Charset.not_needed = True
         else:
             raise FpdbError("unrecognised database backend:"+backend)
 

From d147187a712c64632928d53cd2cfd78172401be0 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Fri, 29 Jan 2010 23:36:39 +0000
Subject: [PATCH 166/320] add extra comment/suggestion

---
 pyfpdb/Database.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index bf6c04af..0b6cac8e 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -403,6 +403,8 @@ class Database:
             # sqlcoder: this assignment fixes unicode problems for me with sqlite (windows, cp1252)
             #           feel free to remove or improve this if you understand the problems
             #           better than me (not hard!)
+            #           I think maybe we need a separate "not_needed" flag for each of the routines
+            #           in Charset.py???
             # Charset.not_needed = True
         else:
             raise FpdbError("unrecognised database backend:"+backend)

From 9932025271d7f6ba25d9c7bf8aa80097ef17b07d Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sat, 30 Jan 2010 11:05:34 +0000
Subject: [PATCH 167/320] move sqlite charset fix to Configuration.py from
 Database.py, make separate not_needed variables in Charset.py in case we want
 to update them separately

---
 pyfpdb/Charset.py       | 10 +++++-----
 pyfpdb/Configuration.py | 10 ++++++++++
 pyfpdb/Database.py      | 11 ++---------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/pyfpdb/Charset.py b/pyfpdb/Charset.py
index d49b6219..6b5e6b7c 100644
--- a/pyfpdb/Charset.py
+++ b/pyfpdb/Charset.py
@@ -28,12 +28,12 @@ encoder_to_utf = codecs.lookup('utf-8')
 encoder_to_sys = codecs.lookup(Configuration.LOCALE_ENCODING)
 
 # I'm saving a few cycles with this one
-not_needed = False
+not_needed1, not_needed2, not_needed3 = False, False, False
 if Configuration.LOCALE_ENCODING == 'UTF8':
-    not_needed = True
+    not_needed1, not_needed2, not_needed3 = True, True, True
 
 def to_utf8(s):
-    if not_needed: return s
+    if not_needed1: return s
 
     try:
         #(_out, _len) = encoder_to_utf.encode(s)
@@ -44,7 +44,7 @@ def to_utf8(s):
         raise
 
 def to_db_utf8(s):
-    if not_needed: return s
+    if not_needed2: return s
 
     try:
         (_out, _len) = encoder_to_utf.encode(unicode(s))
@@ -54,7 +54,7 @@ def to_db_utf8(s):
         raise
 
 def to_gui(s):
-    if not_needed: return s
+    if not_needed3: return s
 
     try:
         (_out, _len) = encoder_to_sys.encode(s)
diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py
index 9c14d16f..9e90a5bb 100644
--- a/pyfpdb/Configuration.py
+++ b/pyfpdb/Configuration.py
@@ -144,6 +144,11 @@ if LOCALE_ENCODING == "US-ASCII":
     print "Default encoding set to US-ASCII, defaulting to CP1252 instead -- If you're not on a Mac, please report this problem."
     LOCALE_ENCODING = "cp1252"
 
+
+# needs LOCALE_ENCODING (above), imported for sqlite setup in Config class below
+import Charset
+
+
 ########################################################################
 def string_to_bool(string, default=True):
     """converts a string representation of a boolean value to boolean True or False
@@ -648,6 +653,11 @@ class Config:
             db['db-backend'] = 3
         elif self.supported_databases[name].db_server== DATABASE_TYPE_SQLITE:
             db['db-backend'] = 4
+
+            # sqlcoder: this assignment fixes unicode problems for me with sqlite (windows, cp1252)
+            #           feel free to remove or improve this if you understand the problems
+            #           better than me (not hard!)
+            #Charset.not_needed1, Charset.not_needed2, Charset.not_needed3 = True, True, True
         else:
             raise ValueError('Unsupported database backend: %s' % self.supported_databases[name].db_server)
         return db
diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index 0b6cac8e..754af54a 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -372,7 +372,6 @@ class Database:
                     print msg
                     raise FpdbError(msg)
         elif backend == Database.SQLITE:
-            log.info("Connecting to SQLite: %(database)s" % {'database':database})
             import sqlite3
             if use_pool:
                 sqlite3 = pool.manage(sqlite3, pool_size=1)
@@ -385,7 +384,8 @@ class Database:
                     log.info("Creating directory: '%s'" % (self.config.dir_databases))
                     os.mkdir(self.config.dir_databases)
                 database = os.path.join(self.config.dir_databases, database)
-            log.info("  sqlite db: " + database)
+            log.info("Connecting to SQLite: %(database)s" % {'database':database})
+            print "Connecting to SQLite: %(database)s" % {'database':database}
             self.connection = sqlite3.connect(database, detect_types=sqlite3.PARSE_DECLTYPES )
             sqlite3.register_converter("bool", lambda x: bool(int(x)))
             sqlite3.register_adapter(bool, lambda x: "1" if x else "0")
@@ -399,13 +399,6 @@ class Database:
             self.cursor = self.connection.cursor()
             self.cursor.execute('PRAGMA temp_store=2')  # use memory for temp tables/indexes
             self.cursor.execute('PRAGMA synchronous=0') # don't wait for file writes to finish
-            
-            # sqlcoder: this assignment fixes unicode problems for me with sqlite (windows, cp1252)
-            #           feel free to remove or improve this if you understand the problems
-            #           better than me (not hard!)
-            #           I think maybe we need a separate "not_needed" flag for each of the routines
-            #           in Charset.py???
-            # Charset.not_needed = True
         else:
             raise FpdbError("unrecognised database backend:"+backend)
 

From e0c5f52d0f002114c0922994201906ecd99c8dc6 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sat, 30 Jan 2010 11:11:21 +0000
Subject: [PATCH 168/320] uncommented sqlite unicode fix (fix only tested on
 Windows XP, cp1252)

---
 pyfpdb/Configuration.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py
index 9e90a5bb..639007f1 100644
--- a/pyfpdb/Configuration.py
+++ b/pyfpdb/Configuration.py
@@ -653,11 +653,10 @@ class Config:
             db['db-backend'] = 3
         elif self.supported_databases[name].db_server== DATABASE_TYPE_SQLITE:
             db['db-backend'] = 4
-
             # sqlcoder: this assignment fixes unicode problems for me with sqlite (windows, cp1252)
             #           feel free to remove or improve this if you understand the problems
             #           better than me (not hard!)
-            #Charset.not_needed1, Charset.not_needed2, Charset.not_needed3 = True, True, True
+            Charset.not_needed1, Charset.not_needed2, Charset.not_needed3 = True, True, True
         else:
             raise ValueError('Unsupported database backend: %s' % self.supported_databases[name].db_server)
         return db

From e61fb7677c65c04ba1276852a1e446edd07c301b Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sat, 30 Jan 2010 11:18:10 +0000
Subject: [PATCH 169/320] remove unicode test file as error seems to have gone
 away

---
 regression-test/ps-lhe-unicode1.txt | 44 -----------------------------
 1 file changed, 44 deletions(-)
 delete mode 100755 regression-test/ps-lhe-unicode1.txt

diff --git a/regression-test/ps-lhe-unicode1.txt b/regression-test/ps-lhe-unicode1.txt
deleted file mode 100755
index a8460e9d..00000000
--- a/regression-test/ps-lhe-unicode1.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-PokerStars Game #28817981310:  Hold'em Limit ($0.25/$0.50) - 2009/05/31 4:38:53 ET
-Table 'Mufrid II' 6-max Seat #1 is the button
-Seat 1: AirbornMac ($16.90 in chips) 
-Seat 2: Im a Fishhhh ($6.25 in chips) 
-Seat 3: SteadyAim ($10 in chips) 
-Seat 4: DrickDaSlick ($6.40 in chips) 
-Seat 5: vik55 ($11.65 in chips) 
-Seat 6: Malbés ($9.55 in chips) 
-Im a Fishhhh: posts small blind $0.10
-SteadyAim: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to SteadyAim [5s Jc]
-DrickDaSlick: folds 
-vik55: folds 
-Malbés: raises $0.25 to $0.50
-AirbornMac: folds 
-Im a Fishhhh: calls $0.40
-SteadyAim: folds 
-*** FLOP *** [Ks 6c Qh]
-Im a Fishhhh: checks 
-Malbés: bets $0.25
-Im a Fishhhh: calls $0.25
-*** TURN *** [Ks 6c Qh] [Td]
-Im a Fishhhh: checks 
-Malbés: bets $0.50
-Im a Fishhhh: calls $0.50
-*** RIVER *** [Ks 6c Qh Td] [Kd]
-Im a Fishhhh: checks 
-Malbés: checks 
-*** SHOW DOWN ***
-Im a Fishhhh: shows [As 8h] (a pair of Kings)
-Malbés: mucks hand 
-Im a Fishhhh collected $2.65 from pot
-*** SUMMARY ***
-Total pot $2.75 | Rake $0.10 
-Board [Ks 6c Qh Td Kd]
-Seat 1: AirbornMac (button) folded before Flop (didn't bet)
-Seat 2: Im a Fishhhh (small blind) showed [As 8h] and won ($2.65) with a pair of Kings
-Seat 3: SteadyAim (big blind) folded before Flop
-Seat 4: DrickDaSlick folded before Flop (didn't bet)
-Seat 5: vik55 folded before Flop (didn't bet)
-Seat 6: Malbés mucked [7d Jd]
-
-

From 6d9cdd9587b02a821bfd4ee9766990650cf3e953 Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Sat, 30 Jan 2010 14:54:46 -0500
Subject: [PATCH 170/320] Fix problem where Qc is not encoded correctly.

---
 pyfpdb/Card.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pyfpdb/Card.py b/pyfpdb/Card.py
index 23a0b7c4..46d56262 100755
--- a/pyfpdb/Card.py
+++ b/pyfpdb/Card.py
@@ -140,10 +140,10 @@ def valueSuitFromCard(card):
         return suitFromCardList[card]
 
 encodeCardList = {'2h':  1, '3h':  2, '4h':  3, '5h':  4, '6h':  5, '7h':  6, '8h':  7, '9h':  8, 'Th':  9, 'Jh': 10, 'Qh': 11, 'Kh': 12, 'Ah': 13,
-                '2d': 14, '3d': 15, '4d': 16, '5d': 17, '6d': 18, '7d': 19, '8d': 20, '9d': 21, 'Td': 22, 'Jd': 23, 'Qd': 24, 'Kd': 25, 'Ad': 26,
-                '2c': 27, '3c': 28, '4c': 29, '5c': 30, '6c': 31, '7c': 32, '8c': 33, '9c': 34, 'Tc': 35, 'Jc': 36, 'Qc': 27, 'Kc': 38, 'Ac': 39,
-                '2s': 40, '3s': 41, '4s': 42, '5s': 43, '6s': 44, '7s': 45, '8s': 46, '9s': 47, 'Ts': 48, 'Js': 49, 'Qs': 50, 'Ks': 51, 'As': 52,
-                '  ':  0
+                  '2d': 14, '3d': 15, '4d': 16, '5d': 17, '6d': 18, '7d': 19, '8d': 20, '9d': 21, 'Td': 22, 'Jd': 23, 'Qd': 24, 'Kd': 25, 'Ad': 26,
+                  '2c': 27, '3c': 28, '4c': 29, '5c': 30, '6c': 31, '7c': 32, '8c': 33, '9c': 34, 'Tc': 35, 'Jc': 36, 'Qc': 37, 'Kc': 38, 'Ac': 39,
+                  '2s': 40, '3s': 41, '4s': 42, '5s': 43, '6s': 44, '7s': 45, '8s': 46, '9s': 47, 'Ts': 48, 'Js': 49, 'Qs': 50, 'Ks': 51, 'As': 52,
+                  '  ':  0
                 }
 
 def encodeCard(cardString):

From cc5f77e950421dbd708e1e9ba773fc91784a6bf7 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sun, 31 Jan 2010 11:16:42 +0000
Subject: [PATCH 171/320] fix windows problem starting hud

---
 pyfpdb/GuiAutoImport.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/GuiAutoImport.py b/pyfpdb/GuiAutoImport.py
index 628f7b7f..339ce968 100755
--- a/pyfpdb/GuiAutoImport.py
+++ b/pyfpdb/GuiAutoImport.py
@@ -194,7 +194,8 @@ class GuiAutoImport (threading.Thread):
                 widget.set_label(u'  _Stop Autoimport  ')
                 if self.pipe_to_hud is None:
                     if os.name == 'nt':
-                        command = "python "+sys.path[0]+"\\HUD_main.py " + self.settings['cl_options']
+                        path = sys.path[0].replace('\\','\\\\')
+                        command = 'python "'+path+'\\HUD_main.py" ' + self.settings['cl_options']
                         bs = 0
                     else:
                         command = os.path.join(sys.path[0], 'HUD_main.py')

From 5e9486aa3dc16ebd105f976c483d5f44d2b0e65c Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sun, 31 Jan 2010 11:25:24 +0000
Subject: [PATCH 172/320] config changes for logging: logs rotate and go to
 APPDATA, hud_config now goes in /fpdb/ if they must use it but logging.conf
 stays in /pyfpdb/.  TODO: Some logging still into /fpdb/log/

---
 pyfpdb/Configuration.py        | 57 ++++++++++++++++++++++++----------
 pyfpdb/Database.py             | 12 ++++---
 pyfpdb/HUD_main.py             | 56 +++++++++++++++++----------------
 pyfpdb/Hand.py                 | 28 +++++++++++------
 pyfpdb/HandHistoryConverter.py | 19 +++++++-----
 pyfpdb/fpdb.py                 |  1 +
 pyfpdb/fpdb_import.py          |  3 +-
 pyfpdb/logging.conf            | 31 ++++++++++--------
 8 files changed, 126 insertions(+), 81 deletions(-)
 mode change 100644 => 100755 pyfpdb/Hand.py
 mode change 100644 => 100755 pyfpdb/HandHistoryConverter.py
 mode change 100644 => 100755 pyfpdb/fpdb_import.py
 mode change 100644 => 100755 pyfpdb/logging.conf

diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py
index 639007f1..fd40b408 100644
--- a/pyfpdb/Configuration.py
+++ b/pyfpdb/Configuration.py
@@ -52,16 +52,19 @@ def get_default_config_path():
     return config_path
 
 def get_exec_path():
-    """Returns the path to the fpdb.(py|exe) file we are executing"""
+    """Returns the path to the fpdb(dir|.exe) file we are executing"""
     if hasattr(sys, "frozen"):  # compiled by py2exe
         return os.path.dirname(sys.executable)
     else:
-        return sys.path[0]
+        return os.path.dirname(sys.path[0])  # should be path to /fpdb
 
 def get_config(file_name, fallback = True):
     """Looks in cwd and in self.default_config_path for a config file."""
     exec_dir = get_exec_path()
-    config_path = os.path.join(exec_dir, file_name)
+    if file_name == 'logging.conf':
+        config_path = os.path.join(exec_dir, 'pyfpdb', file_name)
+    else:
+        config_path = os.path.join(exec_dir, file_name)
 #    print "config_path=", config_path
     if os.path.exists(config_path):    # there is a file in the cwd
         return config_path             # so we use it
@@ -80,11 +83,7 @@ def get_config(file_name, fallback = True):
     if os.path.exists(file_name + ".example"):
         try:
             print ""
-            if not os.path.isdir(default_dir):
-                msg = "Creating directory: '%s'" % (default_dir)
-                print msg
-                logging.info(msg)
-                os.mkdir(default_dir)
+            check_dir(default_dir)
             shutil.copyfile(file_name + ".example", config_path)
             msg = "No %s found in %s or %s\n" % (file_name, exec_dir, default_dir) \
                   + "Config file has been created at %s.\n" % config_path \
@@ -104,11 +103,17 @@ def get_config(file_name, fallback = True):
         sys.exit()
     return file_name
 
-def get_logger(file_name, config = "config", fallback = False):
-    conf = get_config(file_name, fallback = fallback)
-    if conf:
+def get_logger(file_name, config = "config", fallback = False, log_dir=None):
+    conf_file = get_config(file_name, fallback = fallback)
+    if conf_file:
         try:
-            logging.config.fileConfig(conf)
+            if log_dir is None:
+                log_dir = os.path.join(get_exec_path(), 'log')
+            check_dir(log_dir)
+            file = os.path.join(log_dir, 'logging.out')
+            file = file.replace('\\', '\\\\')  # replace each \ with \\
+#            print "    ="+file+" "+ str(type(file))+" len="+str(len(file))+"\n"
+            logging.config.fileConfig(conf_file, {"logFile":file})
             log = logging.getLogger(config)
             log.debug("%s logger initialised" % config)
             return log
@@ -120,8 +125,23 @@ def get_logger(file_name, config = "config", fallback = False):
     log.debug("config logger initialised")
     return log
 
+def check_dir(path, create = True):
+    """Check if a dir exists, optionally creates if not."""
+    if os.path.exists(path):
+        if os.path.isdir(path):
+            return path
+        else:
+            return False
+    if create:
+        msg = "Creating directory: '%s'" % (path)
+        print msg
+        log.info(msg)
+        os.mkdir(path)
+    else:
+        return False
+
 #    find a logging.conf file and set up logging
-log = get_logger("logging.conf")
+log = get_logger("logging.conf", "config")
 
 ########################################################################
 # application wide consts
@@ -421,7 +441,6 @@ class Tv:
 
 class Config:
     def __init__(self, file = None, dbname = ''):
-
 #    "file" is a path to an xml file with the fpdb/HUD configuration
 #    we check the existence of "file" and try to recover if it doesn't exist
 
@@ -435,6 +454,13 @@ class Config:
 
         if file is None: file = get_config("HUD_config.xml", True)
 
+        self.file = file
+        self.dir_self = get_exec_path()
+        self.dir_config = os.path.dirname(self.file)
+        self.dir_log = os.path.join(self.dir_config, 'log')
+        self.dir_database = os.path.join(self.dir_config, 'database')
+        log = get_logger("logging.conf", "config", log_dir=self.dir_log)
+
 #    Parse even if there was no real config file found and we are using the example
 #    If using the example, we'll edit it later
         log.info("Reading configuration file %s" % file)
@@ -449,9 +475,6 @@ class Config:
             sys.exit()
 
         self.doc = doc
-        self.file = file
-        self.dir = os.path.dirname(self.file)
-        self.dir_databases = os.path.join(self.dir, 'database')
         self.supported_sites = {}
         self.supported_games = {}
         self.supported_databases = {}        # databaseName --> Database instance
diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index 754af54a..d91681be 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -224,6 +224,7 @@ class Database:
 
 
     def __init__(self, c, sql = None): 
+        log = Configuration.get_logger("logging.conf", "db", log_dir=c.dir_log)
         log.info("Creating Database instance, sql = %s" % sql)
         self.config = c
         self.__connected = False
@@ -379,11 +380,11 @@ class Database:
                 log.warning("SQLite won't work well without 'sqlalchemy' installed.")
 
             if database != ":memory:":
-                if not os.path.isdir(self.config.dir_databases):
-                    print "Creating directory: '%s'" % (self.config.dir_databases)
-                    log.info("Creating directory: '%s'" % (self.config.dir_databases))
-                    os.mkdir(self.config.dir_databases)
-                database = os.path.join(self.config.dir_databases, database)
+                if not os.path.isdir(self.config.dir_database):
+                    print "Creating directory: '%s'" % (self.config.dir_database)
+                    log.info("Creating directory: '%s'" % (self.config.dir_database))
+                    os.mkdir(self.config.dir_database)
+                database = os.path.join(self.config.dir_database, database)
             log.info("Connecting to SQLite: %(database)s" % {'database':database})
             print "Connecting to SQLite: %(database)s" % {'database':database}
             self.connection = sqlite3.connect(database, detect_types=sqlite3.PARSE_DECLTYPES )
@@ -787,6 +788,7 @@ class Database:
             
     def get_player_id(self, config, site, player_name):
         c = self.connection.cursor()
+        print "get_player_id: player_name =", player_name, type(player_name)
         p_name = Charset.to_utf8(player_name)
         c.execute(self.sql.query['get_player_id'], (p_name, site))
         row = c.fetchone()
diff --git a/pyfpdb/HUD_main.py b/pyfpdb/HUD_main.py
index df144e92..c792d802 100755
--- a/pyfpdb/HUD_main.py
+++ b/pyfpdb/HUD_main.py
@@ -51,10 +51,8 @@ import gobject
 #    FreePokerTools modules
 import Configuration
 
-print "start logging"
 log = Configuration.get_logger("logging.conf", config = 'hud')
-log.debug("%s logger initialized." % "dud")
-print "logging started"
+log.debug("%s logger initialized." % "hud")
 
 
 import Database
@@ -68,36 +66,40 @@ elif os.name == 'nt':
 import Hud
 
 
-log = Configuration.get_logger("logging.conf")
-
-
 class HUD_main(object):
     """A main() object to own both the read_stdin thread and the gui."""
 #    This class mainly provides state for controlling the multiple HUDs.
 
     def __init__(self, db_name = 'fpdb'):
-        self.db_name = db_name
-        self.log = log
-        self.config = Configuration.Config(file=options.config, dbname=options.dbname)
-        self.hud_dict = {}
-        self.hud_params = self.config.get_hud_ui_parameters()
+        try:
+            print "HUD_main: starting ..."
+            self.db_name = db_name
+            self.config = Configuration.Config(file=options.config, dbname=options.dbname)
+            log = Configuration.get_logger("logging.conf", "hud", log_dir=self.config.dir_log)
+            log.debug("starting ...")
+            self.hud_dict = {}
+            self.hud_params = self.config.get_hud_ui_parameters()
 
-#    a thread to read stdin
-        gobject.threads_init()                       # this is required
-        thread.start_new_thread(self.read_stdin, ()) # starts the thread
+    #    a thread to read stdin
+            gobject.threads_init()                       # this is required
+            thread.start_new_thread(self.read_stdin, ()) # starts the thread
+
+    #    a main window
+            self.main_window = gtk.Window()
+            self.main_window.connect("destroy", self.destroy)
+            self.vb = gtk.VBox()
+            self.label = gtk.Label('Closing this window will exit from the HUD.')
+            self.vb.add(self.label)
+            self.main_window.add(self.vb)
+            self.main_window.set_title("HUD Main Window")
+            self.main_window.show_all()
+        except:
+            log.debug("commit "+str(i)+" failed: info=" + str(sys.exc_info())
+                          + " value=" + str(sys.exc_value))
 
-#    a main window
-        self.main_window = gtk.Window()
-        self.main_window.connect("destroy", self.destroy)
-        self.vb = gtk.VBox()
-        self.label = gtk.Label('Closing this window will exit from the HUD.')
-        self.vb.add(self.label)
-        self.main_window.add(self.vb)
-        self.main_window.set_title("HUD Main Window")
-        self.main_window.show_all()
 
     def destroy(self, *args):             # call back for terminating the main eventloop
-        self.log.info("Terminating normally.")
+        log.info("Terminating normally.")
         gtk.main_quit()
 
     def kill_hud(self, event, table):
@@ -205,7 +207,7 @@ class HUD_main(object):
             t0 = time.time()
             t1 = t2 = t3 = t4 = t5 = t6 = t0
             new_hand_id = string.rstrip(new_hand_id)
-            self.log.debug("Received hand no %s" % new_hand_id)
+            log.debug("Received hand no %s" % new_hand_id)
             if new_hand_id == "":           # blank line means quit
                 self.destroy()
                 break # this thread is not always killed immediately with gtk.main_quit()
@@ -217,7 +219,7 @@ class HUD_main(object):
                 (table_name, max, poker_game, type, site_id, site_name, num_seats, tour_number, tab_number) = \
                                 self.db_connection.get_table_info(new_hand_id)
             except Exception, err:
-                self.log.error("db error: skipping %s" % new_hand_id)
+                log.error("db error: skipping %s" % new_hand_id)
                 continue
             t1 = time.time()
 
@@ -276,7 +278,7 @@ class HUD_main(object):
                     if type == "tour":
                         table_name = "%s %s" % (tour_number, tab_number)
 #                    sys.stderr.write("HUD create: table name "+table_name+" not found, skipping.\n")
-                    self.log.error("HUD create: table name %s not found, skipping." % table_name)
+                    log.error("HUD create: table name %s not found, skipping." % table_name)
                 else:
                     tablewindow.max = max
                     tablewindow.site = site_name
diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
old mode 100644
new mode 100755
index 9c7ea23f..0f69121a
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -28,12 +28,14 @@ from decimal import Decimal
 import operator
 import time,datetime
 from copy import deepcopy
-from Exceptions import *
 import pprint
+
+import Configuration
+from Exceptions import *
 import DerivedStats
 import Card
 
-log = logging.getLogger("parser")
+log = Configuration.get_logger("logging.conf", "parser")
 
 class Hand(object):
 
@@ -46,7 +48,9 @@ class Hand(object):
     SITEIDS = {'Fulltilt':1, 'PokerStars':2, 'Everleaf':3, 'Win2day':4, 'OnGame':5, 'UltimateBet':6, 'Betfair':7, 'Absolute':8, 'PartyPoker':9, 'Partouche':10, 'Carbon':11 }
 
 
-    def __init__(self, sitename, gametype, handText, builtFrom = "HHC"):
+    def __init__(self, config, sitename, gametype, handText, builtFrom = "HHC"):
+        self.config = config
+        log = Configuration.get_logger("logging.conf", "db", log_dir=self.config.dir_log)
         self.sitename = sitename
         self.siteId = self.SITEIDS[sitename]
         self.stats = DerivedStats.DerivedStats(self)
@@ -617,7 +621,8 @@ Map the tuple self.gametype onto the pokerstars string describing it
 
 
 class HoldemOmahaHand(Hand):
-    def __init__(self, hhc, sitename, gametype, handText, builtFrom = "HHC", handid=None):
+    def __init__(self, config, hhc, sitename, gametype, handText, builtFrom = "HHC", handid=None):
+        self.config = config
         if gametype['base'] != 'hold':
             pass # or indeed don't pass and complain instead
         log.debug("HoldemOmahaHand")
@@ -625,7 +630,7 @@ class HoldemOmahaHand(Hand):
         self.holeStreets = ['PREFLOP']
         self.communityStreets = ['FLOP', 'TURN', 'RIVER']
         self.actionStreets = ['BLINDSANTES','PREFLOP','FLOP','TURN','RIVER']
-        Hand.__init__(self, sitename, gametype, handText, builtFrom = "HHC")
+        Hand.__init__(self, self.config, sitename, gametype, handText, builtFrom = "HHC")
         self.sb = gametype['sb']
         self.bb = gametype['bb']
 
@@ -916,7 +921,8 @@ class HoldemOmahaHand(Hand):
         print >>fh, "\n\n"
 
 class DrawHand(Hand):
-    def __init__(self, hhc, sitename, gametype, handText, builtFrom = "HHC"):
+    def __init__(self, config, hhc, sitename, gametype, handText, builtFrom = "HHC"):
+        self.config = config
         if gametype['base'] != 'draw':
             pass # or indeed don't pass and complain instead
         self.streetList = ['BLINDSANTES', 'DEAL', 'DRAWONE', 'DRAWTWO', 'DRAWTHREE']
@@ -924,7 +930,7 @@ class DrawHand(Hand):
         self.holeStreets = ['DEAL', 'DRAWONE', 'DRAWTWO', 'DRAWTHREE']
         self.actionStreets =  ['BLINDSANTES', 'DEAL', 'DRAWONE', 'DRAWTWO', 'DRAWTHREE']
         self.communityStreets = []
-        Hand.__init__(self, sitename, gametype, handText)
+        Hand.__init__(self, self.config, sitename, gametype, handText)
         self.sb = gametype['sb']
         self.bb = gametype['bb']
         # Populate the draw hand.
@@ -1108,7 +1114,8 @@ class DrawHand(Hand):
 
 
 class StudHand(Hand):
-    def __init__(self, hhc, sitename, gametype, handText, builtFrom = "HHC"):
+    def __init__(self, config, hhc, sitename, gametype, handText, builtFrom = "HHC"):
+        self.config = config
         if gametype['base'] != 'stud':
             pass # or indeed don't pass and complain instead
 
@@ -1118,7 +1125,7 @@ class StudHand(Hand):
 
         self.streetList = ['BLINDSANTES','THIRD','FOURTH','FIFTH','SIXTH','SEVENTH'] # a list of the observed street names in order
         self.holeStreets = ['THIRD','FOURTH','FIFTH','SIXTH','SEVENTH']
-        Hand.__init__(self, sitename, gametype, handText)
+        Hand.__init__(self, self.config, sitename, gametype, handText)
         self.sb = gametype['sb']
         self.bb = gametype['bb']
         #Populate the StudHand
@@ -1511,7 +1518,8 @@ limit 1""", {'handid':handid})
     #TODO: siteid should be in hands table - we took the scenic route through players here.
     res = c.fetchone()
     gametype = {'category':res[1],'base':res[2],'type':res[3],'limitType':res[4],'hilo':res[5],'sb':res[6],'bb':res[7], 'currency':res[10]}
-    h = HoldemOmahaHand(hhc = None, sitename=res[0], gametype = gametype, handText=None, builtFrom = "DB", handid=handid)
+    c = Configuration.Config()
+    h = HoldemOmahaHand(config = c, hhc = None, sitename=res[0], gametype = gametype, handText=None, builtFrom = "DB", handid=handid)
     cards = map(Card.valueSuitFromCard, res[11:16] )
     if cards[0]:
         h.setCommunityCards('FLOP', cards[0:3])
diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
old mode 100644
new mode 100755
index bec2ebae..45760ee6
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -16,8 +16,6 @@
 #In the "official" distribution you can find the license in
 #agpl-3.0.txt in the docs folder of the package.
 
-import Hand
-import Tourney
 import re
 import sys
 import traceback
@@ -31,13 +29,16 @@ import operator
 from xml.dom.minidom import Node
 import time
 import datetime
+
+import Hand
+import Tourney
 from Exceptions import FpdbParseError
 import Configuration
 
 import gettext
 gettext.install('fpdb')
 
-log = Configuration.get_logger("logging.conf")
+log = Configuration.get_logger("logging.conf", "parser")
 
 import pygtk
 import gtk
@@ -57,12 +58,14 @@ class HandHistoryConverter():
     codepage = "cp1252"
 
 
-    def __init__(self, in_path = '-', out_path = '-', follow=False, index=0, autostart=True, starsArchive=False):
+    def __init__(self, config, in_path = '-', out_path = '-', follow=False, index=0, autostart=True, starsArchive=False):
         """\
 in_path   (default '-' = sys.stdin)
 out_path  (default '-' = sys.stdout)
 follow :  whether to tail -f the input"""
 
+        self.config = config
+        log = Configuration.get_logger("logging.conf", "parser", log_dir=self.config.dir_log)
         log.info("HandHistory init - %s subclass, in_path '%s'; out_path '%s'" % (self.sitename, in_path, out_path) )
         
         self.index     = index
@@ -283,11 +286,11 @@ which it expects to find at self.re_TailSplitHands -- see for e.g. Everleaf.py.
         if l in self.readSupportedGames():
             if gametype['base'] == 'hold':
                 log.debug("hand = Hand.HoldemOmahaHand(self, self.sitename, gametype, handtext)")
-                hand = Hand.HoldemOmahaHand(self, self.sitename, gametype, handText)
+                hand = Hand.HoldemOmahaHand(self.config, self, self.sitename, gametype, handText)
             elif gametype['base'] == 'stud':
-                hand = Hand.StudHand(self, self.sitename, gametype, handText)
+                hand = Hand.StudHand(self.config, self, self.sitename, gametype, handText)
             elif gametype['base'] == 'draw':
-                hand = Hand.DrawHand(self, self.sitename, gametype, handText)
+                hand = Hand.DrawHand(self.config, self, self.sitename, gametype, handText)
         else:
             log.info("Unsupported game type: %s" % gametype)
 
@@ -417,7 +420,7 @@ or None if we fail to get the info """
         list.pop() #Last entry is empty
         for l in list:
 #           print "'" + l + "'"
-            hands = hands + [Hand.Hand(self.sitename, self.gametype, l)]
+            hands = hands + [Hand.Hand(self.config, self.sitename, self.gametype, l)]
         # TODO: This looks like it could be replaced with a list comp.. ?
         return hands
 
diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py
index f202698d..12c05d11 100755
--- a/pyfpdb/fpdb.py
+++ b/pyfpdb/fpdb.py
@@ -695,6 +695,7 @@ class fpdb:
     def load_profile(self):
         """Loads profile from the provided path name."""
         self.config = Configuration.Config(file=options.config, dbname=options.dbname)
+        log = Configuration.get_logger("logging.conf", "fpdb", log_dir=self.config.dir_log)
         self.settings = {}
         self.settings['global_lock'] = self.lock
         if (os.sep=="/"):
diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
old mode 100644
new mode 100755
index 859a6bc0..a02d3d99
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -65,6 +65,7 @@ class Importer:
         self.config     = config
         self.sql        = sql
 
+        log = Configuration.get_logger("logging.conf", "importer", log_dir=self.config.dir_log)
         self.filelist   = {}
         self.dirlist    = {}
         self.siteIds    = {}
@@ -429,7 +430,7 @@ class Importer:
                 idx = self.pos_in_file[file]
             else:
                 self.pos_in_file[file] = 0
-            hhc = obj(in_path = file, out_path = out_path, index = idx, starsArchive = self.settings['starsArchive'])
+            hhc = obj(self.config, in_path = file, out_path = out_path, index = idx, starsArchive = self.settings['starsArchive'])
             if hhc.getStatus():
                 handlist = hhc.getProcessedHands()
                 self.pos_in_file[file] = hhc.getLastCharacterRead()
diff --git a/pyfpdb/logging.conf b/pyfpdb/logging.conf
old mode 100644
new mode 100755
index 1b54b453..4ca06db1
--- a/pyfpdb/logging.conf
+++ b/pyfpdb/logging.conf
@@ -1,64 +1,69 @@
 [loggers]
-keys=root,parser,importer,config,db
+keys=root,fpdb,logview,parser,importer,config,db,hud
 
 [handlers]
-keys=consoleHandler,fileHandler
+keys=consoleHandler,rotatingFileHandler
 
 [formatters]
 keys=fileFormatter,stderrFormatter
 
 [logger_root]
 level=INFO
-handlers=consoleHandler,fileHandler
+handlers=consoleHandler,rotatingFileHandler
 
 [logger_fpdb]
 level=INFO
-handlers=consoleHandler,fileHandler
+handlers=consoleHandler,rotatingFileHandler
 qualname=fpdb
 propagate=0
 
 [logger_logview]
 level=INFO
-handlers=consoleHandler,fileHandler
+handlers=consoleHandler,rotatingFileHandler
 qualname=logview
 propagate=0
 
 [logger_parser]
 level=INFO
-handlers=consoleHandler,fileHandler
+handlers=consoleHandler,rotatingFileHandler
 qualname=parser
 propagate=0
 
 [logger_importer]
 level=DEBUG
-handlers=consoleHandler,fileHandler
+handlers=consoleHandler,rotatingFileHandler
 qualname=importer
 propagate=0
 
 [logger_config]
 level=INFO
-handlers=consoleHandler,fileHandler
+handlers=consoleHandler,rotatingFileHandler
 qualname=config
 propagate=0
 
 [logger_db]
 level=DEBUG
-handlers=consoleHandler,fileHandler
+handlers=consoleHandler,rotatingFileHandler
 qualname=db
 propagate=0
 
+[logger_hud]
+level=DEBUG
+handlers=consoleHandler,rotatingFileHandler
+qualname=hud
+propagate=0
+
 [handler_consoleHandler]
 class=StreamHandler
 level=ERROR
 formatter=stderrFormatter
 args=(sys.stderr,)
 
-[handler_fileHandler]
-class=FileHandler
+[handler_rotatingFileHandler]
+class=handlers.RotatingFileHandler
 level=DEBUG
 formatter=fileFormatter
-args=('logging.out', 'a')
-
+args=('%(logFile)s', 'a', 50000, 5)
 
 [formatter_fileFormatter]
 format=%(asctime)s - %(name)-12s %(levelname)-8s %(message)s

From f7b402bcdb8ec309fa6340e532cb85c499706883 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sun, 31 Jan 2010 11:27:37 +0000
Subject: [PATCH 173/320] remove execute from permissions on some files in last
 commit

---
 pyfpdb/Hand.py                 | 0
 pyfpdb/HandHistoryConverter.py | 0
 pyfpdb/fpdb_import.py          | 0
 pyfpdb/logging.conf            | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 pyfpdb/Hand.py
 mode change 100755 => 100644 pyfpdb/HandHistoryConverter.py
 mode change 100755 => 100644 pyfpdb/fpdb_import.py
 mode change 100755 => 100644 pyfpdb/logging.conf

diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
old mode 100755
new mode 100644
diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
old mode 100755
new mode 100644
diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
old mode 100755
new mode 100644
diff --git a/pyfpdb/logging.conf b/pyfpdb/logging.conf
old mode 100755
new mode 100644

From bbc84fef14ebdb6f5d9015746807e43698fc9f68 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sun, 31 Jan 2010 12:22:24 +0000
Subject: [PATCH 174/320] comment out debug message

---
 pyfpdb/Database.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index d91681be..ebdfceaa 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -788,7 +788,7 @@ class Database:
             
     def get_player_id(self, config, site, player_name):
         c = self.connection.cursor()
-        print "get_player_id: player_name =", player_name, type(player_name)
+        #print "get_player_id: player_name =", player_name, type(player_name)
         p_name = Charset.to_utf8(player_name)
         c.execute(self.sql.query['get_player_id'], (p_name, site))
         row = c.fetchone()

From 6f0ea2580b4c8e484ef0a0bbc31944986e11b3a5 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sun, 31 Jan 2010 12:24:32 +0000
Subject: [PATCH 175/320] display dialog when .example config has been copied,
 this could work 'out-of-the-box' if the user already has gtk??

---
 pyfpdb/Configuration.py | 19 +++++++++----------
 pyfpdb/fpdb.py          | 27 ++++++++++++++++++++-------
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py
index fd40b408..9c7e44b6 100644
--- a/pyfpdb/Configuration.py
+++ b/pyfpdb/Configuration.py
@@ -67,17 +67,17 @@ def get_config(file_name, fallback = True):
         config_path = os.path.join(exec_dir, file_name)
 #    print "config_path=", config_path
     if os.path.exists(config_path):    # there is a file in the cwd
-        return config_path             # so we use it
+        return (config_path,False)     # so we use it
     else: # no file in the cwd, look where it should be in the first place
         default_dir = get_default_config_path()
         config_path = os.path.join(default_dir, file_name)
 #        print "config path 2=", config_path
         if os.path.exists(config_path):
-            return config_path
+            return (config_path,False)
 
 #    No file found
     if not fallback:
-        return False
+        return (False,False)
 
 #    OK, fall back to the .example file, should be in the start dir
     if os.path.exists(file_name + ".example"):
@@ -85,10 +85,8 @@ def get_config(file_name, fallback = True):
             print ""
             check_dir(default_dir)
             shutil.copyfile(file_name + ".example", config_path)
-            msg = "No %s found in %s or %s\n" % (file_name, exec_dir, default_dir) \
-                  + "Config file has been created at %s.\n" % config_path \
-                  + "Edit your screen_name and hand history path in the supported_sites "\
-                  + "section of the \nPreferences window (Main menu) before trying to import hands."
+            msg = "No %s found\n  in %s\n  or %s\n" % (file_name, exec_dir, default_dir) \
+                  + "Config file has been created at %s.\n" % config_path
             print msg
             logging.info(msg)
             file_name = config_path
@@ -101,10 +99,10 @@ def get_config(file_name, fallback = True):
         print "No %s found, cannot fall back. Exiting.\n" % file_name
         sys.stderr.write("No %s found, cannot fall back. Exiting.\n" % file_name)
         sys.exit()
-    return file_name
+    return (file_name,True)
 
 def get_logger(file_name, config = "config", fallback = False, log_dir=None):
-    conf_file = get_config(file_name, fallback = fallback)
+    (conf_file,copied) = get_config(file_name, fallback = fallback)
     if conf_file:
         try:
             if log_dir is None:
@@ -445,6 +443,7 @@ class Config:
 #    we check the existence of "file" and try to recover if it doesn't exist
 
 #        self.default_config_path = self.get_default_config_path()
+        self.example_copy = False
         if file is not None: # config file path passed in
             file = os.path.expanduser(file)
             if not os.path.exists(file):
@@ -452,7 +451,7 @@ class Config:
                 sys.stderr.write("Configuration file %s not found.  Using defaults." % (file))
                 file = None
 
-        if file is None: file = get_config("HUD_config.xml", True)
+        if file is None: (file,self.example_copy) = get_config("HUD_config.xml", True)
 
         self.file = file
         self.dir_self = get_exec_path()
diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py
index 12c05d11..58e0128d 100755
--- a/pyfpdb/fpdb.py
+++ b/pyfpdb/fpdb.py
@@ -696,6 +696,11 @@ class fpdb:
         """Loads profile from the provided path name."""
         self.config = Configuration.Config(file=options.config, dbname=options.dbname)
         log = Configuration.get_logger("logging.conf", "fpdb", log_dir=self.config.dir_log)
+        if self.config.example_copy:
+            self.info_box( "Config file"
+                         , "has been created at:\n%s.\n" % self.config.file
+                           + "Edit your screen_name and hand history path in the supported_sites "
+                           + "section of the Preferences window (Main menu) before trying to import hands.")
         self.settings = {}
         self.settings['global_lock'] = self.lock
         if (os.sep=="/"):
@@ -963,16 +968,24 @@ This program is licensed under the AGPL3, see docs"""+os.sep+"agpl-3.0.txt")
             self.window.show()
             self.window.present()
 
+    def info_box(self, str1, str2):
+        diapath = gtk.MessageDialog( parent=None, flags=0, type=gtk.MESSAGE_INFO
+                                   , buttons=(gtk.BUTTONS_OK), message_format=str1 )
+        diapath.format_secondary_text(str2)
+        response = diapath.run()
+        diapath.destroy()
+        return response
+
     def warning_box(self, str, diatitle="FPDB WARNING"):
-            diaWarning = gtk.Dialog(title=diatitle, parent=None, flags=0, buttons=(gtk.STOCK_OK,gtk.RESPONSE_OK))
+        diaWarning = gtk.Dialog(title=diatitle, parent=None, flags=0, buttons=(gtk.STOCK_OK,gtk.RESPONSE_OK))
 
-            label = gtk.Label(str)
-            diaWarning.vbox.add(label)
-            label.show()
+        label = gtk.Label(str)
+        diaWarning.vbox.add(label)
+        label.show()
 
-            response = diaWarning.run()
-            diaWarning.destroy()
-            return response
+        response = diaWarning.run()
+        diaWarning.destroy()
+        return response
 
     def validate_config(self):
         hhbase    = self.config.get_import_parameters().get("hhArchiveBase")

From 002a84ba5aab269809df1a7a2d5a65735a709eed Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sun, 31 Jan 2010 12:31:49 +0000
Subject: [PATCH 176/320] set rotating logs to max 5 files of 100MB each

---
 pyfpdb/logging.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/logging.conf b/pyfpdb/logging.conf
index 4ca06db1..a7c0323f 100644
--- a/pyfpdb/logging.conf
+++ b/pyfpdb/logging.conf
@@ -63,7 +63,7 @@ args=(sys.stderr,)
 class=handlers.RotatingFileHandler
 level=DEBUG
 formatter=fileFormatter
-args=('%(logFile)s', 'a', 50000, 5)
+args=('%(logFile)s', 'a', 100000000, 5)
 
 [formatter_fileFormatter]
 format=%(asctime)s - %(name)-12s %(levelname)-8s %(message)s

From 4636e244ea99eff81248afb36aa5c39ea58bfcb3 Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Sun, 31 Jan 2010 17:58:48 +0100
Subject: [PATCH 177/320] Codec errors seem to lock up HUD with windows.

I've made a trap for each error that I observed.
don't want to halt the program so I return the original string.
The de/recoding is not needed for >95% of the playernames anyway.
---
 pyfpdb/Charset.py | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/pyfpdb/Charset.py b/pyfpdb/Charset.py
index 6b5e6b7c..02b5c098 100644
--- a/pyfpdb/Charset.py
+++ b/pyfpdb/Charset.py
@@ -41,7 +41,13 @@ def to_utf8(s):
         return _out
     except UnicodeDecodeError:
         sys.stderr.write('Could not convert: "%s"\n' % s)
-        raise
+        return s
+    except UnicodeEncodeError:
+        sys.stderr.write('Could not convert: "%s"\n' % s)
+        return s
+    except TypeError:
+        sys.stderr.write('Could not convert: "%s"\n' % s)
+        return s
 
 def to_db_utf8(s):
     if not_needed2: return s
@@ -51,7 +57,13 @@ def to_db_utf8(s):
         return _out
     except UnicodeDecodeError:
         sys.stderr.write('Could not convert: "%s"\n' % s)
-        raise
+        return s
+    except UnicodeEncodeError:
+        sys.stderr.write('Could not convert: "%s"\n' % s)
+        return s
+    except TypeError:
+        sys.stderr.write('Could not convert: "%s"\n' % s)
+        return s
 
 def to_gui(s):
     if not_needed3: return s
@@ -61,5 +73,11 @@ def to_gui(s):
         return _out
     except UnicodeDecodeError:
         sys.stderr.write('Could not convert: "%s"\n' % s)
-        raise
+        return s
+    except UnicodeEncodeError:
+        sys.stderr.write('Could not convert: "%s"\n' % s)
+        return s
+    except TypeError:
+        sys.stderr.write('Could not convert: "%s"\n' % s)
+        return s
 

From 64bfa9cd525ecba7fbc136d0eecb8182a7dc85c4 Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Sun, 31 Jan 2010 13:37:59 -0500
Subject: [PATCH 178/320] Import mucked cards.

---
 pyfpdb/FulltiltToFpdb.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index 2ee8bdd5..af55fd41 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -137,7 +137,7 @@ class Fulltilt(HandHistoryConverter):
             self.re_ShowdownAction   = re.compile(r"^%s shows \[(?P<CARDS>.*)\]" % player_re, re.MULTILINE)
             self.re_CollectPot       = re.compile(r"^Seat (?P<SEAT>[0-9]+): %s (\(button\) |\(small blind\) |\(big blind\) )?(collected|showed \[.*\] and won) \(\$?(?P<POT>[.,\d]+)\)(, mucked| with.*)" % player_re, re.MULTILINE)
             self.re_SitsOut          = re.compile(r"^%s sits out" % player_re, re.MULTILINE)
-            self.re_ShownCards       = re.compile(r"^Seat (?P<SEAT>[0-9]+): %s \(.*\) showed \[(?P<CARDS>.*)\].*" % player_re, re.MULTILINE)
+            self.re_ShownCards       = re.compile(r"^Seat (?P<SEAT>[0-9]+): %s (\(button\) |\(small blind\) |\(big blind\) )?(?P<ACT>showed|mucked) \[(?P<CARDS>.*)\].*" % player_re, re.MULTILINE)
 
     def readSupportedGames(self):
         return [["ring", "hold", "nl"], 
@@ -390,9 +390,10 @@ class Fulltilt(HandHistoryConverter):
     def readShownCards(self,hand):
         for m in self.re_ShownCards.finditer(hand.handText):
             if m.group('CARDS') is not None:
-                cards = m.group('CARDS')
-                cards = cards.split(' ')
-                hand.addShownCards(cards=cards, player=m.group('PNAME'))
+                if m.group('ACT'):
+                    hand.addShownCards(cards=m.group('CARDS').split(' '), player=m.group('PNAME'), shown = False, mucked = True)
+                else:
+                    hand.addShownCards(cards=m.group('CARDS').split(' '), player=m.group('PNAME'), shown = True, mucked = False)
 
     def guessMaxSeats(self, hand):
         """Return a guess at max_seats when not specified in HH."""

From 264b75b5b0b155efdfeeb59c57d61cddd3e40d37 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sun, 31 Jan 2010 23:46:51 +0000
Subject: [PATCH 179/320] fix some sqlite and unicode issues (thanks to Gerko)

---
 pyfpdb/Filters.py        | 3 ++-
 pyfpdb/GuiGraphViewer.py | 2 +-
 pyfpdb/SQL.py            | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/Filters.py b/pyfpdb/Filters.py
index 7f75cc4e..d5dec059 100644
--- a/pyfpdb/Filters.py
+++ b/pyfpdb/Filters.py
@@ -297,7 +297,8 @@ class Filters(threading.Thread):
 
     def __set_hero_name(self, w, site):
         _name = w.get_text()
-        _guiname = Charset.to_gui(_name)
+        # get_text() returns a str but we want internal variables to be unicode:
+        _guiname = unicode(_name)
         self.heroes[site] = _guiname
 #        print "DEBUG: setting heroes[%s]: %s"%(site, self.heroes[site])
 
diff --git a/pyfpdb/GuiGraphViewer.py b/pyfpdb/GuiGraphViewer.py
index ce9648ae..dcfa979c 100644
--- a/pyfpdb/GuiGraphViewer.py
+++ b/pyfpdb/GuiGraphViewer.py
@@ -319,7 +319,7 @@ class GuiGraphViewer (threading.Thread):
         winnings = self.db.cursor.fetchall()
         self.db.rollback()
 
-        if winnings == ():
+        if len(winnings) == 0:
             return (None, None, None)
 
         green = map(lambda x:float(x[1]), winnings)
diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py
index 43925c01..7a83ac99 100644
--- a/pyfpdb/SQL.py
+++ b/pyfpdb/SQL.py
@@ -2021,6 +2021,7 @@ class Sql:
         elif db_server == 'sqlite':
             self.query['playerDetailedStats'] = """
                      select  <hgameTypeId>                                                          AS hgametypeid
+                            ,<playerName>                                                           AS pname
                             ,gt.base
                             ,gt.category                                                            AS category
                             ,upper(gt.limitType)                                                    AS limittype
@@ -2072,6 +2073,7 @@ class Sql:
                            inner join Hands h       on  (h.id = hp.handId)
                            inner join Gametypes gt  on  (gt.Id = h.gameTypeId)
                            inner join Sites s       on  (s.Id = gt.siteId)
+                           inner join Players p     on  (p.Id = hp.playerId)
                       where hp.playerId in <player_test>
                       <game_test>
                       /*and   hp.tourneysPlayersId IS NULL*/

From e4c6419074d7ce52b0620c60c0f063448ad0d26d Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Mon, 1 Feb 2010 00:17:55 +0000
Subject: [PATCH 180/320] try to improve tourney handling in filter (now
 displays buyin, but this is not yet used by playerstats when fetching stats

---
 pyfpdb/Database.py       | 3 ++-
 pyfpdb/Filters.py        | 4 ++--
 pyfpdb/GuiPlayerStats.py | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index ebdfceaa..a987b389 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -788,10 +788,11 @@ class Database:
             
     def get_player_id(self, config, site, player_name):
         c = self.connection.cursor()
-        #print "get_player_id: player_name =", player_name, type(player_name)
+        print "get_player_id: player_name =", player_name, type(player_name)
         p_name = Charset.to_utf8(player_name)
         c.execute(self.sql.query['get_player_id'], (p_name, site))
         row = c.fetchone()
+        print "player id =", row
         if row:
             return row[0]
         else:
diff --git a/pyfpdb/Filters.py b/pyfpdb/Filters.py
index d5dec059..96245898 100644
--- a/pyfpdb/Filters.py
+++ b/pyfpdb/Filters.py
@@ -594,7 +594,7 @@ class Filters(threading.Thread):
         vbox.pack_start(vbox1, False, False, 0)
         self.boxes['limits'] = vbox1
 
-        self.cursor.execute(self.sql.query['getLimits2'])
+        self.cursor.execute(self.sql.query['getLimits3'])
         # selects  limitType, bigBlind
         result = self.db.cursor.fetchall()
         found = {'nl':False, 'fl':False, 'pl':False, 'ring':False, 'tour':False}
@@ -615,7 +615,7 @@ class Filters(threading.Thread):
                     vbox2.pack_start(hbox, False, False, 0)
                 else:
                     vbox3.pack_start(hbox, False, False, 0)
-                if line[0] == 'ring':
+                if True:  #line[0] == 'ring':
                     if line[1] == 'fl':
                         name = str(line[2])
                         found['fl'] = True
diff --git a/pyfpdb/GuiPlayerStats.py b/pyfpdb/GuiPlayerStats.py
index 11b14274..cb94859d 100644
--- a/pyfpdb/GuiPlayerStats.py
+++ b/pyfpdb/GuiPlayerStats.py
@@ -526,7 +526,7 @@ class GuiPlayerStats (threading.Thread):
         if type == 'ring':
             bbtest = bbtest + " and gt.type = 'ring' "
         elif type == 'tour':
-            bbtest = bbtest + " and gt.type = 'tour' "
+            bbtest = " and gt.type = 'tour' "
         query = query.replace("<gtbigBlind_test>", bbtest)
 
         if holecards:  # re-use level variables for hole card query

From 6179823d92b0b4edd7872555651bbc2f4a19d0c4 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Mon, 1 Feb 2010 14:47:04 +0800
Subject: [PATCH 181/320] Fix test harness after fpdb_db removal

---
 pyfpdb/test_Database.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pyfpdb/test_Database.py b/pyfpdb/test_Database.py
index 25bd6dbc..bae28564 100644
--- a/pyfpdb/test_Database.py
+++ b/pyfpdb/test_Database.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 import sqlite3
-import fpdb_db
+import Database
 import math
 
 # Should probably use our wrapper classes - creating sqlite db in memory
@@ -14,11 +14,11 @@ con.isolation_level = None
 con.create_function("floor", 1, math.floor)
 
 #Mod function
-tmp = fpdb_db.sqlitemath()
+tmp = Database.sqlitemath()
 con.create_function("mod", 2, tmp.mod)
 
 # Aggregate function VARIANCE()
-con.create_aggregate("variance", 1, fpdb_db.VARIANCE)
+con.create_aggregate("variance", 1, Database.VARIANCE)
 
 
 cur = con.cursor()

From 9f3c5924b071eed1b8315a96e103d11de7a6ee42 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Mon, 1 Feb 2010 07:59:09 +0000
Subject: [PATCH 182/320] oops! missed out SQL.py from last release

---
 pyfpdb/SQL.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py
index 7a83ac99..647bc82c 100644
--- a/pyfpdb/SQL.py
+++ b/pyfpdb/SQL.py
@@ -1848,6 +1848,15 @@ class Sql:
         self.query['getLimits2'] = """SELECT DISTINCT type, limitType, bigBlind 
                                       from Gametypes
                                       ORDER by type, limitType DESC, bigBlind DESC"""
+        self.query['getLimits3'] = """select DISTINCT type
+                                           , limittype
+                                           , case type 
+                                                 when 'ring' then bigblind 
+                                                 else buyin 
+                                             end as bb_or_buyin
+                                      from gametypes gt
+                                      cross join tourneytypes tt
+                                      order by type, limitType DESC, bb_or_buyin DESC"""
 
         if db_server == 'mysql':
             self.query['playerDetailedStats'] = """

From 12a9cd2e3e8530931ae3b6ade4386f4b9d84aebe Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Mon, 1 Feb 2010 16:06:09 +0800
Subject: [PATCH 183/320] Fix case-sensitive MySQL tables on Linux

---
 pyfpdb/SQL.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py
index 647bc82c..36a908d2 100644
--- a/pyfpdb/SQL.py
+++ b/pyfpdb/SQL.py
@@ -1854,8 +1854,8 @@ class Sql:
                                                  when 'ring' then bigblind 
                                                  else buyin 
                                              end as bb_or_buyin
-                                      from gametypes gt
-                                      cross join tourneytypes tt
+                                      from Gametypes gt
+                                      cross join TourneyTypes tt
                                       order by type, limitType DESC, bb_or_buyin DESC"""
 
         if db_server == 'mysql':

From a06aac6da870f38f92c1232e0aee85359229868f Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Mon, 1 Feb 2010 08:22:14 +0000
Subject: [PATCH 184/320] correct case in SQL

---
 pyfpdb/SQL.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py
index 647bc82c..6db24fb4 100644
--- a/pyfpdb/SQL.py
+++ b/pyfpdb/SQL.py
@@ -1849,13 +1849,13 @@ class Sql:
                                       from Gametypes
                                       ORDER by type, limitType DESC, bigBlind DESC"""
         self.query['getLimits3'] = """select DISTINCT type
-                                           , limittype
+                                           , limitType
                                            , case type 
-                                                 when 'ring' then bigblind 
+                                                 when 'ring' then bigBlind 
                                                  else buyin 
                                              end as bb_or_buyin
-                                      from gametypes gt
-                                      cross join tourneytypes tt
+                                      from Gametypes gt
+                                      cross join TourneyTypes tt
                                       order by type, limitType DESC, bb_or_buyin DESC"""
 
         if db_server == 'mysql':

From 9cf75f7303c4fe73fc3647a1198d5f4aac2cf1a1 Mon Sep 17 00:00:00 2001
From: Eric Blade <blade.eric@gmail.com>
Date: Mon, 1 Feb 2010 08:47:55 -0500
Subject: [PATCH 185/320] fix getTableTitleRe calling in HUD_main:read_stdin,
 to use site_name (currently processing site name) instead of "site" which was
 always last site_name on list (this may break some people's HHC's, now that
 it works right)

---
 pyfpdb/HUD_main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/HUD_main.py b/pyfpdb/HUD_main.py
index df144e92..71b7c03e 100755
--- a/pyfpdb/HUD_main.py
+++ b/pyfpdb/HUD_main.py
@@ -268,7 +268,7 @@ class HUD_main(object):
                     cards['common'] = comm_cards['common']
 
                 table_kwargs = dict(table_name = table_name, tournament = tour_number, table_number = tab_number)
-                search_string = getTableTitleRe(self.config, site, type, **table_kwargs)
+                search_string = getTableTitleRe(self.config, site_name, type, **table_kwargs)
                 tablewindow = Tables.Table(search_string, **table_kwargs)
 
                 if tablewindow is None:

From 27f95c51b2670f42767a4d469e36d1dda4ce97e9 Mon Sep 17 00:00:00 2001
From: Eric Blade <blade.eric@gmail.com>
Date: Mon, 1 Feb 2010 08:48:28 -0500
Subject: [PATCH 186/320] whitespace

---
 pyfpdb/HandHistoryConverter.py | 47 ++++++++++++++++------------------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index bec2ebae..9047af50 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -64,7 +64,7 @@ out_path  (default '-' = sys.stdout)
 follow :  whether to tail -f the input"""
 
         log.info("HandHistory init - %s subclass, in_path '%s'; out_path '%s'" % (self.sitename, in_path, out_path) )
-        
+
         self.index     = index
         self.starsArchive = starsArchive
 
@@ -77,7 +77,7 @@ follow :  whether to tail -f the input"""
 
         # Tourney object used to store TourneyInfo when called to deal with a Summary file
         self.tourney = None
-        
+
         if in_path == '-':
             self.in_fh = sys.stdin
 
@@ -106,7 +106,7 @@ follow :  whether to tail -f the input"""
         self.follow = follow
         self.compiledPlayers   = set()
         self.maxseats  = 10
-        
+
         self.status = True
 
         self.parsedObjectType = "HH"      #default behaviour : parsing HH files, can be "Summary" if the parsing encounters a Summary File
@@ -121,7 +121,7 @@ HandHistoryConverter: '%(sitename)s'
     in_path     '%(in_path)s'
     out_path    '%(out_path)s'
     follow      '%(follow)s'
-    """ %  locals() 
+    """ %  locals()
 
     def start(self):
         """Process a hand at a time from the input specified by in_path.
@@ -141,7 +141,7 @@ Otherwise, finish at EOF.
             self.numHands = 0
             self.numErrors = 0
             if self.follow:
-                #TODO: See how summary files can be handled on the fly (here they should be rejected as before) 
+                #TODO: See how summary files can be handled on the fly (here they should be rejected as before)
                 log.info("Tailing '%s'" % self.in_path)
                 for handText in self.tailHands():
                     try:
@@ -176,7 +176,7 @@ Otherwise, finish at EOF.
                         endtime = time.time()
                         if summaryParsingStatus :
                             log.info("Summary file '%s' correctly parsed  (took %.3f seconds)" % (self.in_path, endtime - starttime))
-                        else :                            
+                        else :
                             log.warning("Error converting summary file '%s' (took %.3f seconds)" % (self.in_path, endtime - starttime))
 
         except IOError, ioe:
@@ -230,7 +230,7 @@ which it expects to find at self.re_TailSplitHands -- see for e.g. Everleaf.py.
                 # x--       [x,--,]       x,--
                 # x--x      [x,--,x]      x,x
                 # x--x--    [x,--,x,--,]  x,x,--
-                
+
                 # The length is always odd.
                 # 'odd' indices are always splitters.
                 # 'even' indices are always paragraphs or ''
@@ -264,13 +264,13 @@ which it expects to find at self.re_TailSplitHands -- see for e.g. Everleaf.py.
             log.info("Read no hands.")
             return []
         return re.split(self.re_SplitHands,  self.obs)
-        
+
     def processHand(self, handText):
         gametype = self.determineGameType(handText)
         log.debug("gametype %s" % gametype)
         hand = None
         l = None
-        if gametype is None: 
+        if gametype is None:
             gametype = "unmatched"
             # TODO: not ideal, just trying to not error.
             # TODO: Need to count failed hands.
@@ -304,7 +304,7 @@ which it expects to find at self.re_TailSplitHands -- see for e.g. Everleaf.py.
     # This function should return a list of lists looking like:
     # return [["ring", "hold", "nl"], ["tour", "hold", "nl"]]
     # Showing all supported games limits and types
-    
+
     def readSupportedGames(self): abstract
 
     # should return a list
@@ -339,17 +339,17 @@ or None if we fail to get the info """
     # Needs to return a list of lists in the format
     # [['seat#', 'player1name', 'stacksize'] ['seat#', 'player2name', 'stacksize'] [...]]
     def readPlayerStacks(self, hand): abstract
-    
+
     def compilePlayerRegexs(self): abstract
     """Compile dynamic regexes -- these explicitly match known player names and must be updated if a new player joins"""
-    
+
     # Needs to return a MatchObject with group names identifying the streets into the Hand object
     # so groups are called by street names 'PREFLOP', 'FLOP', 'STREET2' etc
     # blinds are done seperately
     def markStreets(self, hand): abstract
 
     #Needs to return a list in the format
-    # ['player1name', 'player2name', ...] where player1name is the sb and player2name is bb, 
+    # ['player1name', 'player2name', ...] where player1name is the sb and player2name is bb,
     # addtional players are assumed to post a bb oop
     def readBlinds(self, hand): abstract
     def readAntes(self, hand): abstract
@@ -362,16 +362,16 @@ or None if we fail to get the info """
     def readShownCards(self, hand): abstract
 
     # Some sites do odd stuff that doesn't fall in to the normal HH parsing.
-    # e.g., FTP doesn't put mixed game info in the HH, but puts in in the 
+    # e.g., FTP doesn't put mixed game info in the HH, but puts in in the
     # file name. Use readOther() to clean up those messes.
     def readOther(self, hand): pass
-    
+
     # Some sites don't report the rake. This will be called at the end of the hand after the pot total has been calculated
     # an inheriting class can calculate it for the specific site if need be.
     def getRake(self, hand):
         hand.rake = hand.totalpot - hand.totalcollected #  * Decimal('0.05') # probably not quite right
-    
-    
+
+
     def sanityCheck(self):
         """Check we aren't going to do some stupid things"""
         #TODO: the hhbase stuff needs to be in fpdb_import
@@ -396,7 +396,7 @@ or None if we fail to get the info """
         # Make sure input and output files are different or we'll overwrite the source file
         if True: # basically.. I don't know
             sane = True
-        
+
         if self.in_path != '-' and self.out_path == self.in_path:
             print "HH Sanity Check: output and input files are the same, check config"
             sane = False
@@ -429,7 +429,7 @@ or None if we fail to get the info """
 
     def readFile(self):
         """Open in_path according to self.codepage. Exceptions caught further up"""
-        
+
         if self.filetype == "text":
             if self.in_path == '-':
                 # read from stdin
@@ -464,7 +464,7 @@ or None if we fail to get the info """
 
         if hand.gametype['base'] == 'stud':
             if mo <= 8: return 8
-            else: return mo 
+            else: return mo
 
         if hand.gametype['base'] == 'draw':
             if mo <= 6: return 6
@@ -500,9 +500,9 @@ or None if we fail to get the info """
     def getParsedObjectType(self):
         return self.parsedObjectType
 
-    #returns a status (True/False) indicating wether the parsing could be done correctly or not    
+    #returns a status (True/False) indicating wether the parsing could be done correctly or not
     def readSummaryInfo(self, summaryInfoList): abstract
-    
+
     def getTourney(self):
         return self.tourney
 
@@ -525,6 +525,3 @@ def getSiteHhc(config, sitename):
     hhcName = config.supported_sites[sitename].converter
     hhcModule = __import__(hhcName)
     return getattr(hhcModule, hhcName[:-6])
-    
-    
-

From 1656a0e6d1933b72198bc5bdfadd7d4275036f54 Mon Sep 17 00:00:00 2001
From: Eric Blade <blade.eric@gmail.com>
Date: Mon, 1 Feb 2010 08:51:06 -0500
Subject: [PATCH 187/320] Everleaf: adjust Everleaf regexs to support
 tournaments, add error printing on failure of compilePlayerRegexs, add ring
 omahahilo pl and tour hold nl to supported games list, determine tournament
 number/table number from processing filename, fix getTableTitleRe

---
 pyfpdb/EverleafToFpdb.py | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py
index ad9d0524..c9206ea5 100755
--- a/pyfpdb/EverleafToFpdb.py
+++ b/pyfpdb/EverleafToFpdb.py
@@ -38,8 +38,9 @@ class Everleaf(HandHistoryConverter):
                      #re.compile(ur"^(Blinds )?(?P<CURRENCY>\$| €|)(?P<SB>[.0-9]+)/(?:\$| €)?(?P<BB>[.0-9]+) (?P<LIMIT>NL|PL|) (?P<GAME>(Hold\'em|Omaha|7 Card Stud))", re.MULTILINE)
     re_HandInfo    = re.compile(ur".*#(?P<HID>[0-9]+)\n.*\n(Blinds )?(?:\$| €|)(?P<SB>[.0-9]+)/(?:\$| €|)(?P<BB>[.0-9]+) (?P<GAMETYPE>.*) - (?P<DATETIME>\d\d\d\d/\d\d/\d\d - \d\d:\d\d:\d\d)\nTable (?P<TABLE>.+$)", re.MULTILINE)
     re_Button      = re.compile(ur"^Seat (?P<BUTTON>\d+) is the button", re.MULTILINE)
-    re_PlayerInfo  = re.compile(ur"^Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\s+((?:\$| €|) (?P<CASH>[.0-9]+) (USD|EUR|)|new player|All-in) \)", re.MULTILINE)
+    re_PlayerInfo  = re.compile(ur"^Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\s+((?:\$| €|) (?P<CASH>[.0-9]+) (USD|EUR|Chips)|new player|All-in) \)", re.MULTILINE)
     re_Board       = re.compile(ur"\[ (?P<CARDS>.+) \]")
+    re_TourneyInfoFromFilename = re.compile(ur".*TID_(?P<TOURNO>[0-9]+)-(?P<TABLE>[0-9]+)\.txt")
 
 
     def compilePlayerRegexs(self, hand):
@@ -55,18 +56,25 @@ class Everleaf(HandHistoryConverter):
             self.re_Antes           = re.compile(ur"^%s: posts ante \[(?:\$| €|) (?P<ANTE>[.0-9]+)" % player_re, re.MULTILINE)
             self.re_BringIn         = re.compile(ur"^%s posts bring-in (?:\$| €|)(?P<BRINGIN>[.0-9]+)\." % player_re, re.MULTILINE)
             self.re_HeroCards       = re.compile(ur"^Dealt to %s \[ (?P<CARDS>.*) \]" % player_re, re.MULTILINE)
-            self.re_Action          = re.compile(ur"^%s(?P<ATYPE>: bets| checks| raises| calls| folds)(\s\[(?:\$| €|) (?P<BET>[.\d]+) (USD|EUR|)\])?" % player_re, re.MULTILINE)
+            self.re_Action          = re.compile(ur"^%s(?P<ATYPE>: bets| checks| raises| calls| folds)(\s\[(?:\$| €|) (?P<BET>[.,\d]+) (USD|EUR|Chips)\])?" % player_re, re.MULTILINE)
             #self.re_Action          = re.compile(ur"^%s(?P<ATYPE>: bets| checks| raises| calls| folds| complete to)(\s\[?(?:\$| €|) ?(?P<BET>\d+\.?\d*)\.?\s?(USD|EUR|)\]?)?" % player_re, re.MULTILINE)
             self.re_ShowdownAction  = re.compile(ur"^%s shows \[ (?P<CARDS>.*) \]" % player_re, re.MULTILINE)
             self.re_CollectPot      = re.compile(ur"^%s wins (?:\$| €|) (?P<POT>[.\d]+) (USD|EUR|chips)(.*?\[ (?P<CARDS>.*?) \])?" % player_re, re.MULTILINE)
             self.re_SitsOut         = re.compile(ur"^%s sits out" % player_re, re.MULTILINE)
 
+        else:
+            print "*** EverleafToFpdb: compilePlayerRegexs failed"
+            print players
+            print self.compiledPlayers
+
     def readSupportedGames(self):
         return [["ring", "hold", "nl"],
                 ["ring", "hold", "pl"],
                 ["ring", "hold", "fl"],
                 ["ring", "studhi", "fl"],
-                ["ring", "omahahi", "pl"]
+                ["ring", "omahahi", "pl"],
+                ["ring", "omahahilo", "pl"],
+                ["tour", "hold", "nl"]
                ]
 
     def determineGameType(self, handText):
@@ -138,6 +146,13 @@ or None if we fail to get the info """
         hand.tablename = m.group('TABLE')
         hand.maxseats = 6     # assume 6-max unless we have proof it's a larger/smaller game, since everleaf doesn't give seat max info
 
+        t = self.re_TourneyInfoFromFilename.search(self.in_path)
+        if t:
+            tourno = t.group('TOURNO')
+        if tourno: # we're a tourney, yay
+            hand.tourNo = tourno
+            hand.tablename = t.group('TABLE')
+
         # Believe Everleaf time is GMT/UTC, no transation necessary
         # Stars format (Nov 10 2008): 2008/11/07 12:38:49 CET [2008/11/07 7:38:49 ET]
         # or                        : 2008/11/07 12:38:49 ET
@@ -287,7 +302,9 @@ or None if we fail to get the info """
 
     @staticmethod
     def getTableTitleRe(type, table_name=None, tournament = None, table_number=None):
-        return "^%s -" % (table_name)
+        if tournament:
+            return "%s - Tournament ID: %s -" % (table_number, tournament)
+        return "%s -" % (table_name)
 
 
 

From e3be7db2a0631d875188b6ee22855535b8694f18 Mon Sep 17 00:00:00 2001
From: Eric Blade <blade.eric@gmail.com>
Date: Mon, 1 Feb 2010 09:17:42 -0500
Subject: [PATCH 188/320] fix bug i introduced that caused everleaf cash hands
 to fail

---
 pyfpdb/EverleafToFpdb.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py
index c9206ea5..fe17f158 100755
--- a/pyfpdb/EverleafToFpdb.py
+++ b/pyfpdb/EverleafToFpdb.py
@@ -149,7 +149,6 @@ or None if we fail to get the info """
         t = self.re_TourneyInfoFromFilename.search(self.in_path)
         if t:
             tourno = t.group('TOURNO')
-        if tourno: # we're a tourney, yay
             hand.tourNo = tourno
             hand.tablename = t.group('TABLE')
 

From 81ff8e632cc483b0cc53678dd0c818734c8d7e7e Mon Sep 17 00:00:00 2001
From: Eric Blade <blade.eric@gmail.com>
Date: Mon, 1 Feb 2010 09:41:33 -0500
Subject: [PATCH 189/320] remove my misunderstanding of how compileplayerregexs
 worked

---
 pyfpdb/EverleafToFpdb.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py
index fe17f158..fdc35bf6 100755
--- a/pyfpdb/EverleafToFpdb.py
+++ b/pyfpdb/EverleafToFpdb.py
@@ -62,11 +62,6 @@ class Everleaf(HandHistoryConverter):
             self.re_CollectPot      = re.compile(ur"^%s wins (?:\$| €|) (?P<POT>[.\d]+) (USD|EUR|chips)(.*?\[ (?P<CARDS>.*?) \])?" % player_re, re.MULTILINE)
             self.re_SitsOut         = re.compile(ur"^%s sits out" % player_re, re.MULTILINE)
 
-        else:
-            print "*** EverleafToFpdb: compilePlayerRegexs failed"
-            print players
-            print self.compiledPlayers
-
     def readSupportedGames(self):
         return [["ring", "hold", "nl"],
                 ["ring", "hold", "pl"],

From eff216919dd7ad03bdfe9a7500438c1c46ac6a80 Mon Sep 17 00:00:00 2001
From: Eric Blade <blade.eric@gmail.com>
Date: Mon, 1 Feb 2010 09:57:28 -0500
Subject: [PATCH 190/320] Everleaf: Change "EUR"(old) to "EURO"(new), still
 doesn't seem to allow eur import (is that because my site config is set for
 usd ?)

---
 pyfpdb/EverleafToFpdb.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py
index fdc35bf6..5dd8d041 100755
--- a/pyfpdb/EverleafToFpdb.py
+++ b/pyfpdb/EverleafToFpdb.py
@@ -38,7 +38,7 @@ class Everleaf(HandHistoryConverter):
                      #re.compile(ur"^(Blinds )?(?P<CURRENCY>\$| €|)(?P<SB>[.0-9]+)/(?:\$| €)?(?P<BB>[.0-9]+) (?P<LIMIT>NL|PL|) (?P<GAME>(Hold\'em|Omaha|7 Card Stud))", re.MULTILINE)
     re_HandInfo    = re.compile(ur".*#(?P<HID>[0-9]+)\n.*\n(Blinds )?(?:\$| €|)(?P<SB>[.0-9]+)/(?:\$| €|)(?P<BB>[.0-9]+) (?P<GAMETYPE>.*) - (?P<DATETIME>\d\d\d\d/\d\d/\d\d - \d\d:\d\d:\d\d)\nTable (?P<TABLE>.+$)", re.MULTILINE)
     re_Button      = re.compile(ur"^Seat (?P<BUTTON>\d+) is the button", re.MULTILINE)
-    re_PlayerInfo  = re.compile(ur"^Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\s+((?:\$| €|) (?P<CASH>[.0-9]+) (USD|EUR|Chips)|new player|All-in) \)", re.MULTILINE)
+    re_PlayerInfo  = re.compile(ur"^Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\s+((?:\$| €|) (?P<CASH>[.0-9]+) (USD|EURO|Chips)|new player|All-in) \)", re.MULTILINE)
     re_Board       = re.compile(ur"\[ (?P<CARDS>.+) \]")
     re_TourneyInfoFromFilename = re.compile(ur".*TID_(?P<TOURNO>[0-9]+)-(?P<TABLE>[0-9]+)\.txt")
 
@@ -56,10 +56,10 @@ class Everleaf(HandHistoryConverter):
             self.re_Antes           = re.compile(ur"^%s: posts ante \[(?:\$| €|) (?P<ANTE>[.0-9]+)" % player_re, re.MULTILINE)
             self.re_BringIn         = re.compile(ur"^%s posts bring-in (?:\$| €|)(?P<BRINGIN>[.0-9]+)\." % player_re, re.MULTILINE)
             self.re_HeroCards       = re.compile(ur"^Dealt to %s \[ (?P<CARDS>.*) \]" % player_re, re.MULTILINE)
-            self.re_Action          = re.compile(ur"^%s(?P<ATYPE>: bets| checks| raises| calls| folds)(\s\[(?:\$| €|) (?P<BET>[.,\d]+) (USD|EUR|Chips)\])?" % player_re, re.MULTILINE)
+            self.re_Action          = re.compile(ur"^%s(?P<ATYPE>: bets| checks| raises| calls| folds)(\s\[(?:\$| €|) (?P<BET>[.,\d]+) (USD|EURO|Chips)\])?" % player_re, re.MULTILINE)
             #self.re_Action          = re.compile(ur"^%s(?P<ATYPE>: bets| checks| raises| calls| folds| complete to)(\s\[?(?:\$| €|) ?(?P<BET>\d+\.?\d*)\.?\s?(USD|EUR|)\]?)?" % player_re, re.MULTILINE)
             self.re_ShowdownAction  = re.compile(ur"^%s shows \[ (?P<CARDS>.*) \]" % player_re, re.MULTILINE)
-            self.re_CollectPot      = re.compile(ur"^%s wins (?:\$| €|) (?P<POT>[.\d]+) (USD|EUR|chips)(.*?\[ (?P<CARDS>.*?) \])?" % player_re, re.MULTILINE)
+            self.re_CollectPot      = re.compile(ur"^%s wins (?:\$| €|) (?P<POT>[.\d]+) (USD|EURO|chips)(.*?\[ (?P<CARDS>.*?) \])?" % player_re, re.MULTILINE)
             self.re_SitsOut         = re.compile(ur"^%s sits out" % player_re, re.MULTILINE)
 
     def readSupportedGames(self):

From 86330e536ae5c27e193de2fff66ede4502558db2 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Mon, 1 Feb 2010 21:03:51 +0000
Subject: [PATCH 191/320] tidy up logging so that log isn't created in
 /fpdb/log/ unless it is being used

---
 pyfpdb/Configuration.py |  7 +++++--
 pyfpdb/Database.py      |  7 +++++--
 pyfpdb/GuiLogView.py    | 15 ++++++++-------
 pyfpdb/fpdb.py          |  2 +-
 pyfpdb/fpdb_import.py   |  5 ++++-
 5 files changed, 23 insertions(+), 13 deletions(-)
 mode change 100644 => 100755 pyfpdb/Configuration.py
 mode change 100644 => 100755 pyfpdb/fpdb_import.py

diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py
old mode 100644
new mode 100755
index 9c7e44b6..ec4c621e
--- a/pyfpdb/Configuration.py
+++ b/pyfpdb/Configuration.py
@@ -38,6 +38,10 @@ from xml.dom.minidom import Node
 import logging, logging.config
 import ConfigParser
 
+# logging has been set up in fpdb.py or HUD_main.py, use their settings:
+log = logging.getLogger("config")
+
+
 ##############################################################################
 #    Functions for finding config files and setting up logging
 #    Also used in other modules that use logging.
@@ -138,8 +142,6 @@ def check_dir(path, create = True):
     else:
         return False
 
-#    find a logging.conf file and set up logging
-log = get_logger("logging.conf", "config")
 
 ########################################################################
 # application wide consts
@@ -458,6 +460,7 @@ class Config:
         self.dir_config = os.path.dirname(self.file)
         self.dir_log = os.path.join(self.dir_config, 'log')
         self.dir_database = os.path.join(self.dir_config, 'database')
+        self.log_file = os.path.join(self.dir_log, 'logging.out')
         log = get_logger("logging.conf", "config", log_dir=self.dir_log)
 
 #    Parse even if there was no real config file found and we are using the example
diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index a987b389..e7c01231 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -41,6 +41,10 @@ import Queue
 import codecs
 import math
 
+import logging
+# logging has been set up in fpdb.py or HUD_main.py, use their settings:
+log = logging.getLogger("db")
+
 
 #    pyGTK modules
 
@@ -52,7 +56,6 @@ import Tourney
 import Charset
 from Exceptions import *
 import Configuration
-log = Configuration.get_logger("logging.conf","db")
 
 
 #    Other library modules
@@ -225,7 +228,7 @@ class Database:
 
     def __init__(self, c, sql = None): 
         log = Configuration.get_logger("logging.conf", "db", log_dir=c.dir_log)
-        log.info("Creating Database instance, sql = %s" % sql)
+        log.debug("Creating Database instance, sql = %s" % sql)
         self.config = c
         self.__connected = False
         self.settings = {}
diff --git a/pyfpdb/GuiLogView.py b/pyfpdb/GuiLogView.py
index 29385fa0..9dcb9588 100755
--- a/pyfpdb/GuiLogView.py
+++ b/pyfpdb/GuiLogView.py
@@ -26,13 +26,13 @@ import gtk
 import gobject
 import pango
 
-import Configuration
+import logging
+# logging has been set up in fpdb.py or HUD_main.py, use their settings:
+log = logging.getLogger("logview")
 
-log = Configuration.get_logger("logging.conf", "logview")
 
 MAX_LINES = 100000         # max lines to display in window
 EST_CHARS_PER_LINE = 150   # used to guesstimate number of lines in log file
-logfile = 'logging.out'    # name of logfile
 
 class GuiLogView:
 
@@ -41,6 +41,7 @@ class GuiLogView:
         self.main_window = mainwin
         self.closeq = closeq
 
+        self.logfile = self.config.log_file    # name of logfile
         self.dia = gtk.Dialog(title="Log Messages"
                              ,parent=None
                              ,flags=gtk.DIALOG_DESTROY_WITH_PARENT
@@ -117,10 +118,10 @@ class GuiLogView:
         self.listcols = []
 
         # guesstimate number of lines in file
-        if os.path.exists(logfile):
-            stat_info = os.stat(logfile)
+        if os.path.exists(self.logfile):
+            stat_info = os.stat(self.logfile)
             lines = stat_info.st_size / EST_CHARS_PER_LINE
-            print "logview: size =", stat_info.st_size, "lines =", lines
+            #print "logview: size =", stat_info.st_size, "lines =", lines
 
             # set startline to line number to start display from
             startline = 0
@@ -129,7 +130,7 @@ class GuiLogView:
                 startline = lines - MAX_LINES
 
             l = 0
-            for line in open(logfile):
+            for line in open(self.logfile):
                 # eg line:
                 # 2009-12-02 15:23:21,716 - config       DEBUG    config logger initialised
                 l = l + 1
diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py
index 58e0128d..c11301a9 100755
--- a/pyfpdb/fpdb.py
+++ b/pyfpdb/fpdb.py
@@ -117,7 +117,6 @@ import Exceptions
 
 VERSION = "0.12"
 
-log = Configuration.get_logger("logging.conf", "fpdb")
 
 class fpdb:
     def tab_clicked(self, widget, tab_name):
@@ -696,6 +695,7 @@ class fpdb:
         """Loads profile from the provided path name."""
         self.config = Configuration.Config(file=options.config, dbname=options.dbname)
         log = Configuration.get_logger("logging.conf", "fpdb", log_dir=self.config.dir_log)
+        print "Logfile is " + os.path.join(self.config.dir_log, 'logging.out') + "\n"
         if self.config.example_copy:
             self.info_box( "Config file"
                          , "has been created at:\n%s.\n" % self.config.file
diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
old mode 100644
new mode 100755
index a02d3d99..8ba0da34
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -30,6 +30,10 @@ import Queue
 from collections import deque # using Queue for now
 import threading
 
+import logging
+# logging has been set up in fpdb.py or HUD_main.py, use their settings:
+log = logging.getLogger("importer")
+
 import pygtk
 import gtk
 
@@ -39,7 +43,6 @@ import Database
 import Configuration
 import Exceptions
 
-log = Configuration.get_logger("logging.conf", "importer")
 
 #    database interface modules
 try:

From d4248706e46ba65d5b2a05e2ac1a16421bfd1e32 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Mon, 1 Feb 2010 22:31:00 +0000
Subject: [PATCH 192/320] remove surplus get_logger calls, tidy up log messages
 some more

---
 pyfpdb/Database.py             | 12 ++++++------
 pyfpdb/HUD_main.py             | 15 +++++++--------
 pyfpdb/Hand.py                 |  9 ++++++---
 pyfpdb/HandHistoryConverter.py |  8 ++++++--
 pyfpdb/fpdb.py                 |  3 +++
 pyfpdb/fpdb_import.py          |  2 +-
 6 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index e7c01231..77ae30f6 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -227,7 +227,7 @@ class Database:
 
 
     def __init__(self, c, sql = None): 
-        log = Configuration.get_logger("logging.conf", "db", log_dir=c.dir_log)
+        #log = Configuration.get_logger("logging.conf", "db", log_dir=c.dir_log)
         log.debug("Creating Database instance, sql = %s" % sql)
         self.config = c
         self.__connected = False
@@ -239,6 +239,7 @@ class Database:
         self.db_server = db_params['db-server']
         self.database = db_params['db-databaseName']
         self.host = db_params['db-host']
+        self.db_path = ''
 
         # where possible avoid creating new SQL instance by using the global one passed in
         if sql is None:
@@ -388,9 +389,9 @@ class Database:
                     log.info("Creating directory: '%s'" % (self.config.dir_database))
                     os.mkdir(self.config.dir_database)
                 database = os.path.join(self.config.dir_database, database)
-            log.info("Connecting to SQLite: %(database)s" % {'database':database})
-            print "Connecting to SQLite: %(database)s" % {'database':database}
-            self.connection = sqlite3.connect(database, detect_types=sqlite3.PARSE_DECLTYPES )
+            self.db_path = database
+            log.info("Connecting to SQLite: %(database)s" % {'database':self.db_path})
+            self.connection = sqlite3.connect(self.db_path, detect_types=sqlite3.PARSE_DECLTYPES )
             sqlite3.register_converter("bool", lambda x: bool(int(x)))
             sqlite3.register_adapter(bool, lambda x: "1" if x else "0")
             self.connection.create_function("floor", 1, math.floor)
@@ -791,11 +792,10 @@ class Database:
             
     def get_player_id(self, config, site, player_name):
         c = self.connection.cursor()
-        print "get_player_id: player_name =", player_name, type(player_name)
+        #print "get_player_id: player_name =", player_name, type(player_name)
         p_name = Charset.to_utf8(player_name)
         c.execute(self.sql.query['get_player_id'], (p_name, site))
         row = c.fetchone()
-        print "player id =", row
         if row:
             return row[0]
         else:
diff --git a/pyfpdb/HUD_main.py b/pyfpdb/HUD_main.py
index c792d802..f7979552 100755
--- a/pyfpdb/HUD_main.py
+++ b/pyfpdb/HUD_main.py
@@ -51,9 +51,6 @@ import gobject
 #    FreePokerTools modules
 import Configuration
 
-log = Configuration.get_logger("logging.conf", config = 'hud')
-log.debug("%s logger initialized." % "hud")
-
 
 import Database
 from HandHistoryConverter import getTableTitleRe
@@ -66,6 +63,10 @@ elif os.name == 'nt':
 import Hud
 
 
+# logger is set up in __init__, create temp logger here
+log = Configuration.get_logger("logging.conf", config = 'hud')
+
+
 class HUD_main(object):
     """A main() object to own both the read_stdin thread and the gui."""
 #    This class mainly provides state for controlling the multiple HUDs.
@@ -74,9 +75,10 @@ class HUD_main(object):
         try:
             print "HUD_main: starting ..."
             self.db_name = db_name
-            self.config = Configuration.Config(file=options.config, dbname=options.dbname)
+            self.config = Configuration.Config(file=options.config, dbname=db_name)
             log = Configuration.get_logger("logging.conf", "hud", log_dir=self.config.dir_log)
-            log.debug("starting ...")
+            log.info("HUD_main starting")
+            log.info("Using db name = %s" % (db_name))
             self.hud_dict = {}
             self.hud_params = self.config.get_hud_ui_parameters()
 
@@ -295,9 +297,6 @@ class HUD_main(object):
 
 if __name__== "__main__":
 
-    log.info("HUD_main starting")
-    log.info("Using db name = %s" % (options.dbname))
-
 #    start the HUD_main object
     hm = HUD_main(db_name = options.dbname)
 
diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 0f69121a..9bec209b 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -21,7 +21,6 @@
 import re
 import sys
 import traceback
-import logging
 import os
 import os.path
 from decimal import Decimal
@@ -30,12 +29,16 @@ import time,datetime
 from copy import deepcopy
 import pprint
 
+import logging
+# logging has been set up in fpdb.py or HUD_main.py, use their settings:
+log = logging.getLogger("parser")
+
+
 import Configuration
 from Exceptions import *
 import DerivedStats
 import Card
 
-log = Configuration.get_logger("logging.conf", "parser")
 
 class Hand(object):
 
@@ -50,7 +53,7 @@ class Hand(object):
 
     def __init__(self, config, sitename, gametype, handText, builtFrom = "HHC"):
         self.config = config
-        log = Configuration.get_logger("logging.conf", "db", log_dir=self.config.dir_log)
+        #log = Configuration.get_logger("logging.conf", "db", log_dir=self.config.dir_log)
         self.sitename = sitename
         self.siteId = self.SITEIDS[sitename]
         self.stats = DerivedStats.DerivedStats(self)
diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index 45760ee6..fa1805e0 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -30,6 +30,11 @@ from xml.dom.minidom import Node
 import time
 import datetime
 
+import logging
+# logging has been set up in fpdb.py or HUD_main.py, use their settings:
+log = logging.getLogger("parser")
+
+
 import Hand
 import Tourney
 from Exceptions import FpdbParseError
@@ -38,7 +43,6 @@ import Configuration
 import gettext
 gettext.install('fpdb')
 
-log = Configuration.get_logger("logging.conf", "parser")
 
 import pygtk
 import gtk
@@ -65,7 +69,7 @@ out_path  (default '-' = sys.stdout)
 follow :  whether to tail -f the input"""
 
         self.config = config
-        log = Configuration.get_logger("logging.conf", "parser", log_dir=self.config.dir_log)
+        #log = Configuration.get_logger("logging.conf", "parser", log_dir=self.config.dir_log)
         log.info("HandHistory init - %s subclass, in_path '%s'; out_path '%s'" % (self.sitename, in_path, out_path) )
         
         self.index     = index
diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py
index c11301a9..5bef3503 100755
--- a/pyfpdb/fpdb.py
+++ b/pyfpdb/fpdb.py
@@ -721,6 +721,9 @@ class fpdb:
         err_msg = None
         try:
             self.db = Database.Database(self.config, sql = self.sql)
+            if self.db.get_backend_name() == 'SQLite':
+                # tell sqlite users where the db file is
+                print "Connected to SQLite: %(database)s" % {'database':self.db.db_path}
         except Exceptions.FpdbMySQLAccessDenied:
             err_msg = "MySQL Server reports: Access denied. Are your permissions set correctly?"
         except Exceptions.FpdbMySQLNoDatabase:
diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index 8ba0da34..8b3f71cd 100755
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -68,7 +68,7 @@ class Importer:
         self.config     = config
         self.sql        = sql
 
-        log = Configuration.get_logger("logging.conf", "importer", log_dir=self.config.dir_log)
+        #log = Configuration.get_logger("logging.conf", "importer", log_dir=self.config.dir_log)
         self.filelist   = {}
         self.dirlist    = {}
         self.siteIds    = {}

From 96d0e0f1818992359344bf0c55bba22d4c500c49 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Mon, 1 Feb 2010 22:56:40 +0000
Subject: [PATCH 193/320] fix key error and add filter to logging.conf

---
 pyfpdb/Filters.py   | 43 +++++++++++++++++++++++++++----------------
 pyfpdb/logging.conf |  8 +++++++-
 2 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/pyfpdb/Filters.py b/pyfpdb/Filters.py
index 96245898..27e5a49d 100644
--- a/pyfpdb/Filters.py
+++ b/pyfpdb/Filters.py
@@ -26,16 +26,21 @@ from time import *
 import gobject
 #import pokereval
 
+import logging
+# logging has been set up in fpdb.py or HUD_main.py, use their settings:
+log = logging.getLogger("filter")
+
+
 import Configuration
 import Database
 import SQL
 import Charset
 
+
 class Filters(threading.Thread):
     def __init__(self, db, config, qdict, display = {}, debug=True):
         # config and qdict are now redundant
         self.debug = debug
-        #print "start of GraphViewer constructor"
         self.db = db
         self.cursor = db.cursor
         self.sql = db.sql
@@ -268,10 +273,10 @@ class Filters(threading.Thread):
         self.callback['button2'] = callback
 
     def cardCallback(self, widget, data=None):
-        print "DEBUG: %s was toggled %s" % (data, ("OFF", "ON")[widget.get_active()])
+        log.debug( "%s was toggled %s" % (data, ("OFF", "ON")[widget.get_active()]) )
 
     def createPlayerLine(self, hbox, site, player):
-        print 'DEBUG :: add:"%s"' % player
+        log.debug('add:"%s"' % player)
         label = gtk.Label(site +" id:")
         hbox.pack_start(label, False, False, 3)
 
@@ -300,14 +305,14 @@ class Filters(threading.Thread):
         # get_text() returns a str but we want internal variables to be unicode:
         _guiname = unicode(_name)
         self.heroes[site] = _guiname
-#        print "DEBUG: setting heroes[%s]: %s"%(site, self.heroes[site])
+#        log.debug("setting heroes[%s]: %s"%(site, self.heroes[site]))
 
     def __set_num_hands(self, w, val):
         try:
             self.numHands = int(w.get_text())
         except:
             self.numHands = 0
-#        print "DEBUG: setting numHands:", self.numHands
+#        log.debug("setting numHands:", self.numHands)
 
     def createSiteLine(self, hbox, site):
         cb = gtk.CheckButton(site)
@@ -332,17 +337,17 @@ class Filters(threading.Thread):
     def __set_site_select(self, w, site):
         #print w.get_active()
         self.sites[site] = w.get_active()
-        print "self.sites[%s] set to %s" %(site, self.sites[site])
+        log.debug("self.sites[%s] set to %s" %(site, self.sites[site]))
 
     def __set_game_select(self, w, game):
         #print w.get_active()
         self.games[game] = w.get_active()
-        print "self.games[%s] set to %s" %(game, self.games[game])
+        log.debug("self.games[%s] set to %s" %(game, self.games[game]))
 
     def __set_limit_select(self, w, limit):
         #print w.get_active()
         self.limits[limit] = w.get_active()
-        print "self.limit[%s] set to %s" %(limit, self.limits[limit])
+        log.debug("self.limit[%s] set to %s" %(limit, self.limits[limit]))
         if limit.isdigit() or (len(limit) > 2 and (limit[-2:] == 'nl' or limit[-2:] == 'fl' or limit[-2:] == 'pl')):
             if self.limits[limit]:
                 if self.cbNoLimits is not None:
@@ -428,9 +433,11 @@ class Filters(threading.Thread):
             if self.limits[limit]:
                 if not found[self.type]:
                     if self.type == 'ring':
-                        self.rb['tour'].set_active(True)
+                        if 'tour' in self.rb:
+                            self.rb['tour'].set_active(True)
                     elif self.type == 'tour':
-                        self.rb['ring'].set_active(True)
+                        if 'ring' in self.rb:
+                            self.rb['ring'].set_active(True)
         elif limit == "pl":
             if not self.limits[limit]:
                 # only toggle all nl limits off if they are all currently on
@@ -452,11 +459,13 @@ class Filters(threading.Thread):
             if self.limits[limit]:
                 if not found[self.type]:
                     if self.type == 'ring':
-                        self.rb['tour'].set_active(True)
+                        if 'tour' in self.rb:
+                            self.rb['tour'].set_active(True)
                     elif self.type == 'tour':
-                        self.rb['ring'].set_active(True)
+                        if 'ring' in self.rb:
+                            self.rb['ring'].set_active(True)
         elif limit == "ring":
-            print "set", limit, "to", self.limits[limit]
+            log.debug("set", limit, "to", self.limits[limit])
             if self.limits[limit]:
                 self.type = "ring"
                 for cb in self.cbLimits.values():
@@ -464,7 +473,7 @@ class Filters(threading.Thread):
                     if self.types[cb.get_children()[0].get_text()] == 'tour':
                         cb.set_active(False)
         elif limit == "tour":
-            print "set", limit, "to", self.limits[limit]
+            log.debug( "set", limit, "to", self.limits[limit] )
             if self.limits[limit]:
                 self.type = "tour"
                 for cb in self.cbLimits.values():
@@ -475,12 +484,12 @@ class Filters(threading.Thread):
     def __set_seat_select(self, w, seat):
         #print "__set_seat_select: seat =", seat, "active =", w.get_active()
         self.seats[seat] = w.get_active()
-        print "self.seats[%s] set to %s" %(seat, self.seats[seat])
+        log.debug( "self.seats[%s] set to %s" %(seat, self.seats[seat]) )
 
     def __set_group_select(self, w, group):
         #print "__set_seat_select: seat =", seat, "active =", w.get_active()
         self.groups[group] = w.get_active()
-        print "self.groups[%s] set to %s" %(group, self.groups[group])
+        log.debug( "self.groups[%s] set to %s" %(group, self.groups[group]) )
 
     def fillPlayerFrame(self, vbox, display):
         top_hbox = gtk.HBox(False, 0)
@@ -579,6 +588,7 @@ class Filters(threading.Thread):
                 self.createGameLine(hbox, line[0])
         else:
             print "INFO: No games returned from database"
+            log.info("No games returned from database")
 
     def fillLimitsFrame(self, vbox, display):
         top_hbox = gtk.HBox(False, 0)
@@ -660,6 +670,7 @@ class Filters(threading.Thread):
                     dest = vbox2  # for ring/tour buttons
         else:
             print "INFO: No games returned from database"
+            log.info("No games returned from database")
 
         if "Type" in display and display["Type"] == True and found['ring'] and found['tour']:
             rb1 = gtk.RadioButton(None, self.filterText['ring'])
diff --git a/pyfpdb/logging.conf b/pyfpdb/logging.conf
index a7c0323f..ecd74fcc 100644
--- a/pyfpdb/logging.conf
+++ b/pyfpdb/logging.conf
@@ -1,5 +1,5 @@
 [loggers]
-keys=root,fpdb,logview,parser,importer,config,db,hud
+keys=root,fpdb,logview,parser,importer,config,db,hud,filter
 
 [handlers]
 keys=consoleHandler,rotatingFileHandler
@@ -53,6 +53,12 @@ handlers=consoleHandler,rotatingFileHandler
 qualname=hud
 propagate=0
 
+[logger_filter]
+level=INFO
+handlers=consoleHandler,rotatingFileHandler
+qualname=filter
+propagate=0
+
 [handler_consoleHandler]
 class=StreamHandler
 level=ERROR

From aea7db22e367bee92eda58ebc72e2ef3808333d0 Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Mon, 1 Feb 2010 18:37:36 -0500
Subject: [PATCH 194/320] Options for logging level and version. Not connected
 yet.

---
 pyfpdb/Options.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/Options.py b/pyfpdb/Options.py
index ab226124..6570dbe4 100644
--- a/pyfpdb/Options.py
+++ b/pyfpdb/Options.py
@@ -15,9 +15,9 @@
 #In the "official" distribution you can find the license in
 #agpl-3.0.txt in the docs folder of the package.
 
-import os
 import sys
 from optparse import OptionParser
+#   http://docs.python.org/library/optparse.html
 
 def fpdb_options():
 
@@ -41,6 +41,14 @@ def fpdb_options():
     parser.add_option("-k", "--konverter",
                       dest="hhc", default="PokerStarsToFpdb",
                       help="Module name for Hand History Converter")
+    parser.add_option("-l", "--logging",
+                      dest = "log_level", 
+                      choices = ('DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL', 'EMPTY'),
+                      help = "Error logging level. (DEBUG, INFO, WARNING, ERROR, CRITICAL, EMPTY)",
+                      default = 'EMPTY')
+    parser.add_option("-v", "--version", action = "store_true", 
+                      help = "Print version information and exit.")
+
     (options, argv) = parser.parse_args()
     return (options, argv)
 

From 76f9517655da8881aaabef57996f80254d1a60c2 Mon Sep 17 00:00:00 2001
From: Eric Blade <blade.eric@gmail.com>
Date: Tue, 2 Feb 2010 14:54:27 -0500
Subject: [PATCH 195/320] WinTables will no longer accept trying to attach to
 "FPDBHUD" titled windows

---
 pyfpdb/WinTables.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pyfpdb/WinTables.py b/pyfpdb/WinTables.py
index f834eac9..5bca9e41 100644
--- a/pyfpdb/WinTables.py
+++ b/pyfpdb/WinTables.py
@@ -50,10 +50,12 @@ class Table(Table_Window):
         titles = {}
         win32gui.EnumWindows(win_enum_handler, titles)
         for hwnd in titles:
+            # print "searching ", search_string, " in ", titles[hwnd]
             if re.search(search_string, titles[hwnd]):
                 if 'History for table:' in titles[hwnd]: continue # Everleaf Network HH viewer window
                 if 'HUD:' in titles[hwnd]: continue # FPDB HUD window
                 if 'Chat:' in titles[hwnd]: continue # Some sites (FTP? PS? Others?) have seperable or seperately constructed chat windows
+                if 'FPDBHUD' in titles[hwnd]: continue # can't attach to ourselves!
                 self.window = hwnd
                 break
 

From fece7c914713c43c0a6c73c8dedd1381b4aa9d0f Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Tue, 2 Feb 2010 21:53:03 +0000
Subject: [PATCH 196/320] move fpdb-error-log and HUD-error to APPDATA, renamed
 as fpdb-errors.txt and HUD-errors.txt to be consistent

---
 pyfpdb/HUD_main.py | 11 ++++++++---
 pyfpdb/fpdb.py     | 15 ++++++++-------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/pyfpdb/HUD_main.py b/pyfpdb/HUD_main.py
index f7979552..bae58825 100755
--- a/pyfpdb/HUD_main.py
+++ b/pyfpdb/HUD_main.py
@@ -35,9 +35,6 @@ import traceback
 
 (options, argv) = Options.fpdb_options()
 
-if not options.errorsToConsole:
-    print "Note: error output is being logged. Any major error will be reported there _only_."
-
 import thread
 import time
 import string
@@ -79,6 +76,14 @@ class HUD_main(object):
             log = Configuration.get_logger("logging.conf", "hud", log_dir=self.config.dir_log)
             log.info("HUD_main starting")
             log.info("Using db name = %s" % (db_name))
+
+            if not options.errorsToConsole:
+                 fileName = os.path.join(self.config.dir_log, 'HUD-errors.txt')
+                 print "Note: error output is being diverted to\n"+fileName \
+                       + "\nAny major error will be reported there _only_.\n" 
+                 errorFile = open(fileName, 'w', 0)
+                 sys.stderr = errorFile
+
             self.hud_dict = {}
             self.hud_params = self.config.get_hud_ui_parameters()
 
diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py
index 5bef3503..d5e0350d 100755
--- a/pyfpdb/fpdb.py
+++ b/pyfpdb/fpdb.py
@@ -53,7 +53,7 @@ if os.name == 'nt':
         raw_input("Press ENTER to continue.")
         exit()
 
-print "Python " + sys.version[0:3] + '...\n'
+print "Python " + sys.version[0:3] + '...'
 
 import traceback
 import threading
@@ -62,12 +62,6 @@ import string
 cl_options = string.join(sys.argv[1:])
 (options, argv) = Options.fpdb_options()
 
-if not options.errorsToConsole:
-    print "Note: error output is being diverted to fpdb-error-log.txt and HUD-error.txt. Any major error will be reported there _only_."
-    errorFile = open('fpdb-error-log.txt', 'w', 0)
-    sys.stderr = errorFile
-
-#import logging
 import logging, logging.config
 
 try:
@@ -910,6 +904,13 @@ This program is licensed under the AGPL3, see docs"""+os.sep+"agpl-3.0.txt")
         self.window.show()
         self.load_profile()
 
+        if not options.errorsToConsole:
+            fileName = os.path.join(self.config.dir_log, 'fpdb-errors.txt')
+            print "\nNote: error output is being diverted to fpdb-errors.txt and HUD-errors.txt in\n" \
+                  + self.config.dir_log + "Any major error will be reported there _only_.\n"
+            errorFile = open(fileName, 'w', 0)
+            sys.stderr = errorFile
+
         self.statusIcon = gtk.StatusIcon()
         if os.path.exists(os.path.join(sys.path[0], '../gfx/fpdb-cards.png')):
             self.statusIcon.set_from_file(os.path.join(sys.path[0], '../gfx/fpdb-cards.png'))

From e3679a99fb0f7221798c3415aa98f0f819f8d6ac Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Wed, 3 Feb 2010 00:48:45 +0000
Subject: [PATCH 197/320] fix steal calcs

---
 pyfpdb/DerivedStats.py | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py
index 88bb6407..23f1f99c 100644
--- a/pyfpdb/DerivedStats.py
+++ b/pyfpdb/DerivedStats.py
@@ -56,7 +56,6 @@ class DerivedStats():
             self.handsplayers[player[1]]['stealAttemptChance']  = False
             self.handsplayers[player[1]]['stealAttempted']      = False
             self.handsplayers[player[1]]['foldBbToStealChance'] = False
-            self.handsplayers[player[1]]['foldBbToStealChance'] = False
             self.handsplayers[player[1]]['foldSbToStealChance'] = False
             self.handsplayers[player[1]]['foldedSbToSteal']     = False
             self.handsplayers[player[1]]['foldedBbToSteal']     = False
@@ -281,33 +280,37 @@ class DerivedStats():
     def calcSteals(self, hand):
         """Fills stealAttempt(Chance|ed, fold(Bb|Sb)ToSteal(Chance|)
 
-        Steal attemp - open raise on positions 2 1 0 S - i.e. MP3, CO, BU, SB
+        Steal attempt - open raise on positions 1 0 S - i.e. MP3, CO, BU, SB
         Fold to steal - folding blind after steal attemp wo any other callers or raisers
         """
-        steal_attemp = False
-        steal_positions = ('2', '1', '0', 'S')
+        steal_attempt = False
+        steal_positions = (1, 0, 'S')
         if hand.gametype['base'] == 'stud':
-            steal_positions = ('2', '1', '0')
+            steal_positions = (2, 1, 0)
         for action in hand.actions[hand.actionStreets[1]]:
             pname, act = action[0], action[1]
-            #print action[0], hp.position, steal_attemp, act
-            if self.handsplayers[pname]['position'] == 'B':
+            posn = self.handsplayers[pname]['position']
+            #print "\naction:", action[0], posn, type(posn), steal_attempt, act
+            if posn == 'B':
                 #NOTE: Stud games will never hit this section
-                self.handsplayers[pname]['foldBbToStealChance'] = steal_attemp
-                self.handsplayers[pname]['foldBbToSteal'] = self.handsplayers[pname]['foldBbToStealChance'] and act == 'folds'
+                self.handsplayers[pname]['foldBbToStealChance'] = steal_attempt
+                self.handsplayers[pname]['foldedBbToSteal'] = steal_attempt and act == 'folds'
                 break
-            elif self.handsplayers[pname]['position'] == 'S':
-                self.handsplayers[pname]['foldSbToStealChance'] = steal_attemp
-                self.handsplayers[pname]['foldSbToSteal'] = self.handsplayers[pname]['foldSbToStealChance'] and act == 'folds'
+            elif posn == 'S':
+                self.handsplayers[pname]['foldSbToStealChance'] = steal_attempt
+                self.handsplayers[pname]['foldedSbToSteal'] = steal_attempt and act == 'folds'
 
-            if steal_attemp and act != 'folds':
+            if steal_attempt and act != 'folds':
                 break
 
-            if self.handsplayers[pname]['position'] in steal_positions and not steal_attemp:
+            if posn in steal_positions and not steal_attempt:
                 self.handsplayers[pname]['stealAttemptChance'] = True
                 if act in ('bets', 'raises'):
                     self.handsplayers[pname]['stealAttempted'] = True
-                    steal_attemp = True
+                    steal_attempt = True
+            
+            if posn not in steal_positions and act != 'folds':
+                break
 
     def calc34BetStreet0(self, hand):
         """Fills street0_(3|4)B(Chance|Done), other(3|4)BStreet0"""

From 864454f31c0408e9d24ff2a61c26a4077622dc74 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Wed, 3 Feb 2010 01:03:36 +0000
Subject: [PATCH 198/320] change 2 commits to 1, may help sqlite stop locking
 up

---
 pyfpdb/fpdb_import.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index 8b3f71cd..95ffd525 100755
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -451,14 +451,14 @@ class Importer:
                                 to_hud.append(hand.dbid_hands)
                     else: # TODO: Treat empty as an error, or just ignore?
                         log.error("Hand processed but empty")
-                self.database.commit()
+
                 # Call hudcache update if not in bulk import mode
                 # FIXME: Need to test for bulk import that isn't rebuilding the cache
                 if self.callHud:
                     for hand in handlist:
                         if hand is not None:
                             hand.updateHudCache(self.database)
-                    self.database.commit()
+                self.database.commit()
 
                 #pipe the Hands.id out to the HUD
                 for hid in to_hud:

From 33455cb1acacd092ac2ae955e31d360c24f42409 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Wed, 3 Feb 2010 21:52:44 +0800
Subject: [PATCH 199/320] PokerStars: Fix tablename regex to allow a #

Occasionally Stars throws up a cash table that looks like

PokerStars Game #22920951206:  Triple Draw 2-7 Lowball Limit ($0.10/$0.20) - 2008/12/14 17:44:00 ET
Table 'T #252691988' 6-max Seat #2 is the button

a # was previously excluded from the regex.
---
 pyfpdb/PokerStarsToFpdb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
index c8bfea70..c2a92881 100755
--- a/pyfpdb/PokerStarsToFpdb.py
+++ b/pyfpdb/PokerStarsToFpdb.py
@@ -69,7 +69,7 @@ class PokerStars(HandHistoryConverter):
           re.MULTILINE|re.VERBOSE)
 
     re_HandInfo     = re.compile("""
-          ^Table\s\'(?P<TABLE>[-\ a-zA-Z\d]+)\'\s
+          ^Table\s\'(?P<TABLE>[-\ \#a-zA-Z\d]+)\'\s
           ((?P<MAX>\d+)-max\s)?
           (?P<PLAY>\(Play\sMoney\)\s)?
           (Seat\s\#(?P<BUTTON>\d+)\sis\sthe\sbutton)?""", 

From 1cefb2e8570fb6c219d919475da81eca1302a94b Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Wed, 3 Feb 2010 23:48:39 +0800
Subject: [PATCH 200/320] Fix playername siteid insert

From Gerko on mailing list:
> I just did a trial. Use bulkimport for a single Pokerstars file
> switch setting and bulkimport a single Full tilt file.
> When screening the db all players in the database show the same siteId
> (2 for pokerstars)
> Or the other way if the first site was Full Tilt.

The Lambda function wasn't initialising the lambda function correctly.
---
 pyfpdb/Database.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index a987b389..4b672733 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -1756,10 +1756,10 @@ class Database:
     def getSqlPlayerIDs(self, pnames, siteid):
         result = {}
         if(self.pcache == None):
-            self.pcache = LambdaDict(lambda  key:self.insertPlayer(key, siteid))
+            self.pcache = LambdaDict(lambda  key:self.insertPlayer(key[0], key[1]))
  
         for player in pnames:
-            result[player] = self.pcache[player]
+            result[player] = self.pcache[(player,siteid)]
             # NOTE: Using the LambdaDict does the same thing as:
             #if player in self.pcache:
             #    #print "DEBUG: cachehit"

From 9dfa0967b8fc571650ab2241a496720f281085fe Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Thu, 4 Feb 2010 13:08:26 -0500
Subject: [PATCH 201/320] Correct data files.

---
 pyfpdb/py2exe_setup.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pyfpdb/py2exe_setup.py b/pyfpdb/py2exe_setup.py
index 9565ac0b..1e1ddc6b 100644
--- a/pyfpdb/py2exe_setup.py
+++ b/pyfpdb/py2exe_setup.py
@@ -58,8 +58,8 @@ setup(
 
     options = {'py2exe': {
                       'packages'    :'encodings',
-                      'includes'    : 'cairo, pango, pangocairo, atk, gobject, PokerStarsToFpdb',
-		              'excludes'    : '_tkagg, _agg2, cocoaagg, fltkagg',
+                      'includes'    : 'cairo, pango, pangocairo, atk, gobject, PokerStarsToFpdb, FulltiltToFpdb',
+                      'excludes'    : '_tkagg, _agg2, cocoaagg, fltkagg',
                       'dll_excludes': 'libglade-2.0-0.dll',
                   }
               },
@@ -67,7 +67,9 @@ setup(
     data_files = ['HUD_config.xml.example',
                   'Cards01.png',
                   'logging.conf',
-                  (r'matplotlibdata', glob.glob(r'c:\python26\Lib\site-packages\matplotlib\mpl-data\*'))
+                  (r'mpl-data',                 [r'C:\Python25\Lib\site-packages\matplotlib\mpl-data\matplotlibrc']),
+                  (r'mpl-data\images', glob.glob(r'C:\Python25\Lib\site-packages\matplotlib\mpl-data\images\*.*')),
+                  (r'mpl-data\fonts',  glob.glob(r'C:\Python25\Lib\site-packages\matplotlib\mpl-data\fonts\*.*')),)
                  ]
 )
 

From c10665935fba50b1844cddda23f3dd7bde2beff4 Mon Sep 17 00:00:00 2001
From: Eric Blade <blade.eric@gmail.com>
Date: Thu, 4 Feb 2010 16:33:21 -0500
Subject: [PATCH 202/320] stop clobbering search_string in
 TableWindow::__init__ . Thanks Ray!

---
 pyfpdb/HUD_main.py    |  1 +
 pyfpdb/TableWindow.py | 22 +++++++++++-----------
 pyfpdb/WinTables.py   |  1 +
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/pyfpdb/HUD_main.py b/pyfpdb/HUD_main.py
index 1251c2f0..0a365850 100755
--- a/pyfpdb/HUD_main.py
+++ b/pyfpdb/HUD_main.py
@@ -273,6 +273,7 @@ class HUD_main(object):
 
                 table_kwargs = dict(table_name = table_name, tournament = tour_number, table_number = tab_number)
                 search_string = getTableTitleRe(self.config, site_name, type, **table_kwargs)
+                # print "getTableTitleRe ", self.config, site_name, type, "=", search_string
                 tablewindow = Tables.Table(search_string, **table_kwargs)
 
                 if tablewindow is None:
diff --git a/pyfpdb/TableWindow.py b/pyfpdb/TableWindow.py
index 10607b16..aa994bfe 100644
--- a/pyfpdb/TableWindow.py
+++ b/pyfpdb/TableWindow.py
@@ -11,12 +11,12 @@ of Table_Window objects representing the windows found.
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
-#    
+#
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 #    GNU General Public License for more details.
-#    
+#
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
@@ -58,7 +58,7 @@ bad_words = ('History for table:', 'HUD:', 'Chat:')
 
 #    Here are the custom signals we define for allowing the 'client watcher'
 #    thread to communicate with the gui thread. Any time a poker client is
-#    is moved, resized, or closed on of these signals is emitted to the 
+#    is moved, resized, or closed on of these signals is emitted to the
 #    HUD main window.
 gobject.signal_new("client_moved", gtk.Window,
                    gobject.SIGNAL_RUN_LAST,
@@ -80,16 +80,16 @@ gobject.signal_new("client_destroyed", gtk.Window,
 #              from the corresponding hand history.
 #    tw.site = the site name, e.g. PokerStars, FullTilt.  This must match the site
 #            name specified in the config file.
-#    tw.number = This is the system id number for the client table window in the 
+#    tw.number = This is the system id number for the client table window in the
 #                format that the system presents it.  This is Xid in Xwindows and
 #                hwnd in Microsoft Windows.
 #    tw.title = The full title from the window title bar.
-#    tw.width, tw.height = The width and height of the window in pixels.  This is 
-#            the internal width and height, not including the title bar and 
+#    tw.width, tw.height = The width and height of the window in pixels.  This is
+#            the internal width and height, not including the title bar and
 #            window borders.
-#    tw.x, tw.y = The x, y (horizontal, vertical) location of the window relative 
+#    tw.x, tw.y = The x, y (horizontal, vertical) location of the window relative
 #            to the top left of the display screen.  This also does not include the
-#            title bar and window borders.  To put it another way, this is the 
+#            title bar and window borders.  To put it another way, this is the
 #            screen location of (0, 0) in the working window.
 
 class Table_Window(object):
@@ -101,7 +101,7 @@ class Table_Window(object):
             self.table = int(table_number)
             self.name = "%s - %s" % (self.tournament, self.table)
         elif table_name is not None:
-            search_string = table_name
+            # search_string = table_name
             self.name = table_name
             self.tournament = None
         else:
@@ -111,7 +111,7 @@ class Table_Window(object):
 
     def __str__(self):
 #    __str__ method for testing
-        likely_attrs = ("site", "number", "title", "width", "height", "x", "y", 
+        likely_attrs = ("site", "number", "title", "width", "height", "x", "y",
                         "tournament", "table", "gdkhandle")
         temp = 'TableWindow object\n'
         for a in likely_attrs:
@@ -125,7 +125,7 @@ class Table_Window(object):
         for game, names in game_names.iteritems():
             for name in names:
                 if name in title:
-                    return game 
+                    return game
         return None
 
     def check_geometry(self):
diff --git a/pyfpdb/WinTables.py b/pyfpdb/WinTables.py
index 5bca9e41..255238f4 100644
--- a/pyfpdb/WinTables.py
+++ b/pyfpdb/WinTables.py
@@ -50,6 +50,7 @@ class Table(Table_Window):
         titles = {}
         win32gui.EnumWindows(win_enum_handler, titles)
         for hwnd in titles:
+            if titles[hwnd] == "": continue
             # print "searching ", search_string, " in ", titles[hwnd]
             if re.search(search_string, titles[hwnd]):
                 if 'History for table:' in titles[hwnd]: continue # Everleaf Network HH viewer window

From 4d45bd39d3b18c83b55637f38ee6ec6f8cbc6e83 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Thu, 4 Feb 2010 23:08:09 +0000
Subject: [PATCH 203/320] make enabled sites come first in drop-down (i.e. more
 chance of the default being the one you want)

---
 pyfpdb/GuiBulkImport.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pyfpdb/GuiBulkImport.py b/pyfpdb/GuiBulkImport.py
index 96842134..84828493 100755
--- a/pyfpdb/GuiBulkImport.py
+++ b/pyfpdb/GuiBulkImport.py
@@ -243,7 +243,17 @@ class GuiBulkImport():
 
 #    ComboBox - filter
         self.cbfilter = gtk.combo_box_new_text()
+        disabled_sites = []                                # move disabled sites to bottom of list
         for w in self.config.hhcs:
+            try:
+                if self.config.supported_sites[w].enabled: # include enabled ones first
+                    print w
+                    self.cbfilter.append_text(w)
+                else:
+                    disabled_sites.append(w)
+            except: # self.supported_sites[w] may not exist if hud_config is bad
+                disabled_sites.append(w)
+        for w in disabled_sites:                           # then disabled ones
             print w
             self.cbfilter.append_text(w)
         self.cbfilter.set_active(0)

From ef2a8aca14f5c6862f17b725a2fdfec1a3dd69f9 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Thu, 4 Feb 2010 23:37:45 +0000
Subject: [PATCH 204/320] remove duplicate db calls which were slowing the hud
 down

---
 pyfpdb/HUD_main.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pyfpdb/HUD_main.py b/pyfpdb/HUD_main.py
index bae58825..7e809332 100755
--- a/pyfpdb/HUD_main.py
+++ b/pyfpdb/HUD_main.py
@@ -245,10 +245,6 @@ class HUD_main(object):
                                                                   ,self.hero_ids[site_id], num_seats)
                 t3 = time.time()
                 try:
-                    self.db_connection.init_hud_stat_vars( self.hud_dict[temp_key].hud_params['hud_days']
-                                                     , self.hud_dict[temp_key].hud_params['h_hud_days'])
-                    t4 = time.time()
-                    stat_dict = self.db_connection.get_stats_from_hand(new_hand_id, type, self.hud_dict[temp_key].hud_params, self.hero_ids[site_id])
                     self.hud_dict[temp_key].stat_dict = stat_dict
                 except KeyError:    # HUD instance has been killed off, key is stale
                     sys.stderr.write('hud_dict[%s] was not found\n' % temp_key)
@@ -256,9 +252,10 @@ class HUD_main(object):
                     # Unlocks table, copied from end of function
                     self.db_connection.connection.rollback()
                     return
-                t5 = time.time()
                 cards      = self.db_connection.get_cards(new_hand_id)
+                t4 = time.time()
                 comm_cards = self.db_connection.get_common_cards(new_hand_id)
+                t5 = time.time()
                 if comm_cards != {}: # stud!
                     cards['common'] = comm_cards['common']
                 self.hud_dict[temp_key].cards = cards

From fde72003f7ec49021623c00f076cdbd3104e7cde Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Fri, 5 Feb 2010 11:44:27 +0800
Subject: [PATCH 205/320] test2.py - Add more tests

Added most imports, and printed some formatted output for assiting diagnosis of new user installs
---
 pyfpdb/test2.py | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/pyfpdb/test2.py b/pyfpdb/test2.py
index 74ce1e72..8acdb089 100755
--- a/pyfpdb/test2.py
+++ b/pyfpdb/test2.py
@@ -22,12 +22,36 @@ Test if gtk is working.
 ########################################################################
 
 import sys
+import os
 
 try:
+    import gobject as _gobject
+    print "Import of gobject:\tSuccess"
     import pygtk
+    print "Import of pygtk:\tSuccess"
     pygtk.require('2.0')
     import gtk
+    print "Import of gtk:\t\tSuccess"
+    import pango
+    print "Import of pango:\tSuccess"
 
+    if os.name == 'nt':
+        import win32
+        import win32api
+        print "Import of win32:\tSuccess"
+
+    try:
+        import matplotlib
+        matplotlib.use('GTK')
+        print "Import of matplotlib:\tSuccess"
+        import numpy
+        print "Import of numpy:\tSuccess"
+        import pylab
+        print "Import of pylab:\tSuccess"
+    except:
+        print "\nError:", sys.exc_info()
+        print "\npress return to finish"
+        sys.stdin.readline()
 
     win = gtk.Window(gtk.WINDOW_TOPLEVEL)
     win.set_title("Test GTK")

From ab693e3b3c0010b966a8d3ab9bb0fc5639ab16d3 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Fri, 5 Feb 2010 11:51:12 +0800
Subject: [PATCH 206/320] test_PokerStars.py - Fix calls to HHC.

sqlcoder added config as a parameter to HHC and Hand
---
 pyfpdb/test_PokerStars.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pyfpdb/test_PokerStars.py b/pyfpdb/test_PokerStars.py
index 4244f532..588368ab 100755
--- a/pyfpdb/test_PokerStars.py
+++ b/pyfpdb/test_PokerStars.py
@@ -27,9 +27,9 @@ settings.update(config.get_default_paths())
 gametype = {'type':'ring', 'base':'draw', 'category':'badugi', 'limitType':'fl', 'sb':'0.25', 'bb':'0.50','currency':'USD'}
 text = ""
 
-hhc = PokerStarsToFpdb.PokerStars(autostart=False)
+hhc = PokerStarsToFpdb.PokerStars(config, autostart=False)
 
-h = HoldemOmahaHand(None, "PokerStars", gametype, text, builtFrom = "Test")
+h = HoldemOmahaHand(config, None, "PokerStars", gametype, text, builtFrom = "Test")
 h.addPlayer("1", "s0rrow", "100000")
 
 hhc.compilePlayerRegexs(h)
@@ -39,7 +39,7 @@ def checkGameInfo(hhc, header, info):
     assert hhc.determineGameType(header) == info
 
 def testGameInfo():
-    hhc = PokerStarsToFpdb.PokerStars(autostart=False)    
+    hhc = PokerStarsToFpdb.PokerStars(config, autostart=False)
     pairs = (
     (u"PokerStars Game #20461877044:  Hold'em No Limit ($1/$2) - 2008/09/16 18:58:01 ET",
     {'type':'ring', 'base':"hold", 'category':'holdem', 'limitType':'nl', 'sb':'1', 'bb':'2', 'currency':'USD'}),

From ac458386da2291de86eaee97cade229ecda45167 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Fri, 5 Feb 2010 21:29:07 +0800
Subject: [PATCH 207/320] Add config path to test2.py display

---
 pyfpdb/test2.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/test2.py b/pyfpdb/test2.py
index 8acdb089..7dea96f6 100755
--- a/pyfpdb/test2.py
+++ b/pyfpdb/test2.py
@@ -23,6 +23,9 @@ Test if gtk is working.
 
 import sys
 import os
+import Configuration
+
+config_path = Configuration.get_default_config_path()
 
 try:
     import gobject as _gobject
@@ -66,7 +69,7 @@ try:
                      (gtk.STOCK_CLOSE, gtk.RESPONSE_OK))
     dia.set_default_size(500, 300)
 
-    l = gtk.Label("GTK is working!")
+    l = gtk.Label("GTK is working!\nConfig location: %s" %config_path)
     dia.vbox.add(l)
     l.show()
 

From 5c26fee853dd96a071d86d42765a3e6445a94a4a Mon Sep 17 00:00:00 2001
From: Eric Blade <blade.eric@gmail.com>
Date: Fri, 5 Feb 2010 08:58:47 -0500
Subject: [PATCH 208/320] handle mysql error on close if connection was timed
 out

---
 pyfpdb/fpdb.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py
index 5bef3503..7a000981 100755
--- a/pyfpdb/fpdb.py
+++ b/pyfpdb/fpdb.py
@@ -802,8 +802,11 @@ class fpdb:
         # TODO: can we get some / all of the stuff done in this function to execute on any kind of abort?
         print "Quitting normally"
         # TODO: check if current settings differ from profile, if so offer to save or abort
-        if self.db is not None and self.db.connected:
-            self.db.disconnect()
+        try:
+            if self.db is not None and self.db.connected:
+                self.db.disconnect()
+        except _mysql_exceptions.OperationalError: # oh, damn, we're already disconnected
+            pass
         self.statusIcon.set_visible(False)
         gtk.main_quit()
 

From 08078cfee4dd50e84a92e71b0d92725695e18eb0 Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Fri, 5 Feb 2010 23:03:55 -0500
Subject: [PATCH 209/320] Configure for python 2.5. Add icon for fpdb.exe.

---
 pyfpdb/py2exe_setup.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/py2exe_setup.py b/pyfpdb/py2exe_setup.py
index 1e1ddc6b..6391194f 100644
--- a/pyfpdb/py2exe_setup.py
+++ b/pyfpdb/py2exe_setup.py
@@ -45,13 +45,14 @@ Py2exe script for fpdb.
 
 from distutils.core import setup
 import py2exe
+import glob
 
 setup(
     name        = 'fpdb',
     description = 'Free Poker DataBase',
     version     = '0.12',
 
-    console = [   {'script': 'fpdb.py', },
+    console = [   {'script': 'fpdb.py', "icon_resources": [(1, "../gfx/fpdb_large_icon.ico")]},
                   {'script': 'HUD_main.py', },
                   {'script': 'Configuration.py', }
               ],
@@ -69,7 +70,7 @@ setup(
                   'logging.conf',
                   (r'mpl-data',                 [r'C:\Python25\Lib\site-packages\matplotlib\mpl-data\matplotlibrc']),
                   (r'mpl-data\images', glob.glob(r'C:\Python25\Lib\site-packages\matplotlib\mpl-data\images\*.*')),
-                  (r'mpl-data\fonts',  glob.glob(r'C:\Python25\Lib\site-packages\matplotlib\mpl-data\fonts\*.*')),)
+                  (r'mpl-data\fonts',  glob.glob(r'C:\Python25\Lib\site-packages\matplotlib\mpl-data\fonts\*.*')),
                  ]
 )
 

From 4df991517e0fdd22e1013438ece31f7dc4624294 Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Fri, 5 Feb 2010 23:13:53 -0500
Subject: [PATCH 210/320] Changes to make the py2exe exe happy.

---
 pyfpdb/Configuration.py | 13 ++++++++++++-
 pyfpdb/GuiAutoImport.py |  7 ++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)
 mode change 100755 => 100644 pyfpdb/Configuration.py
 mode change 100755 => 100644 pyfpdb/GuiAutoImport.py

diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py
old mode 100755
new mode 100644
index ec4c621e..f87cd049
--- a/pyfpdb/Configuration.py
+++ b/pyfpdb/Configuration.py
@@ -166,6 +166,10 @@ if LOCALE_ENCODING == "US-ASCII":
 
 
 # needs LOCALE_ENCODING (above), imported for sqlite setup in Config class below
+
+FROZEN = hasattr(sys, "frozen")
+EXEC_PATH = get_exec_path()
+
 import Charset
 
 
@@ -613,7 +617,8 @@ class Config:
     def save(self, file = None):
         if file is None:
             file = self.file
-        shutil.move(file, file+".backup")
+            shutil.move(file, file+".backup", ignore_errors = True)
+
         with open(file, 'w') as f:
             self.doc.writexml(f)
 
@@ -1030,3 +1035,9 @@ if __name__== "__main__":
             PrettyPrint(site_node, stream=sys.stdout, encoding="utf-8")
     except:
         print "xml.dom.ext needs PyXML to be installed!"
+
+    print "FROZEN =", FROZEN
+    print "EXEC_PATH =", EXEC_PATH
+
+    print "press enter to end"
+    sys.stdin.readline()
diff --git a/pyfpdb/GuiAutoImport.py b/pyfpdb/GuiAutoImport.py
old mode 100755
new mode 100644
index 339ce968..f8150500
--- a/pyfpdb/GuiAutoImport.py
+++ b/pyfpdb/GuiAutoImport.py
@@ -193,7 +193,11 @@ class GuiAutoImport (threading.Thread):
                 self.doAutoImportBool = True
                 widget.set_label(u'  _Stop Autoimport  ')
                 if self.pipe_to_hud is None:
-                    if os.name == 'nt':
+                    if Configuration.FROZEN:
+                        path = Configuration.EXEC_PATH
+                        command = "HUD_main.exe"
+                        bs = 0
+                    elif os.name == 'nt':
                         path = sys.path[0].replace('\\','\\\\')
                         command = 'python "'+path+'\\HUD_main.py" ' + self.settings['cl_options']
                         bs = 0
@@ -203,6 +207,7 @@ class GuiAutoImport (threading.Thread):
                         bs = 1
 
                     try:
+                        print "opening pipe to HUD"
                         self.pipe_to_hud = subprocess.Popen(command, bufsize=bs,
                                                             stdin=subprocess.PIPE,
                                                             universal_newlines=True)

From 8aa18b95d829781091eb585a27afd8291238a9cd Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Fri, 5 Feb 2010 23:19:58 -0500
Subject: [PATCH 211/320] Changes to make running py2exe exe happy.

---
 pyfpdb/Configuration.py | 13 +------------
 pyfpdb/GuiAutoImport.py |  7 +------
 2 files changed, 2 insertions(+), 18 deletions(-)
 mode change 100644 => 100755 pyfpdb/Configuration.py
 mode change 100644 => 100755 pyfpdb/GuiAutoImport.py

diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py
old mode 100644
new mode 100755
index f87cd049..ec4c621e
--- a/pyfpdb/Configuration.py
+++ b/pyfpdb/Configuration.py
@@ -166,10 +166,6 @@ if LOCALE_ENCODING == "US-ASCII":
 
 
 # needs LOCALE_ENCODING (above), imported for sqlite setup in Config class below
-
-FROZEN = hasattr(sys, "frozen")
-EXEC_PATH = get_exec_path()
-
 import Charset
 
 
@@ -617,8 +613,7 @@ class Config:
     def save(self, file = None):
         if file is None:
             file = self.file
-            shutil.move(file, file+".backup", ignore_errors = True)
-
+        shutil.move(file, file+".backup")
         with open(file, 'w') as f:
             self.doc.writexml(f)
 
@@ -1035,9 +1030,3 @@ if __name__== "__main__":
             PrettyPrint(site_node, stream=sys.stdout, encoding="utf-8")
     except:
         print "xml.dom.ext needs PyXML to be installed!"
-
-    print "FROZEN =", FROZEN
-    print "EXEC_PATH =", EXEC_PATH
-
-    print "press enter to end"
-    sys.stdin.readline()
diff --git a/pyfpdb/GuiAutoImport.py b/pyfpdb/GuiAutoImport.py
old mode 100644
new mode 100755
index f8150500..339ce968
--- a/pyfpdb/GuiAutoImport.py
+++ b/pyfpdb/GuiAutoImport.py
@@ -193,11 +193,7 @@ class GuiAutoImport (threading.Thread):
                 self.doAutoImportBool = True
                 widget.set_label(u'  _Stop Autoimport  ')
                 if self.pipe_to_hud is None:
-                    if Configuration.FROZEN:
-                        path = Configuration.EXEC_PATH
-                        command = "HUD_main.exe"
-                        bs = 0
-                    elif os.name == 'nt':
+                    if os.name == 'nt':
                         path = sys.path[0].replace('\\','\\\\')
                         command = 'python "'+path+'\\HUD_main.py" ' + self.settings['cl_options']
                         bs = 0
@@ -207,7 +203,6 @@ class GuiAutoImport (threading.Thread):
                         bs = 1
 
                     try:
-                        print "opening pipe to HUD"
                         self.pipe_to_hud = subprocess.Popen(command, bufsize=bs,
                                                             stdin=subprocess.PIPE,
                                                             universal_newlines=True)

From 4a0fcd62a065bc6083e2931788582c54fdc062c7 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sat, 6 Feb 2010 10:28:17 +0000
Subject: [PATCH 212/320] sqlite seems to perform ok for me

---
 pyfpdb/Database.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index e0649b78..0303aad2 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -380,8 +380,8 @@ class Database:
             import sqlite3
             if use_pool:
                 sqlite3 = pool.manage(sqlite3, pool_size=1)
-            else:
-                log.warning("SQLite won't work well without 'sqlalchemy' installed.")
+            #else:
+            #    log.warning("SQLite won't work well without 'sqlalchemy' installed.")
 
             if database != ":memory:":
                 if not os.path.isdir(self.config.dir_database):

From 4d7443784577502ba9ac09abfc101f0b0a54f3e1 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sat, 6 Feb 2010 10:33:00 +0000
Subject: [PATCH 213/320] run HUD_main.exe if running fpdb.exe (created by
 py2exe)

---
 pyfpdb/GuiAutoImport.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pyfpdb/GuiAutoImport.py b/pyfpdb/GuiAutoImport.py
index 339ce968..192124e5 100755
--- a/pyfpdb/GuiAutoImport.py
+++ b/pyfpdb/GuiAutoImport.py
@@ -194,8 +194,11 @@ class GuiAutoImport (threading.Thread):
                 widget.set_label(u'  _Stop Autoimport  ')
                 if self.pipe_to_hud is None:
                     if os.name == 'nt':
-                        path = sys.path[0].replace('\\','\\\\')
-                        command = 'python "'+path+'\\HUD_main.py" ' + self.settings['cl_options']
+                        if sys.argv[0] == 'fpdb.exe':
+                            command = 'HUD_main.exe'
+                        else:
+                            path = sys.path[0].replace('\\','\\\\')
+                            command = 'python "'+path+'\\HUD_main.py" ' + self.settings['cl_options']
                         bs = 0
                     else:
                         command = os.path.join(sys.path[0], 'HUD_main.py')
@@ -208,7 +211,8 @@ class GuiAutoImport (threading.Thread):
                                                             universal_newlines=True)
                     except:
                         err = traceback.extract_tb(sys.exc_info()[2])[-1]
-                        self.addText( "\n*** GuiAutoImport Error opening pipe: " + err[2] + "(" + str(err[1]) + "): " + str(sys.exc_info()[1]))
+                        #self.addText( "\n*** GuiAutoImport Error opening pipe: " + err[2] + "(" + str(err[1]) + "): " + str(sys.exc_info()[1]))
+                        self.addText( "\n*** GuiAutoImport Error opening pipe: " + traceback.format_exc() )
                     else:
                         for site in self.input_settings:
                             self.importer.addImportDirectory(self.input_settings[site][0], True, site, self.input_settings[site][1])

From 752e5ad088da02808b302eed0d4163258909520b Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sat, 6 Feb 2010 12:27:15 +0000
Subject: [PATCH 214/320] make sure fpdb icon works in py2exe

---
 pyfpdb/fpdb.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py
index d5e0350d..376fdcc6 100755
--- a/pyfpdb/fpdb.py
+++ b/pyfpdb/fpdb.py
@@ -912,8 +912,10 @@ This program is licensed under the AGPL3, see docs"""+os.sep+"agpl-3.0.txt")
             sys.stderr = errorFile
 
         self.statusIcon = gtk.StatusIcon()
-        if os.path.exists(os.path.join(sys.path[0], '../gfx/fpdb-cards.png')):
-            self.statusIcon.set_from_file(os.path.join(sys.path[0], '../gfx/fpdb-cards.png'))
+        # use getcwd() here instead of sys.path[0] so that py2exe works:
+        cards = os.path.join(os.getcwd(), '..','gfx','fpdb-cards.png')
+        if os.path.exists(cards):
+            self.statusIcon.set_from_file(cards)
         elif os.path.exists('/usr/share/pixmaps/fpdb-cards.png'):
             self.statusIcon.set_from_file('/usr/share/pixmaps/fpdb-cards.png')
         else:

From 1e832952dd3b5a62bee36b37aa48f0122df9931d Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sat, 6 Feb 2010 15:55:32 +0000
Subject: [PATCH 215/320] add newline in error reporting message

---
 pyfpdb/fpdb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py
index 376fdcc6..8a6af4ea 100755
--- a/pyfpdb/fpdb.py
+++ b/pyfpdb/fpdb.py
@@ -907,7 +907,7 @@ This program is licensed under the AGPL3, see docs"""+os.sep+"agpl-3.0.txt")
         if not options.errorsToConsole:
             fileName = os.path.join(self.config.dir_log, 'fpdb-errors.txt')
             print "\nNote: error output is being diverted to fpdb-errors.txt and HUD-errors.txt in\n" \
-                  + self.config.dir_log + "Any major error will be reported there _only_.\n"
+                  + self.config.dir_log + "\nAny major error will be reported there _only_.\n"
             errorFile = open(fileName, 'w', 0)
             sys.stderr = errorFile
 

From 49e4a7db6948e872733228567e3b9250ab6d765c Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sat, 6 Feb 2010 18:06:21 +0000
Subject: [PATCH 216/320] change a few prints to logs

---
 pyfpdb/HUD_main.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pyfpdb/HUD_main.py b/pyfpdb/HUD_main.py
index 7e809332..5bf69122 100755
--- a/pyfpdb/HUD_main.py
+++ b/pyfpdb/HUD_main.py
@@ -70,16 +70,15 @@ class HUD_main(object):
 
     def __init__(self, db_name = 'fpdb'):
         try:
-            print "HUD_main: starting ..."
+            print "\nHUD_main: starting ..."
             self.db_name = db_name
             self.config = Configuration.Config(file=options.config, dbname=db_name)
             log = Configuration.get_logger("logging.conf", "hud", log_dir=self.config.dir_log)
-            log.info("HUD_main starting")
-            log.info("Using db name = %s" % (db_name))
+            log.info("HUD_main starting: using db name = %s" % (db_name))
 
             if not options.errorsToConsole:
                  fileName = os.path.join(self.config.dir_log, 'HUD-errors.txt')
-                 print "Note: error output is being diverted to\n"+fileName \
+                 print "Note: error output is being diverted to:\n"+fileName \
                        + "\nAny major error will be reported there _only_.\n" 
                  errorFile = open(fileName, 'w', 0)
                  sys.stderr = errorFile
@@ -139,8 +138,8 @@ class HUD_main(object):
                 self.hud_dict[table_name].update(new_hand_id, self.config)
                 self.hud_dict[table_name].reposition_windows()
             except:
-                print "*** Exception in HUD_main::idle_func() *** "
-                traceback.print_stack()
+                log.error( "*** Exception in HUD_main::idle_func() *** " )
+                log.error( traceback.format_stack() )
             finally:
                 gtk.gdk.threads_leave()
                 return False
@@ -247,8 +246,8 @@ class HUD_main(object):
                 try:
                     self.hud_dict[temp_key].stat_dict = stat_dict
                 except KeyError:    # HUD instance has been killed off, key is stale
-                    sys.stderr.write('hud_dict[%s] was not found\n' % temp_key)
-                    sys.stderr.write('will not send hand\n')
+                    log.error('hud_dict[%s] was not found\n' % temp_key)
+                    log.error('will not send hand\n')
                     # Unlocks table, copied from end of function
                     self.db_connection.connection.rollback()
                     return
@@ -281,7 +280,7 @@ class HUD_main(object):
 #        If no client window is found on the screen, complain and continue
                     if type == "tour":
                         table_name = "%s %s" % (tour_number, tab_number)
-#                    sys.stderr.write("HUD create: table name "+table_name+" not found, skipping.\n")
+#                    log.error("HUD create: table name "+table_name+" not found, skipping.\n")
                     log.error("HUD create: table name %s not found, skipping." % table_name)
                 else:
                     tablewindow.max = max
@@ -290,7 +289,7 @@ class HUD_main(object):
                     if hasattr(tablewindow, 'number'):
                         self.create_HUD(new_hand_id, tablewindow, temp_key, max, poker_game, type, stat_dict, cards)
                     else:
-                        sys.stderr.write('Table "%s" no longer exists\n' % table_name)
+                        log.error('Table "%s" no longer exists\n' % table_name)
 
             t6 = time.time()
             log.info("HUD_main.read_stdin: hand read in %4.3f seconds (%4.3f,%4.3f,%4.3f,%4.3f,%4.3f,%4.3f)"

From d25611dd383f0993a09f58200c5281506bdfff4f Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sat, 6 Feb 2010 18:07:00 +0000
Subject: [PATCH 217/320] get py2exe working better - nice :-)

---
 pyfpdb/py2exe_setup.py | 95 +++++++++++++++++++++++++++++++++---------
 1 file changed, 75 insertions(+), 20 deletions(-)

diff --git a/pyfpdb/py2exe_setup.py b/pyfpdb/py2exe_setup.py
index 9565ac0b..1e38f98b 100644
--- a/pyfpdb/py2exe_setup.py
+++ b/pyfpdb/py2exe_setup.py
@@ -22,29 +22,78 @@ Py2exe script for fpdb.
 
 ########################################################################
 
-#TODO:   change GuiAutoImport so that it knows to start HUD_main.exe, when appropriate
+#TODO:   
 #        include the lib needed to handle png files in mucked
 #        get rid of all the uneeded libraries (e.g., pyQT)
 #        think about an installer
 
+# done: change GuiAutoImport so that it knows to start HUD_main.exe, when appropriate
+
 #HOW TO USE this script:
 #
-#  cd to the folder where this script is stored, usually .../pyfpdb.
-#  If there are build and dist subfolders present , delete them to get
-#  rid of earlier builds.
-#  Run the script with "py2exe_setup.py py2exe"
-#  You will frequently get messages about missing .dll files. E. g., 
+#- cd to the folder where this script is stored, usually .../pyfpdb.
+#  [If there are build and dist subfolders present , delete them to get
+#   rid of earlier builds. Update: script now does this for you]
+#- Run the script with "py2exe_setup.py py2exe"
+#- You will frequently get messages about missing .dll files. E. g., 
 #  MSVCP90.dll. These are somewhere in your windows install, so you 
-#  can just copy them to your working folder.
-#  If it works, you'll have 2 new folders, build and dist. Build is 
-#  working space and should be deleted. Dist contains the files to be
-#  distributed. Last, you must copy the etc/, lib/ and share/ folders 
-# from your gtk/bin/ folder to the dist folder. (the whole folders, not 
-# just the contents) You can (should) then prune the etc/, lib/ and 
-# share/ folders to remove components we don't need. 
+#  can just copy them to your working folder. (or just assume other
+#  person will have them? any copyright issues with including them?)
+#- If it works, you'll have 3 new folders, build and dist and gfx. Build is 
+#  working space and should be deleted. Dist and gfx contain the files to be
+#  distributed. 
+#- Last, you must copy the etc/, lib/ and share/ folders from your
+#  gtk/bin/ (just /gtk/?) folder to the dist folder. (the whole folders, 
+#  not just the contents) 
+#- You can (should) then prune the etc/, lib/ and share/ folders to 
+#  remove components we don't need. 
 
+import os
+import sys
 from distutils.core import setup
 import py2exe
+import glob
+import matplotlib
+from datetime import date
+
+
+def remove_tree(top):
+    # Delete everything reachable from the directory named in 'top',
+    # assuming there are no symbolic links.
+    # CAUTION:  This is dangerous!  For example, if top == '/', it
+    # could delete all your disk files.
+    # sc: Nicked this from somewhere, added the if statement to try 
+    #     make it a bit safer
+    if top in ('build','dist','gfx') and os.path.basename(os.getcwd()) == 'pyfpdb':
+        #print "removing directory '"+top+"' ..."
+        for root, dirs, files in os.walk(top, topdown=False):
+            for name in files:
+                os.remove(os.path.join(root, name))
+            for name in dirs:
+                os.rmdir(os.path.join(root, name))
+        os.rmdir(top)
+
+def test_and_remove(top):
+    if os.path.exists(top):
+        if os.path.isdir(top):
+            remove_tree(top)
+        else:
+            print "Unexpected file '"+top+"' found. Exiting."
+            exit()
+
+# remove build and dist dirs if they exist
+test_and_remove('dist')
+test_and_remove('build')
+test_and_remove('gfx')
+
+
+today = date.today().strftime('%Y%m%d')
+print "\nOutput will be created in /dist/ and /fpdb_XXX_"+today+"/"
+print "Enter value for XXX (any length): ",     # the comma means no newline
+xxx = sys.stdin.readline().rstrip()
+dist_dir = r'..\fpdb_' + xxx + '_' + today
+print
+
 
 setup(
     name        = 'fpdb',
@@ -57,17 +106,23 @@ setup(
               ],
 
     options = {'py2exe': {
-                      'packages'    :'encodings',
+                      'packages'    : 'encodings',
                       'includes'    : 'cairo, pango, pangocairo, atk, gobject, PokerStarsToFpdb',
-		              'excludes'    : '_tkagg, _agg2, cocoaagg, fltkagg',
+                      'excludes'    : '_tkagg, _agg2, cocoaagg, fltkagg',
                       'dll_excludes': 'libglade-2.0-0.dll',
                   }
               },
 
-    data_files = ['HUD_config.xml.example',
-                  'Cards01.png',
-                  'logging.conf',
-                  (r'matplotlibdata', glob.glob(r'c:\python26\Lib\site-packages\matplotlib\mpl-data\*'))
-                 ]
+    # files are moved from 2nd value in tuple to dir named in 1st
+    data_files = [('', ['HUD_config.xml.example', 'Cards01.png', 'logging.conf'])
+                 ,(dist_dir, ['run_fpdb.bat'])
+                 ,( dist_dir + r'\gfx', glob.glob(r'..\gfx\*.*') )
+                 #,(r'matplotlibdata', glob.glob(r'c:\python25\Lib\site-packages\matplotlib\mpl-data\*'))
+                 ] + matplotlib.get_py2exe_datafiles()
 )
 
+
+print '\nIf py2exe was successful move the /dist/ directory '
+print 'into /'+dist_dir+'/ and rename it as /pyfpdb/'
+print "Don't forget to add the /etc /lib and /share dirs from your gtk dir\n"
+

From d9fddd6595684a42882e2b4664e7fedb7b842305 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sat, 6 Feb 2010 18:07:48 +0000
Subject: [PATCH 218/320] miniscule print change

---
 pyfpdb/fpdb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py
index 8a6af4ea..340d12b9 100755
--- a/pyfpdb/fpdb.py
+++ b/pyfpdb/fpdb.py
@@ -906,7 +906,7 @@ This program is licensed under the AGPL3, see docs"""+os.sep+"agpl-3.0.txt")
 
         if not options.errorsToConsole:
             fileName = os.path.join(self.config.dir_log, 'fpdb-errors.txt')
-            print "\nNote: error output is being diverted to fpdb-errors.txt and HUD-errors.txt in\n" \
+            print "\nNote: error output is being diverted to fpdb-errors.txt and HUD-errors.txt in:\n" \
                   + self.config.dir_log + "\nAny major error will be reported there _only_.\n"
             errorFile = open(fileName, 'w', 0)
             sys.stderr = errorFile

From 8b28427ff99f2eb2d1f2e973bc3c810e96a998f6 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sat, 6 Feb 2010 18:46:27 +0000
Subject: [PATCH 219/320] use log instead of print

---
 pyfpdb/Hud.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pyfpdb/Hud.py b/pyfpdb/Hud.py
index 3ae2f661..dcad0865 100644
--- a/pyfpdb/Hud.py
+++ b/pyfpdb/Hud.py
@@ -26,6 +26,10 @@ Create and manage the hud overlays.
 import os
 import sys
 
+import logging
+# logging has been set up in fpdb.py or HUD_main.py, use their settings:
+log = logging.getLogger("hud")
+
 #    pyGTK modules
 import pygtk
 import gtk
@@ -365,7 +369,7 @@ class Hud:
                 self.create(*self.creation_attrs)
                 self.update(self.hand, self.config)
             except Exception, e:
-                print "Exception:",str(e)
+                log.error("Exception:",str(e))
                 pass
 
     def set_aggregation(self, widget, val):
@@ -377,7 +381,7 @@ class Hud:
 
             if     self.hud_params['h_agg_bb_mult'] != num \
                and getattr(self, 'h_aggBBmultItem'+str(num)).get_active():
-                print 'set_player_aggregation', num
+                log.debug('set_player_aggregation', num)
                 self.hud_params['h_agg_bb_mult'] = num
                 for mult in ('1', '2', '3', '10', '10000'):
                     if mult != str(num):
@@ -388,7 +392,7 @@ class Hud:
 
             if     self.hud_params['agg_bb_mult'] != num \
                and getattr(self, 'aggBBmultItem'+str(num)).get_active():
-                print 'set_opponent_aggregation', num
+                log.debug('set_opponent_aggregation', num)
                 self.hud_params['agg_bb_mult'] = num
                 for mult in ('1', '2', '3', '10', '10000'):
                     if mult != str(num):
@@ -415,7 +419,7 @@ class Hud:
             self.hud_params[param] = 'E'
             getattr(self, prefix+'seatsStyleOptionA').set_active(False)
             getattr(self, prefix+'seatsStyleOptionC').set_active(False)
-        print "setting self.hud_params[%s] = %s" % (param, style)
+        log.debug("setting self.hud_params[%s] = %s" % (param, style))
 
     def set_hud_style(self, widget, val):
         (player_opp, style) = val
@@ -438,7 +442,7 @@ class Hud:
             self.hud_params[param] = 'T'
             getattr(self, prefix+'hudStyleOptionA').set_active(False)
             getattr(self, prefix+'hudStyleOptionS').set_active(False)
-        print "setting self.hud_params[%s] = %s" % (param, style)
+        log.debug("setting self.hud_params[%s] = %s" % (param, style))
 
     def update_table_position(self):
         if os.name == 'nt':
@@ -515,7 +519,7 @@ class Hud:
 #    ask each aux to save its layout back to the config object
         [aux.save_layout() for aux in self.aux_windows]
 #    save the config object back to the file
-        print "saving new xml file"
+        print "Updating config file"
         self.config.save()
 
     def adj_seats(self, hand, config):
@@ -611,8 +615,8 @@ class Hud:
             try:
                 statd = self.stat_dict[s]
             except KeyError:
-                print "KeyError at the start of the for loop in update in hud_main. How this can possibly happen is totally beyond my comprehension. Your HUD may be about to get really weird. -Eric"
-                print "(btw, the key was ", s, " and statd is...", statd
+                log.error("KeyError at the start of the for loop in update in hud_main. How this can possibly happen is totally beyond my comprehension. Your HUD may be about to get really weird. -Eric")
+                log.error("(btw, the key was ", s, " and statd is...", statd)
                 continue
             try:
                 self.stat_windows[statd['seat']].player_id = statd['player_id']

From a3ec32b7b983f97584e9352887c7ad60d122edd6 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sat, 6 Feb 2010 18:59:33 +0000
Subject: [PATCH 220/320] change print to log

---
 pyfpdb/WinTables.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pyfpdb/WinTables.py b/pyfpdb/WinTables.py
index f834eac9..89d6e1e2 100644
--- a/pyfpdb/WinTables.py
+++ b/pyfpdb/WinTables.py
@@ -24,6 +24,10 @@ Routines for detecting and handling poker client windows for MS Windows.
 #    Standard Library modules
 import re
 
+import logging
+# logging has been set up in fpdb.py or HUD_main.py, use their settings:
+log = logging.getLogger("hud")
+
 #    pyGTK modules
 import pygtk
 import gtk
@@ -59,19 +63,19 @@ class Table(Table_Window):
 
         try:
             if self.window == None:
-                print "Window %s not found. Skipping." % search_string
+                log.error( "Window %s not found. Skipping." % search_string )
                 return None
         except AttributeError:
-            print "self.window doesn't exist? why?"
+            log.error( "self.window doesn't exist? why?" )
             return None
 
         (x, y, width, height) = win32gui.GetWindowRect(hwnd)
-        print "x = %s y = %s width = %s height = %s" % (x, y, width, height)
+        log.debug("x = %s y = %s width = %s height = %s" % (x, y, width, height))
         self.x      = int(x) + b_width
         self.y      = int(y) + tb_height
         self.width  = width - x
         self.height = height - y
-        print "x = %s y = %s width = %s height = %s" % (self.x, self.y, self.width, self.height)
+        log.debug("x = %s y = %s width = %s height = %s" % (self.x, self.y, self.width, self.height))
         #self.height = int(height) - b_width - tb_height
         #self.width  = int(width) - 2*b_width
 

From f1d4f08d1c625a021d3657064cd222b85bd2e190 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sat, 6 Feb 2010 19:00:30 +0000
Subject: [PATCH 221/320] trivial change to output dir name

---
 pyfpdb/py2exe_setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/py2exe_setup.py b/pyfpdb/py2exe_setup.py
index 1e38f98b..e6219ae3 100644
--- a/pyfpdb/py2exe_setup.py
+++ b/pyfpdb/py2exe_setup.py
@@ -91,7 +91,7 @@ today = date.today().strftime('%Y%m%d')
 print "\nOutput will be created in /dist/ and /fpdb_XXX_"+today+"/"
 print "Enter value for XXX (any length): ",     # the comma means no newline
 xxx = sys.stdin.readline().rstrip()
-dist_dir = r'..\fpdb_' + xxx + '_' + today
+dist_dir = r'..\fpdb-' + xxx + '-' + today
 print
 
 

From 120d05f9cde9f0159b89f84807af36c4f91f6184 Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Sat, 6 Feb 2010 14:55:48 -0500
Subject: [PATCH 222/320] Changes for py2exe exe.

---
 pyfpdb/GuiAutoImport.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/GuiAutoImport.py b/pyfpdb/GuiAutoImport.py
index 339ce968..f8150500 100755
--- a/pyfpdb/GuiAutoImport.py
+++ b/pyfpdb/GuiAutoImport.py
@@ -193,7 +193,11 @@ class GuiAutoImport (threading.Thread):
                 self.doAutoImportBool = True
                 widget.set_label(u'  _Stop Autoimport  ')
                 if self.pipe_to_hud is None:
-                    if os.name == 'nt':
+                    if Configuration.FROZEN:
+                        path = Configuration.EXEC_PATH
+                        command = "HUD_main.exe"
+                        bs = 0
+                    elif os.name == 'nt':
                         path = sys.path[0].replace('\\','\\\\')
                         command = 'python "'+path+'\\HUD_main.py" ' + self.settings['cl_options']
                         bs = 0
@@ -203,6 +207,7 @@ class GuiAutoImport (threading.Thread):
                         bs = 1
 
                     try:
+                        print "opening pipe to HUD"
                         self.pipe_to_hud = subprocess.Popen(command, bufsize=bs,
                                                             stdin=subprocess.PIPE,
                                                             universal_newlines=True)

From 4ecd713dab61a89002d468ab51b369b4ce83c5ab Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sat, 6 Feb 2010 21:29:17 +0000
Subject: [PATCH 223/320] forgot to add the new .bat file

---
 pyfpdb/run_fpdb.bat | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100755 pyfpdb/run_fpdb.bat

diff --git a/pyfpdb/run_fpdb.bat b/pyfpdb/run_fpdb.bat
new file mode 100755
index 00000000..d16a54fd
--- /dev/null
+++ b/pyfpdb/run_fpdb.bat
@@ -0,0 +1,7 @@
+
+rem  .bat script to run fpdb
+
+cd pyfpdb
+
+fpdb.exe
+

From ef26c05181f2f203ad5990d157f7367341d221ee Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sat, 6 Feb 2010 23:12:11 +0000
Subject: [PATCH 224/320] be more tolerant of errors when translating for gui,
 add encode exception handlers

---
 pyfpdb/Charset.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/Charset.py b/pyfpdb/Charset.py
index ea19d32e..9c49f505 100644
--- a/pyfpdb/Charset.py
+++ b/pyfpdb/Charset.py
@@ -42,6 +42,9 @@ def to_utf8(s):
     except UnicodeDecodeError:
         sys.stderr.write('Could not convert: "%s"\n' % s)
         raise
+    except UnicodeEncodeError:
+        sys.stderr.write('Could not encode: "%s"\n' % s)
+        raise
     except TypeError: # TypeError is raised when we give unicode() an already encoded string
         return s
 
@@ -54,13 +57,21 @@ def to_db_utf8(s):
     except UnicodeDecodeError:
         sys.stderr.write('Could not convert: "%s"\n' % s)
         raise
+    except UnicodeEncodeError:
+        sys.stderr.write('Could not encode: "%s"\n' % s)
+        raise
 
 def to_gui(s):
     if not_needed3: return s
 
     try:
-        (_out, _len) = encoder_to_sys.encode(s)
+        # we usually don't want to use 'replace' but this is only for displaying
+        # in the gui so it doesn't matter if names are missing an accent or two
+        (_out, _len) = encoder_to_sys.encode(s, 'replace')
         return _out
     except UnicodeDecodeError:
         sys.stderr.write('Could not convert: "%s"\n' % s)
         raise
+    except UnicodeEncodeError:
+        sys.stderr.write('Could not encode: "%s"\n' % s)
+        raise

From fbeaa5590f40f599c1737c87bce5ab8e1a2fea6c Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sun, 7 Feb 2010 01:06:36 +0000
Subject: [PATCH 225/320] move run_fpdb.bat up a directory to /fpdb/

---
 pyfpdb/py2exe_setup.py              | 25 ++++++++++++++-----------
 pyfpdb/run_fpdb.bat => run_fpdb.bat |  0
 2 files changed, 14 insertions(+), 11 deletions(-)
 rename pyfpdb/run_fpdb.bat => run_fpdb.bat (100%)

diff --git a/pyfpdb/py2exe_setup.py b/pyfpdb/py2exe_setup.py
index e6219ae3..28f13cc1 100644
--- a/pyfpdb/py2exe_setup.py
+++ b/pyfpdb/py2exe_setup.py
@@ -88,10 +88,10 @@ test_and_remove('gfx')
 
 
 today = date.today().strftime('%Y%m%d')
-print "\nOutput will be created in /dist/ and /fpdb_XXX_"+today+"/"
+print "\n" + r"Output will be created in \dist\ and \fpdb_XXX_"+today+'\\'
 print "Enter value for XXX (any length): ",     # the comma means no newline
 xxx = sys.stdin.readline().rstrip()
-dist_dir = r'..\fpdb-' + xxx + '-' + today
+dist_dir = r'..\fpdb-' + xxx + '-' + today + '-exe'
 print
 
 
@@ -106,23 +106,26 @@ setup(
               ],
 
     options = {'py2exe': {
-                      'packages'    : 'encodings',
-                      'includes'    : 'cairo, pango, pangocairo, atk, gobject, PokerStarsToFpdb',
-                      'excludes'    : '_tkagg, _agg2, cocoaagg, fltkagg',
-                      'dll_excludes': 'libglade-2.0-0.dll',
+                      'packages'    : ['encodings', 'matplotlib'],
+                      'includes'    : ['cairo', 'pango', 'pangocairo', 'atk', 'gobject'
+                                      ,'PokerStarsToFpdb', 'matplotlib.numerix.random_array'],
+                      'excludes'    : ['_gtkagg', '_tkagg', '_agg2', 'cocoaagg', 'fltkagg'],
+                      'dll_excludes': ['libglade-2.0-0.dll', 'libgdk-win32-2.0-0.dll'
+                                      ,'libgobject-2.0-0.dll'],
                   }
               },
 
-    # files are moved from 2nd value in tuple to dir named in 1st
+    # files in 2nd value in tuple are moved to dir named in 1st value
     data_files = [('', ['HUD_config.xml.example', 'Cards01.png', 'logging.conf'])
-                 ,(dist_dir, ['run_fpdb.bat'])
+                 ,(dist_dir, [r'..\run_fpdb.bat'])
                  ,( dist_dir + r'\gfx', glob.glob(r'..\gfx\*.*') )
+                 # line below has problem with fonts subdir ('not a regular file')
                  #,(r'matplotlibdata', glob.glob(r'c:\python25\Lib\site-packages\matplotlib\mpl-data\*'))
                  ] + matplotlib.get_py2exe_datafiles()
 )
 
 
-print '\nIf py2exe was successful move the /dist/ directory '
-print 'into /'+dist_dir+'/ and rename it as /pyfpdb/'
-print "Don't forget to add the /etc /lib and /share dirs from your gtk dir\n"
+print '\n' + r'If py2exe was successful move the \dist\ directory '
+print 'into \\'+dist_dir+'\\ and rename it as \\pyfpdb\\'
+print "Don't forget to add the \\etc \\lib and \\share dirs from your gtk dir\n"
 
diff --git a/pyfpdb/run_fpdb.bat b/run_fpdb.bat
similarity index 100%
rename from pyfpdb/run_fpdb.bat
rename to run_fpdb.bat

From ac51876200743ea58f0af8c5d74cb7e01801b731 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sun, 7 Feb 2010 19:08:23 +0800
Subject: [PATCH 226/320] PokerStarsTo Fpdb: Fix subtle bug in re_Action

The bet action could become multiline greedy if there was a playername starting with 'card' in the next line.

"""
danny purse: bets $0.50
cardjunkie25: calls $0.50
"""

Would match "danny purse: bets $0.50\ncard", and the rest of that line would be ignored.

Added '$' to the end of the regex to make sure that it is limited to 1 line, and wrap 'cards' as a group.
---
 pyfpdb/PokerStarsToFpdb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
index c2a92881..fc63be91 100755
--- a/pyfpdb/PokerStarsToFpdb.py
+++ b/pyfpdb/PokerStarsToFpdb.py
@@ -103,7 +103,7 @@ class PokerStars(HandHistoryConverter):
             self.re_Action           = re.compile(r"""
                         ^%(PLYR)s:(?P<ATYPE>\sbets|\schecks|\sraises|\scalls|\sfolds|\sdiscards|\sstands\spat)
                         (\s(%(CUR)s)?(?P<BET>[.\d]+))?(\sto\s%(CUR)s(?P<BETTO>[.\d]+))?  # the number discarded goes in <BET>
-                        (\scards?(\s\[(?P<DISCARDED>.+?)\])?)?"""
+                        (\s(cards)?(\s\[(?P<DISCARDED>.+?)\])?)?$"""
                          %  subst, re.MULTILINE|re.VERBOSE)
             self.re_ShowdownAction   = re.compile(r"^%s: shows \[(?P<CARDS>.*)\]" %  player_re, re.MULTILINE)
             self.re_CollectPot       = re.compile(r"Seat (?P<SEAT>[0-9]+): %(PLYR)s (\(button\) |\(small blind\) |\(big blind\) |\(button\) \(small blind\) )?(collected|showed \[.*\] and won) \(%(CUR)s(?P<POT>[.\d]+)\)(, mucked| with.*|)" %  subst, re.MULTILINE)

From ee66abfecc1bce5b59748b31f73cd856ef739c39 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sun, 7 Feb 2010 19:19:00 +0800
Subject: [PATCH 227/320] Revert "PokerStarsTo Fpdb: Fix subtle bug in
 re_Action"

This reverts commit ac51876200743ea58f0af8c5d74cb7e01801b731.
---
 pyfpdb/PokerStarsToFpdb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
index fc63be91..c2a92881 100755
--- a/pyfpdb/PokerStarsToFpdb.py
+++ b/pyfpdb/PokerStarsToFpdb.py
@@ -103,7 +103,7 @@ class PokerStars(HandHistoryConverter):
             self.re_Action           = re.compile(r"""
                         ^%(PLYR)s:(?P<ATYPE>\sbets|\schecks|\sraises|\scalls|\sfolds|\sdiscards|\sstands\spat)
                         (\s(%(CUR)s)?(?P<BET>[.\d]+))?(\sto\s%(CUR)s(?P<BETTO>[.\d]+))?  # the number discarded goes in <BET>
-                        (\s(cards)?(\s\[(?P<DISCARDED>.+?)\])?)?$"""
+                        (\scards?(\s\[(?P<DISCARDED>.+?)\])?)?"""
                          %  subst, re.MULTILINE|re.VERBOSE)
             self.re_ShowdownAction   = re.compile(r"^%s: shows \[(?P<CARDS>.*)\]" %  player_re, re.MULTILINE)
             self.re_CollectPot       = re.compile(r"Seat (?P<SEAT>[0-9]+): %(PLYR)s (\(button\) |\(small blind\) |\(big blind\) |\(button\) \(small blind\) )?(collected|showed \[.*\] and won) \(%(CUR)s(?P<POT>[.\d]+)\)(, mucked| with.*|)" %  subst, re.MULTILINE)

From b996a884debdc0568e78ed9312ce14ad099a746c Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sun, 7 Feb 2010 19:21:32 +0800
Subject: [PATCH 228/320] PokerStarsTo? Fpdb: Fix subtle bug in re_Action

The bet action could become multiline greedy if there was a playername starting with 'card' in the next line.

"""
danny purse: bets $0.50
cardjunkie25: calls $0.50
"""

Would match "danny purse: bets $0.50\ncard", and the rest of that line would be ignored.

Added '$' to the end of the regex to make sure that it is limited to 1 line
---
 pyfpdb/PokerStarsToFpdb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
index c2a92881..90a8bfd0 100755
--- a/pyfpdb/PokerStarsToFpdb.py
+++ b/pyfpdb/PokerStarsToFpdb.py
@@ -103,7 +103,7 @@ class PokerStars(HandHistoryConverter):
             self.re_Action           = re.compile(r"""
                         ^%(PLYR)s:(?P<ATYPE>\sbets|\schecks|\sraises|\scalls|\sfolds|\sdiscards|\sstands\spat)
                         (\s(%(CUR)s)?(?P<BET>[.\d]+))?(\sto\s%(CUR)s(?P<BETTO>[.\d]+))?  # the number discarded goes in <BET>
-                        (\scards?(\s\[(?P<DISCARDED>.+?)\])?)?"""
+                        (\scards?(\s\[(?P<DISCARDED>.+?)\])?)?$"""
                          %  subst, re.MULTILINE|re.VERBOSE)
             self.re_ShowdownAction   = re.compile(r"^%s: shows \[(?P<CARDS>.*)\]" %  player_re, re.MULTILINE)
             self.re_CollectPot       = re.compile(r"Seat (?P<SEAT>[0-9]+): %(PLYR)s (\(button\) |\(small blind\) |\(big blind\) |\(button\) \(small blind\) )?(collected|showed \[.*\] and won) \(%(CUR)s(?P<POT>[.\d]+)\)(, mucked| with.*|)" %  subst, re.MULTILINE)

From 92013640554fd81a194b68130e0ff52cd75180f5 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sun, 7 Feb 2010 11:21:50 +0000
Subject: [PATCH 229/320] fix bugs in error reporting (not helpful if the error
 logging causes errors\!)

---
 pyfpdb/HUD_main.py | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pyfpdb/HUD_main.py b/pyfpdb/HUD_main.py
index 5bf69122..35864807 100755
--- a/pyfpdb/HUD_main.py
+++ b/pyfpdb/HUD_main.py
@@ -69,13 +69,13 @@ class HUD_main(object):
 #    This class mainly provides state for controlling the multiple HUDs.
 
     def __init__(self, db_name = 'fpdb'):
-        try:
-            print "\nHUD_main: starting ..."
-            self.db_name = db_name
-            self.config = Configuration.Config(file=options.config, dbname=db_name)
-            log = Configuration.get_logger("logging.conf", "hud", log_dir=self.config.dir_log)
-            log.info("HUD_main starting: using db name = %s" % (db_name))
+        print "\nHUD_main: starting ..."
+        self.db_name = db_name
+        self.config = Configuration.Config(file=options.config, dbname=db_name)
+        log = Configuration.get_logger("logging.conf", "hud", log_dir=self.config.dir_log)
+        log.info("HUD_main starting: using db name = %s" % (db_name))
 
+        try:
             if not options.errorsToConsole:
                  fileName = os.path.join(self.config.dir_log, 'HUD-errors.txt')
                  print "Note: error output is being diverted to:\n"+fileName \
@@ -100,8 +100,9 @@ class HUD_main(object):
             self.main_window.set_title("HUD Main Window")
             self.main_window.show_all()
         except:
-            log.debug("commit "+str(i)+" failed: info=" + str(sys.exc_info())
-                          + " value=" + str(sys.exc_value))
+            log.error( "*** Exception in HUD_main.init() *** " )
+            for e in traceback.format_tb(sys.exc_info()[2]):
+                log.error(e)
 
 
     def destroy(self, *args):             # call back for terminating the main eventloop
@@ -139,7 +140,8 @@ class HUD_main(object):
                 self.hud_dict[table_name].reposition_windows()
             except:
                 log.error( "*** Exception in HUD_main::idle_func() *** " )
-                log.error( traceback.format_stack() )
+                for e in traceback.format_tb(sys.exc_info()[2]):
+                    log.error(e)
             finally:
                 gtk.gdk.threads_leave()
                 return False

From e0777d6f0d110aabf4e3b34ee38f1ffe121dfaad Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Sun, 7 Feb 2010 12:36:41 -0500
Subject: [PATCH 230/320] Add windows icon file.

---
 gfx/fpdb_large_icon.ico | Bin 0 -> 4286 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 gfx/fpdb_large_icon.ico

diff --git a/gfx/fpdb_large_icon.ico b/gfx/fpdb_large_icon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..6be85f1ca732d527e4c63c29812295f762ec392c
GIT binary patch
literal 4286
zcmc&%2~bm67LC$^<=CUsMKd*J&1fr3Yqx9RD58j{xZ*ZUgBHq?AOZpbT0sz5TnL*A
z0TK~qvjIUC7j|qw2p|}?ga9HU%Dzaz011-+?z|r>X{P{-vhA9mI=MIZzIV=j+y6fl
z$}Id@vV=l@Q|>OLP}C?C%5n@GqHMz;<NvQ~^>VTr3T4d?YRWrwH0H|dFfraOcmFW^
zgNCY%dy(3_ul2OQOFr?F)-&pf-7DmRTQ{$kyI<U@FZqj{bM8)^Wl@e++u>&LX}A;V
z$-nIFxK^J0BkVsGEs)dB*5A4`+`)1?L|nH)1sS2JydV}r{OM8OtA9IR-snqOHPt^U
z=yq)R&d;8vH^IJo3LZZUM%>c7kQC!R=xB4$SWR{QY(>K_<jkL^tYFgBUgBtDt}6};
zu!Ow(*PyB_8SW=s8L_7Bv645kGTS3}zo^yOxa5eX$>uSp9}RNS0#SAOJ;+K86kD0?
za{pW*0GLtNE&p1)+4QH4!@<7hkd@+($Z_YSU44I=w$Gm=m?_W4V)8zTiHU#B%gbNf
z(o(6;;gqOnWo7@}$;s)f`1ts5-wNL?+pe=x%fxVf=haK5kde$lRh+wc+*i>VyCZ?0
zqphT*^l=%=Jv}{lM4~}XR#qeD?b}{%dwY9MbaeCvk!X|^9vWP1YOLKE;B5jA?_NP%
zP6A}41c9f^F@~H(dCpgI_mfsbLt|22U0r>}(9mEnk2gjfIRcW5jPb#Vi4jR|-s7Y7
z_59k?wEe*FJcjq!MVWS1+I6^c!JM3P6_RY>g5S=?B=U~}78VwYUj_zyO$-j~dZ52+
zTeH?Ct#*BV{Ryp2+llX&pOS9a5cxbI;YCUOFSnd+Ec6Aw9!DYVjwgCnk^s36nBePa
z5v8U&Z)T!cksPypoed2Q_n4ZVczyiXNvZL_*%Owg$?t#7EhpZzzJ!vZLfE%+=PS*%
znxkvhtQ|8pGLCd}KH7FK<~&qB`2~t|BjH|r2t0jS;VK`9#<IW3-6?HmW~L%;X-V^;
zJJ<pBcsy8|3Z<94`X(CqZxEmfK;z>`{O%pZ1O-JGrKH5rZEc0CR<4AzXI<byN`$l|
z|F$$SmNC}V)r~qjI-C`xpK#>!{f(;XEE`+f3qGEn1fN?0SN+?NhuaWQS@sfZj{_l=
zAVMMmkx&RJY&Ls<&kt_q^Sg=*3ShmaCeR(7UR*p+&A|KdEQiCP$Hm3{^Aoa@Qg(KB
z`>tHNG}KU6hnE3B*gptyw*>(2M*$`#uzfGHBOml{bX8Y})K^t?lWm_oeheDw%S86}
z*CLyndt%$$U&nE|Rof?tOcOZg=Jt*2*|U#gBO~EuQ`7j%h6Z5^pWn|ddD8QO$LnsY
zsp)DYQCr(lU0&W<nwG}G`k_TxS%PLBZ=h8m=y$NO7Oh&P4@{;=D3OSuz5UJkY2+q_
z9i5%E0~ri)Er;_;)Y-{>D-b-w^P4hIU!T~=<K4lC>8-1~)x+c6?5?e44>vYm7d1Cu
z@2RW1N#+Ixg4m}yIfdGrwn#NKlX&Uref52PZ8Oq$cXwCv^z`&%1_lzvnVB!kva_p7
z?%(GWr>8$DN=+>&NJ+_moSdASlaP>|6(67ZC^j~ur>2G_tgjC*N={C~zaM1B#oaG2
zD0pr~rAbz-FcWxqNN!YCKBZ3@=oA58217Y0Fz_L{hU7Z)xLl$*Kc6Vd%R_~^x$tXF
z4m`=vhrym6*&ZNmL1JP89(!Cvb#))v2a$UNUxk=s<Hl{m?Ch3`uC6!drjVNy3JeOG
z8x|T``K+vrq(BUBZ`inYEv#R?8no7}1MT(ek(HSlYHex)7$29_QIM3B+*4bd&`?#?
z2T~~@3_u8;HwZvqf9G&jRV5=QC-=umVp9aJUAs1y6&_ykth5w>AP}h$5gH16ckF;2
zIy%VK(h_9aWO4ZX3442?Bt1RrZA(l3i-v|_S<zC0%tBsvIq2$ceIb`AEG(3})7p@b
z5M@06)Y8I2Xu@ajZfq=mPbo#7=gyJ$If%M(1C<pPqRjMkBpMtf0lbQe7o$R9*XviW
z@Z=-11P}-Yz|JNW85r!YnO1CygolTRQb0h!nbf2t@OE=UdfM8^`0!z5YHW-QcI`se
zR4O_}r4lqVGvX<(Yh-vB8hO0lvEkwV&h~bEV*qGv?T4Ts5tttjCJYS^+#+R`E?qi>
z+SH*CCUac`iv?5@6WFPv1AF!K;K1(P=$N4)VR7OFVQp!NFo=?(BDwy67(a-+yE>&3
z@d!jky#v=X{fKIDlGwk0uin%u(?|US0v6tkh)8sGa)Lux_df>@qT@zJNTyArA$wa}
z!pYtqb$4{Y*vJSp^7%tpf4IN5OIlka1Yh6x$lm%k&}h`E=~brA;OUbkZbn9KWrc<H
zo-#KF6C)$AFfk$Uyd!%X8^QtW-%CtHVyrD08-u3$`gh{d(UF0^E~1n(1TH@pfxW%c
z#GylnSCVA2X3d&fY>McjMT->C+fh+=VId(S4mLJmWnn?sT3Hc4)9HxCWTJlZ{3C?M
z#bSKU8pd!P;<i_<M1FP&oOe4fwz4`&BZ-WRj1+t`bzEH)k7^38;WRruy!*137q~h*
z!!0%&4d63}FWE+yV0~_R`Dh)ND~XMY0>+ig9S#n5CrK>_2ZxzTPHK1Y;zdOauf>)d
zY<5f-lR2K0kN_NfHu2t<A^XuIAouF^prBEAH@9d9I(?I(<L`7_TwD|ketv#`4rj4e
z`TO}<hccPbY!)jwJS;3XC?FvE!i5VqF0QUWy1Bc5E$`st<0E%}msL?wQM`wdM9$96
zvx7rI=HUC33cgpW;JW6}>Gc2k@ANrqE-#W?SbWuBFff$xGOJ)L0FW*QkYEhyLYuc2
w20kf1Af+h5kPHi;4cnrR;EnwcP{CFO=SVD&p^dT__tOOl#S3%52Q_T|3&nkXv;Y7A

literal 0
HcmV?d00001


From 94ab5849fa165b39d110beb6b7b0d2bb592deacd Mon Sep 17 00:00:00 2001
From: Mika Bostrom <bostik@odin.bostik.iki.fi>
Date: Sun, 7 Feb 2010 14:23:29 +0200
Subject: [PATCH 231/320] Modify display of 'n' in HUD for large numbers

When sample size grows to larger than 1000, use "X.Yk" notation to
show the approximate value.
---
 pyfpdb/Stats.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/Stats.py b/pyfpdb/Stats.py
index 18913eed..ab92c99f 100755
--- a/pyfpdb/Stats.py
+++ b/pyfpdb/Stats.py
@@ -245,8 +245,20 @@ def saw_f(stat_dict, player):
 def n(stat_dict, player):
     """    Number of hands played."""
     try:
+        # If sample is large enough, use X.Yk notation instead
+        _n = stat_dict[player]['n']
+        fmt = '%d' % _n
+        if _n >= 1000:
+            k = _n / 1000
+            c = _n % 1000
+            _c = float(c) / 100.0
+            d = int(round(_c))
+            if d == 10:
+                k += 1
+                d = 0
+            fmt = '%d.%dk' % (k, d)
         return (stat_dict[player]['n'], 
-                '%d'        % (stat_dict[player]['n']), 
+                '%s'        % fmt,
                 'n=%d'      % (stat_dict[player]['n']), 
                 'n=%d'      % (stat_dict[player]['n']), 
                 '(%d)'      % (stat_dict[player]['n']),

From 7294d2e5c0be4d111f2d11fc309b1646f552d15a Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Mon, 8 Feb 2010 22:43:15 +0000
Subject: [PATCH 232/320] make sure log dir is created, refine py2exe operation

---
 pyfpdb/Configuration.py | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py
index ec4c621e..45b767eb 100755
--- a/pyfpdb/Configuration.py
+++ b/pyfpdb/Configuration.py
@@ -65,7 +65,7 @@ def get_exec_path():
 def get_config(file_name, fallback = True):
     """Looks in cwd and in self.default_config_path for a config file."""
     exec_dir = get_exec_path()
-    if file_name == 'logging.conf':
+    if file_name == 'logging.conf' and sys.argv[0] != 'fpdb.exe':
         config_path = os.path.join(exec_dir, 'pyfpdb', file_name)
     else:
         config_path = os.path.join(exec_dir, file_name)
@@ -105,26 +105,31 @@ def get_config(file_name, fallback = True):
         sys.exit()
     return (file_name,True)
 
-def get_logger(file_name, config = "config", fallback = False, log_dir=None):
+def get_logger(file_name, module = "config", fallback = False, log_dir=None):
     (conf_file,copied) = get_config(file_name, fallback = fallback)
+
+    if log_dir is None:
+        log_dir = os.path.join(get_exec_path(), 'log')
+    #print "\nget_logger: checking log_dir:", log_dir
+    check_dir(log_dir)
+    file = os.path.join(log_dir, 'logging.out')
+
     if conf_file:
         try:
-            if log_dir is None:
-                log_dir = os.path.join(get_exec_path(), 'log')
-            check_dir(log_dir)
-            file = os.path.join(log_dir, 'logging.out')
             file = file.replace('\\', '\\\\')  # replace each \ with \\
 #            print "    ="+file+" "+ str(type(file))+" len="+str(len(file))+"\n"
             logging.config.fileConfig(conf_file, {"logFile":file})
-            log = logging.getLogger(config)
-            log.debug("%s logger initialised" % config)
+            log = logging.getLogger(module)
+            log.debug("%s logger initialised" % module)
             return log
         except:
             pass
 
-    log = logging.basicConfig()
+    log = logging.basicConfig(filename=file, level=logging.INFO)
     log = logging.getLogger()
-    log.debug("config logger initialised")
+    # but it looks like default is no output :-(  maybe because all the calls name a module?
+    log.debug("Default logger initialised for "+file)
+    print "Default logger intialised for "+file
     return log
 
 def check_dir(path, create = True):

From 333ae224d456d7fcbb6602b5ef2cd1e746238316 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Mon, 8 Feb 2010 23:02:08 +0000
Subject: [PATCH 233/320] add some comments

---
 pyfpdb/py2exe_setup.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pyfpdb/py2exe_setup.py b/pyfpdb/py2exe_setup.py
index 28f13cc1..191fd907 100644
--- a/pyfpdb/py2exe_setup.py
+++ b/pyfpdb/py2exe_setup.py
@@ -48,6 +48,23 @@ Py2exe script for fpdb.
 #- You can (should) then prune the etc/, lib/ and share/ folders to 
 #  remove components we don't need. 
 
+# sqlcoder notes: this worked for me with the following notes:
+#- I used the following versions:
+#  python 2.5.4
+#  gtk+ 2.14.7
+#  pycairo 1.4.12-2
+#  pygobject 2.14.2-2
+#  pygtk 2.12.1-3
+#  matplotlib 0.98.3
+#  numpy 1.4.0
+#  py2exe-0.6.9 for python 2.5
+#  
+#- I also copied these dlls manually from <gtk>/bin to /dist :
+#  
+#  libgobject-2.0-0.dll
+#  libgdk-win32-2.0-0.dll
+
+
 import os
 import sys
 from distutils.core import setup

From 6df8bddc620a338d548852097477a8e200ffa122 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Mon, 8 Feb 2010 23:38:18 +0000
Subject: [PATCH 234/320] undo stupid param name change (need to change all the
 calls as well if doing it)

---
 pyfpdb/Configuration.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py
index 45b767eb..143fb72b 100755
--- a/pyfpdb/Configuration.py
+++ b/pyfpdb/Configuration.py
@@ -105,7 +105,7 @@ def get_config(file_name, fallback = True):
         sys.exit()
     return (file_name,True)
 
-def get_logger(file_name, module = "config", fallback = False, log_dir=None):
+def get_logger(file_name, config = "config", fallback = False, log_dir=None):
     (conf_file,copied) = get_config(file_name, fallback = fallback)
 
     if log_dir is None:
@@ -119,8 +119,8 @@ def get_logger(file_name, module = "config", fallback = False, log_dir=None):
             file = file.replace('\\', '\\\\')  # replace each \ with \\
 #            print "    ="+file+" "+ str(type(file))+" len="+str(len(file))+"\n"
             logging.config.fileConfig(conf_file, {"logFile":file})
-            log = logging.getLogger(module)
-            log.debug("%s logger initialised" % module)
+            log = logging.getLogger(config)
+            log.debug("%s logger initialised" % config)
             return log
         except:
             pass

From d3cb41bed1e6a33ced7e4f18fc25fb9dd0fe5636 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Tue, 9 Feb 2010 09:14:36 +0000
Subject: [PATCH 235/320] do rename to pyfpdb, user still needs to move it into
 fpdb-0.12... dir manually

---
 pyfpdb/py2exe_setup.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pyfpdb/py2exe_setup.py b/pyfpdb/py2exe_setup.py
index 191fd907..cc3d5435 100644
--- a/pyfpdb/py2exe_setup.py
+++ b/pyfpdb/py2exe_setup.py
@@ -105,7 +105,7 @@ test_and_remove('gfx')
 
 
 today = date.today().strftime('%Y%m%d')
-print "\n" + r"Output will be created in \dist\ and \fpdb_XXX_"+today+'\\'
+print "\n" + r"Output will be created in \pyfpdb\ and \fpdb_XXX_"+today+'\\'
 print "Enter value for XXX (any length): ",     # the comma means no newline
 xxx = sys.stdin.readline().rstrip()
 dist_dir = r'..\fpdb-' + xxx + '-' + today + '-exe'
@@ -126,7 +126,7 @@ setup(
                       'packages'    : ['encodings', 'matplotlib'],
                       'includes'    : ['cairo', 'pango', 'pangocairo', 'atk', 'gobject'
                                       ,'PokerStarsToFpdb', 'matplotlib.numerix.random_array'],
-                      'excludes'    : ['_gtkagg', '_tkagg', '_agg2', 'cocoaagg', 'fltkagg'],
+                      'excludes'    : ['_tkagg', '_agg2', 'cocoaagg', 'fltkagg'],   # surely we need this? '_gtkagg'
                       'dll_excludes': ['libglade-2.0-0.dll', 'libgdk-win32-2.0-0.dll'
                                       ,'libgobject-2.0-0.dll'],
                   }
@@ -142,7 +142,9 @@ setup(
 )
 
 
-print '\n' + r'If py2exe was successful move the \dist\ directory '
-print 'into \\'+dist_dir+'\\ and rename it as \\pyfpdb\\'
-print "Don't forget to add the \\etc \\lib and \\share dirs from your gtk dir\n"
+os.rename('dist', 'pyfpdb')
+
+print '\n' + r'If py2exe was successful move the \pyfpdb\ directory '
+print 'into \\'+dist_dir
+print "Then add the \\etc \\lib and \\share dirs from your gtk dir to \\pyfpdb\\\n"
 

From 4e89b1b0009e0b5d5151c6a4fbae8d934e7024f9 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Tue, 9 Feb 2010 22:54:04 +0000
Subject: [PATCH 236/320] more py2exe refinements

---
 pyfpdb/py2exe_setup.py | 38 +++++++++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/pyfpdb/py2exe_setup.py b/pyfpdb/py2exe_setup.py
index cc3d5435..2e9c894d 100644
--- a/pyfpdb/py2exe_setup.py
+++ b/pyfpdb/py2exe_setup.py
@@ -23,11 +23,11 @@ Py2exe script for fpdb.
 ########################################################################
 
 #TODO:   
-#        include the lib needed to handle png files in mucked
 #        get rid of all the uneeded libraries (e.g., pyQT)
 #        think about an installer
 
-# done: change GuiAutoImport so that it knows to start HUD_main.exe, when appropriate
+# done:  change GuiAutoImport so that it knows to start HUD_main.exe, when appropriate
+#        include the lib needed to handle png files in mucked
 
 #HOW TO USE this script:
 #
@@ -39,11 +39,13 @@ Py2exe script for fpdb.
 #  MSVCP90.dll. These are somewhere in your windows install, so you 
 #  can just copy them to your working folder. (or just assume other
 #  person will have them? any copyright issues with including them?)
-#- If it works, you'll have 3 new folders, build and dist and gfx. Build is 
-#  working space and should be deleted. Dist and gfx contain the files to be
-#  distributed. 
+#- [ If it works, you'll have 3 new folders, build and dist and gfx. Build is 
+#    working space and should be deleted. Dist and gfx contain the files to be
+#    distributed. ]
+#  If it works, you'll have a new dir  fpdb-XXX-YYYYMMDD-exe  which should
+#  contain 2 dirs; gfx and pyfpdb and run_fpdb.bat
 #- Last, you must copy the etc/, lib/ and share/ folders from your
-#  gtk/bin/ (just /gtk/?) folder to the dist folder. (the whole folders, 
+#  gtk/bin/ (just /gtk/?) folder to the pyfpdb folder. (the whole folders, 
 #  not just the contents) 
 #- You can (should) then prune the etc/, lib/ and share/ folders to 
 #  remove components we don't need. 
@@ -74,6 +76,14 @@ import matplotlib
 from datetime import date
 
 
+origIsSystemDLL = py2exe.build_exe.isSystemDLL
+def isSystemDLL(pathname):
+        if os.path.basename(pathname).lower() in ("msvcp71.dll", "dwmapi.dll"):
+                return 0
+        return origIsSystemDLL(pathname)
+py2exe.build_exe.isSystemDLL = isSystemDLL
+
+
 def remove_tree(top):
     # Delete everything reachable from the directory named in 'top',
     # assuming there are no symbolic links.
@@ -108,9 +118,11 @@ today = date.today().strftime('%Y%m%d')
 print "\n" + r"Output will be created in \pyfpdb\ and \fpdb_XXX_"+today+'\\'
 print "Enter value for XXX (any length): ",     # the comma means no newline
 xxx = sys.stdin.readline().rstrip()
+dist_dirname = r'fpdb-' + xxx + '-' + today + '-exe'
 dist_dir = r'..\fpdb-' + xxx + '-' + today + '-exe'
 print
 
+test_and_remove(dist_dir)
 
 setup(
     name        = 'fpdb',
@@ -144,7 +156,15 @@ setup(
 
 os.rename('dist', 'pyfpdb')
 
-print '\n' + r'If py2exe was successful move the \pyfpdb\ directory '
-print 'into \\'+dist_dir
-print "Then add the \\etc \\lib and \\share dirs from your gtk dir to \\pyfpdb\\\n"
+print '\n' + 'If py2exe was successful add the \\etc \\lib and \\share dirs '
+print 'from your gtk dir to \\%s\\pyfpdb\\\n' % dist_dirname
+print 'Also copy libgobject-2.0-0.dll and libgdk-win32-2.0-0.dll from <gtk_dir>\\bin'
+print 'into there'
+
+dest = os.path.join(dist_dirname, 'pyfpdb')
+#print "try renaming pyfpdb to", dest
+dest = dest.replace('\\', '\\\\')
+#print "dest is now", dest
+os.rename( 'pyfpdb', dest )
+
 

From 965adc7b2760747368ae05236ad07fcc9f2e56ef Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Tue, 9 Feb 2010 18:51:37 -0500
Subject: [PATCH 237/320] Add EXEC_PATH to constants.

---
 pyfpdb/Configuration.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py
index ec4c621e..c3c93293 100755
--- a/pyfpdb/Configuration.py
+++ b/pyfpdb/Configuration.py
@@ -166,6 +166,10 @@ if LOCALE_ENCODING == "US-ASCII":
 
 
 # needs LOCALE_ENCODING (above), imported for sqlite setup in Config class below
+
+FROZEN = hasattr(sys, "frozen")
+EXEC_PATH = get_exec_path()
+
 import Charset
 
 
@@ -613,7 +617,11 @@ class Config:
     def save(self, file = None):
         if file is None:
             file = self.file
-        shutil.move(file, file+".backup")
+            try:
+                shutil.move(file, file+".backup")
+            except:
+                pass
+
         with open(file, 'w') as f:
             self.doc.writexml(f)
 
@@ -1030,3 +1038,9 @@ if __name__== "__main__":
             PrettyPrint(site_node, stream=sys.stdout, encoding="utf-8")
     except:
         print "xml.dom.ext needs PyXML to be installed!"
+
+    print "FROZEN =", FROZEN
+    print "EXEC_PATH =", EXEC_PATH
+
+    print "press enter to end"
+    sys.stdin.readline()

From b55c6023c74aa0da4b5f998c3a547cb3afae910e Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Wed, 10 Feb 2010 19:38:44 +0000
Subject: [PATCH 238/320] add info to log about major errors

---
 pyfpdb/HUD_main.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pyfpdb/HUD_main.py b/pyfpdb/HUD_main.py
index 35864807..7cc72886 100755
--- a/pyfpdb/HUD_main.py
+++ b/pyfpdb/HUD_main.py
@@ -80,6 +80,8 @@ class HUD_main(object):
                  fileName = os.path.join(self.config.dir_log, 'HUD-errors.txt')
                  print "Note: error output is being diverted to:\n"+fileName \
                        + "\nAny major error will be reported there _only_.\n" 
+                 log.info("Note: error output is being diverted to:"+fileName)
+                 log.info("Any major error will be reported there _only_.")
                  errorFile = open(fileName, 'w', 0)
                  sys.stderr = errorFile
 

From a93562c22959f69e8c58f567909420ab1436c725 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Wed, 10 Feb 2010 23:33:50 +0000
Subject: [PATCH 239/320] make fpdb and hud write separate log files, refine
 py2exe some more

---
 pyfpdb/Configuration.py  |  9 ++++++---
 pyfpdb/GuiGraphViewer.py |  2 +-
 pyfpdb/HUD_main.py       |  3 ++-
 pyfpdb/fpdb.py           |  2 +-
 pyfpdb/py2exe_setup.py   | 10 ++++++++--
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py
index 7b026f0c..6c4eecd2 100755
--- a/pyfpdb/Configuration.py
+++ b/pyfpdb/Configuration.py
@@ -105,14 +105,17 @@ def get_config(file_name, fallback = True):
         sys.exit()
     return (file_name,True)
 
-def get_logger(file_name, config = "config", fallback = False, log_dir=None):
+def get_logger(file_name, config = "config", fallback = False, log_dir=None, log_file=None):
     (conf_file,copied) = get_config(file_name, fallback = fallback)
 
     if log_dir is None:
         log_dir = os.path.join(get_exec_path(), 'log')
     #print "\nget_logger: checking log_dir:", log_dir
     check_dir(log_dir)
-    file = os.path.join(log_dir, 'logging.out')
+    if log_file is None:
+        file = os.path.join(log_dir, 'fpdb-log.txt')
+    else:
+        file = os.path.join(log_dir, log_file)
 
     if conf_file:
         try:
@@ -469,7 +472,7 @@ class Config:
         self.dir_config = os.path.dirname(self.file)
         self.dir_log = os.path.join(self.dir_config, 'log')
         self.dir_database = os.path.join(self.dir_config, 'database')
-        self.log_file = os.path.join(self.dir_log, 'logging.out')
+        self.log_file = os.path.join(self.dir_log, 'fpdb-log.txt')
         log = get_logger("logging.conf", "config", log_dir=self.dir_log)
 
 #    Parse even if there was no real config file found and we are using the example
diff --git a/pyfpdb/GuiGraphViewer.py b/pyfpdb/GuiGraphViewer.py
index dcfa979c..eb1793d3 100644
--- a/pyfpdb/GuiGraphViewer.py
+++ b/pyfpdb/GuiGraphViewer.py
@@ -27,7 +27,7 @@ from time import *
 
 try:
     import matplotlib
-    matplotlib.use('GTK')
+    matplotlib.use('GTKCairo')
     from matplotlib.figure import Figure
     from matplotlib.backends.backend_gtk import FigureCanvasGTK as FigureCanvas
     from matplotlib.backends.backend_gtkagg import NavigationToolbar2GTKAgg as NavigationToolbar
diff --git a/pyfpdb/HUD_main.py b/pyfpdb/HUD_main.py
index 5a3ee2dd..03f6c565 100755
--- a/pyfpdb/HUD_main.py
+++ b/pyfpdb/HUD_main.py
@@ -72,7 +72,8 @@ class HUD_main(object):
         print "\nHUD_main: starting ..."
         self.db_name = db_name
         self.config = Configuration.Config(file=options.config, dbname=db_name)
-        log = Configuration.get_logger("logging.conf", "hud", log_dir=self.config.dir_log)
+        log = Configuration.get_logger("logging.conf", "hud", log_dir=self.config.dir_log, log_file='HUD-log.txt')
+        print "Logfile is " + os.path.join(self.config.dir_log, 'HUD-log.txt')
         log.info("HUD_main starting: using db name = %s" % (db_name))
 
         try:
diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py
index 43121804..55b19a3b 100755
--- a/pyfpdb/fpdb.py
+++ b/pyfpdb/fpdb.py
@@ -689,7 +689,7 @@ class fpdb:
         """Loads profile from the provided path name."""
         self.config = Configuration.Config(file=options.config, dbname=options.dbname)
         log = Configuration.get_logger("logging.conf", "fpdb", log_dir=self.config.dir_log)
-        print "Logfile is " + os.path.join(self.config.dir_log, 'logging.out') + "\n"
+        print "Logfile is " + os.path.join(self.config.dir_log, self.config.log_file) + "\n"
         if self.config.example_copy:
             self.info_box( "Config file"
                          , "has been created at:\n%s.\n" % self.config.file
diff --git a/pyfpdb/py2exe_setup.py b/pyfpdb/py2exe_setup.py
index 32d6d19b..9975317f 100644
--- a/pyfpdb/py2exe_setup.py
+++ b/pyfpdb/py2exe_setup.py
@@ -53,7 +53,7 @@ Py2exe script for fpdb.
 # sqlcoder notes: this worked for me with the following notes:
 #- I used the following versions:
 #  python 2.5.4
-#  gtk+ 2.14.7
+#  gtk+ 2.14.7   (gtk_2.14.7-20090119)
 #  pycairo 1.4.12-2
 #  pygobject 2.14.2-2
 #  pygtk 2.12.1-3
@@ -137,7 +137,13 @@ setup(
     options = {'py2exe': {
                       'packages'    : ['encodings', 'matplotlib'],
                       'includes'    : ['cairo', 'pango', 'pangocairo', 'atk', 'gobject'
-                                      ,'PokerStarsToFpdb', 'matplotlib.numerix.random_array'],
+                                      ,'matplotlib.numerix.random_array'
+                                      ,'AbsoluteToFpdb',      'BetfairToFpdb'
+                                      ,'CarbonToFpdb',        'EverleafToFpdb'
+                                      ,'FulltiltToFpdb',      'OnGameToFpdb'
+                                      ,'PartyPokerToFpdb',    'PokerStarsToFpdb'
+                                      ,'UltimateBetToFpdb',   'Win2dayToFpdb'
+                                      ],
                       'excludes'    : ['_tkagg', '_agg2', 'cocoaagg', 'fltkagg'],   # surely we need this? '_gtkagg'
                       'dll_excludes': ['libglade-2.0-0.dll', 'libgdk-win32-2.0-0.dll'
                                       ,'libgobject-2.0-0.dll'],

From 906c9e0bc9b99b97e443eb529bd78b1af4c79140 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Fri, 12 Feb 2010 08:18:42 +0000
Subject: [PATCH 240/320] tighten up logging in hud

---
 pyfpdb/Configuration.py |  2 +-
 pyfpdb/HUD_main.py      | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py
index 6c4eecd2..f7694e90 100755
--- a/pyfpdb/Configuration.py
+++ b/pyfpdb/Configuration.py
@@ -65,7 +65,7 @@ def get_exec_path():
 def get_config(file_name, fallback = True):
     """Looks in cwd and in self.default_config_path for a config file."""
     exec_dir = get_exec_path()
-    if file_name == 'logging.conf' and sys.argv[0] != 'fpdb.exe':
+    if file_name == 'logging.conf' and not hasattr(sys, "frozen"):
         config_path = os.path.join(exec_dir, 'pyfpdb', file_name)
     else:
         config_path = os.path.join(exec_dir, file_name)
diff --git a/pyfpdb/HUD_main.py b/pyfpdb/HUD_main.py
index 03f6c565..e26fd611 100755
--- a/pyfpdb/HUD_main.py
+++ b/pyfpdb/HUD_main.py
@@ -60,8 +60,9 @@ elif os.name == 'nt':
 import Hud
 
 
-# logger is set up in __init__, create temp logger here
-log = Configuration.get_logger("logging.conf", config = 'hud')
+# get config and set up logger
+c = Configuration.Config(file=options.config)
+log = Configuration.get_logger("logging.conf", "hud", log_dir=c.dir_log, log_file='HUD-log.txt')
 
 
 class HUD_main(object):
@@ -71,8 +72,7 @@ class HUD_main(object):
     def __init__(self, db_name = 'fpdb'):
         print "\nHUD_main: starting ..."
         self.db_name = db_name
-        self.config = Configuration.Config(file=options.config, dbname=db_name)
-        log = Configuration.get_logger("logging.conf", "hud", log_dir=self.config.dir_log, log_file='HUD-log.txt')
+        self.config = Configuration.Config(file=options.config, dbname = db_name)
         print "Logfile is " + os.path.join(self.config.dir_log, 'HUD-log.txt')
         log.info("HUD_main starting: using db name = %s" % (db_name))
 
@@ -85,6 +85,7 @@ class HUD_main(object):
                  log.info("Any major error will be reported there _only_.")
                  errorFile = open(fileName, 'w', 0)
                  sys.stderr = errorFile
+                 sys.stderr.write("HUD_main: starting ...\n")
 
             self.hud_dict = {}
             self.hud_params = self.config.get_hud_ui_parameters()
@@ -142,7 +143,7 @@ class HUD_main(object):
                 self.hud_dict[table_name].update(new_hand_id, self.config)
                 self.hud_dict[table_name].reposition_windows()
             except:
-                log.error( "*** Exception in HUD_main::idle_func() *** " )
+                log.error( "*** Exception in HUD_main::idle_func() *** " + str(sys.exc_info()) )
                 for e in traceback.format_tb(sys.exc_info()[2]):
                     log.error(e)
             finally:

From 65a0c367810eacd0eb01393c920766f6640160e1 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sat, 13 Feb 2010 17:26:47 +0000
Subject: [PATCH 241/320] use original config instance, improve hero_id
 handling (think this fixes auto-import empty db problem?)

---
 pyfpdb/HUD_main.py | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/pyfpdb/HUD_main.py b/pyfpdb/HUD_main.py
index e26fd611..2ea223f4 100755
--- a/pyfpdb/HUD_main.py
+++ b/pyfpdb/HUD_main.py
@@ -72,7 +72,7 @@ class HUD_main(object):
     def __init__(self, db_name = 'fpdb'):
         print "\nHUD_main: starting ..."
         self.db_name = db_name
-        self.config = Configuration.Config(file=options.config, dbname = db_name)
+        self.config = c
         print "Logfile is " + os.path.join(self.config.dir_log, 'HUD-log.txt')
         log.info("HUD_main starting: using db name = %s" % (db_name))
 
@@ -207,12 +207,7 @@ class HUD_main(object):
 
 #       get hero's screen names and player ids
         self.hero, self.hero_ids = {}, {}
-        for site in self.config.get_supported_sites():
-            result = self.db_connection.get_site_id(site)
-            if result:
-                site_id = result[0][0]
-                self.hero[site_id] = self.config.supported_sites[site].screen_name
-                self.hero_ids[site_id] = self.db_connection.get_player_id(self.config, site, self.hero[site_id])
+        found = False
 
         while 1: # wait for a new hand number on stdin
             new_hand_id = sys.stdin.readline()
@@ -224,6 +219,18 @@ class HUD_main(object):
                 self.destroy()
                 break # this thread is not always killed immediately with gtk.main_quit()
 
+            if not found:
+                for site in self.config.get_supported_sites():
+                    result = self.db_connection.get_site_id(site)
+                    if result:
+                        site_id = result[0][0]
+                        self.hero[site_id] = self.config.supported_sites[site].screen_name
+                        self.hero_ids[site_id] = self.db_connection.get_player_id(self.config, site, self.hero[site_id])
+                        if self.hero_ids[site_id] is not None:
+                            found = True
+                        else:
+                            self.hero_ids[site_id] = -1
+
 #        get basic info about the new hand from the db
 #        if there is a db error, complain, skip hand, and proceed
             log.info("HUD_main.read_stdin: hand processing starting ...")

From 0db3cecf650c65ad4cd57a421a5cc91e83c18f89 Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Sat, 13 Feb 2010 20:41:01 +0100
Subject: [PATCH 242/320] Action Reg_ex updated

Due to the added end of line marker to eliminate playersnames
that start with card, all-in actions are no longer supported.
---
 pyfpdb/PokerStarsToFpdb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
index 90a8bfd0..39eb0892 100755
--- a/pyfpdb/PokerStarsToFpdb.py
+++ b/pyfpdb/PokerStarsToFpdb.py
@@ -102,7 +102,7 @@ class PokerStars(HandHistoryConverter):
             self.re_HeroCards        = re.compile(r"^Dealt to %(PLYR)s(?: \[(?P<OLDCARDS>.+?)\])?( \[(?P<NEWCARDS>.+?)\])" % subst, re.MULTILINE)
             self.re_Action           = re.compile(r"""
                         ^%(PLYR)s:(?P<ATYPE>\sbets|\schecks|\sraises|\scalls|\sfolds|\sdiscards|\sstands\spat)
-                        (\s(%(CUR)s)?(?P<BET>[.\d]+))?(\sto\s%(CUR)s(?P<BETTO>[.\d]+))?  # the number discarded goes in <BET>
+                        (\s(%(CUR)s)?(?P<BET>[.\d]+))?(\sto\s%(CUR)s(?P<BETTO>[.\d]+))?(\sand\sis\sall-in)?  # the number discarded goes in <BET>
                         (\scards?(\s\[(?P<DISCARDED>.+?)\])?)?$"""
                          %  subst, re.MULTILINE|re.VERBOSE)
             self.re_ShowdownAction   = re.compile(r"^%s: shows \[(?P<CARDS>.*)\]" %  player_re, re.MULTILINE)

From 466988ea4acc1736358bcdca234ee56c5478b111 Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Sat, 13 Feb 2010 22:44:00 +0100
Subject: [PATCH 243/320] Tournement support for PartyPoker

---
 pyfpdb/PartyPokerToFpdb.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/PartyPokerToFpdb.py b/pyfpdb/PartyPokerToFpdb.py
index 1d1d0e4d..5fdeae0c 100755
--- a/pyfpdb/PartyPokerToFpdb.py
+++ b/pyfpdb/PartyPokerToFpdb.py
@@ -465,8 +465,9 @@ class PartyPoker(HandHistoryConverter):
     def getTableTitleRe(type, table_name=None, tournament = None, table_number=None):
         "Returns string to search in windows titles"
         if type=="tour":
-            print 'party', 'getTableTitleRe', "%s.+Table\s#%s" % (table_name, table_number)
-            return "%s.+Table\s#%s" % (table_name, table_number)
+            TableName = table_name.split(" ")
+            print 'party', 'getTableTitleRe', "%s.+Table\s#%s" % (TableName[0], table_number)
+            return "%s.+Table\s#%s" % (TableName[0], table_number)
         else:
             print 'party', 'getTableTitleRe', table_number
             return table_name

From 51e88dbaddf9048a23057fe00993083eac739cbe Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Sat, 13 Feb 2010 18:23:59 -0500
Subject: [PATCH 244/320] Don't make empty files for Stars format HH.

---
 pyfpdb/HandHistoryConverter.py | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index 5fa28608..4bf7564d 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -92,24 +92,7 @@ follow :  whether to tail -f the input"""
             self.out_fh = sys.stdout
         else:
             # TODO: out_path should be sanity checked.
-            out_dir = os.path.dirname(self.out_path)
-            if not os.path.isdir(out_dir) and out_dir != '':
-                try:
-                    os.makedirs(out_dir)
-                except: # we get a WindowsError here in Windows.. pretty sure something else for Linux :D
-                    log.error("Unable to create output directory %s for HHC!" % out_dir)
-                    print "*** ERROR: UNABLE TO CREATE OUTPUT DIRECTORY", out_dir
-                    # TODO: pop up a box to allow person to choose output directory?
-                    # TODO: shouldn't that be done when we startup, actually?
-                else:
-                    log.info("Created directory '%s'" % out_dir)
-            try:
-                self.out_fh = codecs.open(self.out_path, 'w', 'utf8')
-            except:
-                log.error("out_path %s couldn't be opened" % (self.out_path))
-            else:
-                log.debug("out_path %s opened as %s" % (self.out_path, self.out_fh))
-
+            self.out_fh = sys.stdout
         self.follow = follow
         self.compiledPlayers   = set()
         self.maxseats  = 10

From 6814538594bb56faaf7d0234fae4ea426d5e90a0 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sun, 14 Feb 2010 12:50:44 +0000
Subject: [PATCH 245/320] a wtsd fix, but figures looks further out if anything
 now. see riterman in FLHE_6max_sawflop_wrong.txt for an example where
 street1seen is still not set

---
 pyfpdb/DerivedStats.py                        |    9 +-
 .../cash/Stars/Flop/FLHE_6max_mult_calls.txt  |   49 +
 .../Stars/Flop/FLHE_6max_sawflop_wrong.txt    |   41 +
 .../Stars/Flop/FLHE_6max_sawflop_wrong2.txt   |   38 +
 .../cash/Stars/Flop/FLHE_6max_wtsd_wrong.txt  | 1516 +++++++++++++++++
 5 files changed, 1652 insertions(+), 1 deletion(-)
 create mode 100755 pyfpdb/regression-test-files/cash/Stars/Flop/FLHE_6max_mult_calls.txt
 create mode 100755 pyfpdb/regression-test-files/cash/Stars/Flop/FLHE_6max_sawflop_wrong.txt
 create mode 100755 pyfpdb/regression-test-files/cash/Stars/Flop/FLHE_6max_sawflop_wrong2.txt
 create mode 100755 pyfpdb/regression-test-files/cash/Stars/Flop/FLHE_6max_wtsd_wrong.txt

diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py
index 23f1f99c..6084de28 100644
--- a/pyfpdb/DerivedStats.py
+++ b/pyfpdb/DerivedStats.py
@@ -264,6 +264,10 @@ class DerivedStats():
         if self.hands['playersAtShowdown'] > 1:
             for player in pas:
                 self.handsplayers[player]['sawShowdown'] = True
+                # streetXseenFix: streetXseen values miss out streets that were checked through,
+                # make sure all are set if showdown is seen
+                for i in xrange(1, len(hand.actionStreets)-1):
+                    self.handsplayers[player]['street%sSeen' % i] = True
 
     def streetXRaises(self, hand):
         # self.actions[street] is a list of all actions in a tuple, contining the action as the second element
@@ -375,7 +379,10 @@ class DerivedStats():
 
         for player in hand.players:
             if player[1] in pas:
-                self.handsplayers[player[1]]['street%sSeen' % i] = True
+                # streetXseenFix: streetXseen values miss out streets that were checked through,
+                # make sure earlier ones are set if action on later street
+                for j in xrange(1,i+1):
+                    self.handsplayers[player[1]]['street%sSeen' % j] = True
             else:
                 self.handsplayers[player[1]]['street%sSeen' % i] = False
 
diff --git a/pyfpdb/regression-test-files/cash/Stars/Flop/FLHE_6max_mult_calls.txt b/pyfpdb/regression-test-files/cash/Stars/Flop/FLHE_6max_mult_calls.txt
new file mode 100755
index 00000000..87d226da
--- /dev/null
+++ b/pyfpdb/regression-test-files/cash/Stars/Flop/FLHE_6max_mult_calls.txt
@@ -0,0 +1,49 @@
+
+
+PokerStars Game #39691143951:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:39:47 ET
+Table 'Triton IV' 6-max Seat #6 is the button
+Seat 1: vit-ivanov ($12.60 in chips) 
+Seat 2: Sub_Se7enxxx ($7 in chips) 
+Seat 3: OK @ PB ($17.70 in chips) 
+Seat 4: riterman ($7.90 in chips) 
+Seat 5: Slaviyaka ($13.85 in chips) 
+Seat 6: surething ($9.65 in chips) 
+vit-ivanov: posts small blind $0.10
+Sub_Se7enxxx: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [3s 7c]
+OK @ PB: calls $0.25
+riterman: raises $0.25 to $0.50
+Slaviyaka: folds 
+surething: folds 
+vit-ivanov: folds 
+Sub_Se7enxxx: calls $0.25
+OK @ PB: calls $0.25
+*** FLOP *** [9d 8h 3d]
+Sub_Se7enxxx: bets $0.25
+OK @ PB: calls $0.25
+riterman: raises $0.25 to $0.50
+Sub_Se7enxxx: folds 
+OK @ PB: calls $0.25
+*** TURN *** [9d 8h 3d] [7d]
+OK @ PB: checks 
+riterman: bets $0.50
+OK @ PB: raises $0.50 to $1
+riterman: calls $0.50
+*** RIVER *** [9d 8h 3d 7d] [Kh]
+OK @ PB: bets $0.50
+riterman: calls $0.50
+*** SHOW DOWN ***
+OK @ PB: shows [9c 8d] (two pair, Nines and Eights)
+riterman: shows [Kd Kc] (three of a kind, Kings)
+riterman collected $5.60 from pot
+*** SUMMARY ***
+Total pot $5.85 | Rake $0.25 
+Board [9d 8h 3d 7d Kh]
+Seat 1: vit-ivanov (small blind) folded before Flop
+Seat 2: Sub_Se7enxxx (big blind) folded on the Flop
+Seat 3: OK @ PB showed [9c 8d] and lost with two pair, Nines and Eights
+Seat 4: riterman showed [Kd Kc] and won ($5.60) with three of a kind, Kings
+Seat 5: Slaviyaka folded before Flop (didn't bet)
+Seat 6: surething (button) folded before Flop (didn't bet)
+
diff --git a/pyfpdb/regression-test-files/cash/Stars/Flop/FLHE_6max_sawflop_wrong.txt b/pyfpdb/regression-test-files/cash/Stars/Flop/FLHE_6max_sawflop_wrong.txt
new file mode 100755
index 00000000..b14176e3
--- /dev/null
+++ b/pyfpdb/regression-test-files/cash/Stars/Flop/FLHE_6max_sawflop_wrong.txt
@@ -0,0 +1,41 @@
+
+
+PokerStars Game #39691607275:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:49:45 ET
+Table 'Triton IV' 6-max Seat #2 is the button
+Seat 1: vit-ivanov ($16.25 in chips) 
+Seat 2: SONAG777 ($1.25 in chips) 
+Seat 4: riterman ($11.40 in chips) 
+Seat 5: Slaviyaka ($13.60 in chips) 
+Seat 6: surething ($9.50 in chips) 
+riterman: posts small blind $0.10
+Slaviyaka: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [6d 9c]
+surething: folds 
+vit-ivanov: folds 
+SONAG777: folds 
+riterman: calls $0.15
+Slaviyaka: checks 
+*** FLOP *** [Ks 5d Ah]
+riterman: checks 
+Slaviyaka: checks 
+*** TURN *** [Ks 5d Ah] [6s]
+riterman: bets $0.50
+Slaviyaka: calls $0.50
+*** RIVER *** [Ks 5d Ah 6s] [Kd]
+riterman: checks 
+Slaviyaka: bets $0.50
+riterman: calls $0.50
+*** SHOW DOWN ***
+Slaviyaka: shows [8s Qs] (a pair of Kings)
+riterman: shows [9s 6c] (two pair, Kings and Sixes)
+riterman collected $2.40 from pot
+*** SUMMARY ***
+Total pot $2.50 | Rake $0.10 
+Board [Ks 5d Ah 6s Kd]
+Seat 1: vit-ivanov folded before Flop (didn't bet)
+Seat 2: SONAG777 (button) folded before Flop (didn't bet)
+Seat 4: riterman (small blind) showed [9s 6c] and won ($2.40) with two pair, Kings and Sixes
+Seat 5: Slaviyaka (big blind) showed [8s Qs] and lost with a pair of Kings
+Seat 6: surething folded before Flop (didn't bet)
+
diff --git a/pyfpdb/regression-test-files/cash/Stars/Flop/FLHE_6max_sawflop_wrong2.txt b/pyfpdb/regression-test-files/cash/Stars/Flop/FLHE_6max_sawflop_wrong2.txt
new file mode 100755
index 00000000..a608919d
--- /dev/null
+++ b/pyfpdb/regression-test-files/cash/Stars/Flop/FLHE_6max_sawflop_wrong2.txt
@@ -0,0 +1,38 @@
+
+
+PokerStars Game #39691211280:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:41:15 ET
+Table 'Triton IV' 6-max Seat #2 is the button
+Seat 1: vit-ivanov ($12.50 in chips) 
+Seat 2: Sub_Se7enxxx ($7.20 in chips) 
+Seat 3: OK @ PB ($14.95 in chips) 
+Seat 4: riterman ($10.25 in chips) 
+Seat 5: Slaviyaka ($13.85 in chips) 
+Seat 6: surething ($9.65 in chips) 
+OK @ PB: posts small blind $0.10
+riterman: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [6h 7s]
+Slaviyaka: folds 
+surething: folds 
+vit-ivanov: raises $0.25 to $0.50
+Sub_Se7enxxx: folds 
+Sub_Se7enxxx leaves the table
+OK @ PB: folds 
+riterman: calls $0.25
+*** FLOP *** [Ac Kh 2d]
+riterman: checks 
+vit-ivanov: bets $0.25
+riterman: folds 
+Uncalled bet ($0.25) returned to vit-ivanov
+vit-ivanov collected $1.05 from pot
+vit-ivanov: doesn't show hand 
+*** SUMMARY ***
+Total pot $1.10 | Rake $0.05 
+Board [Ac Kh 2d]
+Seat 1: vit-ivanov collected ($1.05)
+Seat 2: Sub_Se7enxxx (button) folded before Flop (didn't bet)
+Seat 3: OK @ PB (small blind) folded before Flop
+Seat 4: riterman (big blind) folded on the Flop
+Seat 5: Slaviyaka folded before Flop (didn't bet)
+Seat 6: surething folded before Flop (didn't bet)
+
diff --git a/pyfpdb/regression-test-files/cash/Stars/Flop/FLHE_6max_wtsd_wrong.txt b/pyfpdb/regression-test-files/cash/Stars/Flop/FLHE_6max_wtsd_wrong.txt
new file mode 100755
index 00000000..ec67cc9f
--- /dev/null
+++ b/pyfpdb/regression-test-files/cash/Stars/Flop/FLHE_6max_wtsd_wrong.txt
@@ -0,0 +1,1516 @@
+PokerStars Game #39691083604:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:38:28 ET
+Table 'Triton IV' 6-max Seat #4 is the button
+Seat 1: vit-ivanov ($12.85 in chips) 
+Seat 2: Sub_Se7enxxx ($6.05 in chips) 
+Seat 3: OK @ PB ($17.95 in chips) 
+Seat 4: riterman ($7.90 in chips) 
+Seat 5: Slaviyaka ($13.95 in chips) 
+Seat 6: surething ($10 in chips) 
+Slaviyaka: posts small blind $0.10
+surething: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [5h Jc]
+vit-ivanov: folds 
+Sub_Se7enxxx: raises $0.25 to $0.50
+OK @ PB has timed out
+OK @ PB: folds 
+riterman: folds 
+Slaviyaka: folds 
+surething: folds 
+Uncalled bet ($0.25) returned to Sub_Se7enxxx
+Sub_Se7enxxx collected $0.60 from pot
+*** SUMMARY ***
+Total pot $0.60 | Rake $0 
+Seat 1: vit-ivanov folded before Flop (didn't bet)
+Seat 2: Sub_Se7enxxx collected ($0.60)
+Seat 3: OK @ PB folded before Flop (didn't bet)
+Seat 4: riterman (button) folded before Flop (didn't bet)
+Seat 5: Slaviyaka (small blind) folded before Flop
+Seat 6: surething (big blind) folded before Flop
+
+
+
+PokerStars Game #39691117574:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:39:13 ET
+Table 'Triton IV' 6-max Seat #5 is the button
+Seat 1: vit-ivanov ($12.85 in chips) 
+Seat 2: Sub_Se7enxxx ($6.40 in chips) 
+Seat 3: OK @ PB ($17.95 in chips) 
+Seat 4: riterman ($7.90 in chips) 
+Seat 5: Slaviyaka ($13.85 in chips) 
+Seat 6: surething ($9.75 in chips) 
+surething: posts small blind $0.10
+vit-ivanov: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [9c 2s]
+Sub_Se7enxxx: calls $0.25
+OK @ PB: calls $0.25
+riterman: folds 
+Slaviyaka: folds 
+surething: folds 
+vit-ivanov: checks 
+*** FLOP *** [3c Qc Ad]
+vit-ivanov: checks 
+Sub_Se7enxxx: bets $0.25
+OK @ PB: folds 
+vit-ivanov: folds 
+Uncalled bet ($0.25) returned to Sub_Se7enxxx
+Sub_Se7enxxx collected $0.85 from pot
+*** SUMMARY ***
+Total pot $0.85 | Rake $0 
+Board [3c Qc Ad]
+Seat 1: vit-ivanov (big blind) folded on the Flop
+Seat 2: Sub_Se7enxxx collected ($0.85)
+Seat 3: OK @ PB folded on the Flop
+Seat 4: riterman folded before Flop (didn't bet)
+Seat 5: Slaviyaka (button) folded before Flop (didn't bet)
+Seat 6: surething (small blind) folded before Flop
+
+
+
+PokerStars Game #39691143951:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:39:47 ET
+Table 'Triton IV' 6-max Seat #6 is the button
+Seat 1: vit-ivanov ($12.60 in chips) 
+Seat 2: Sub_Se7enxxx ($7 in chips) 
+Seat 3: OK @ PB ($17.70 in chips) 
+Seat 4: riterman ($7.90 in chips) 
+Seat 5: Slaviyaka ($13.85 in chips) 
+Seat 6: surething ($9.65 in chips) 
+vit-ivanov: posts small blind $0.10
+Sub_Se7enxxx: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [3s 7c]
+OK @ PB: calls $0.25
+riterman: raises $0.25 to $0.50
+Slaviyaka: folds 
+surething: folds 
+vit-ivanov: folds 
+Sub_Se7enxxx: calls $0.25
+OK @ PB: calls $0.25
+*** FLOP *** [9d 8h 3d]
+Sub_Se7enxxx: bets $0.25
+OK @ PB: calls $0.25
+riterman: raises $0.25 to $0.50
+Sub_Se7enxxx: folds 
+OK @ PB: calls $0.25
+*** TURN *** [9d 8h 3d] [7d]
+OK @ PB: checks 
+riterman: bets $0.50
+OK @ PB: raises $0.50 to $1
+riterman: calls $0.50
+*** RIVER *** [9d 8h 3d 7d] [Kh]
+OK @ PB: bets $0.50
+riterman: calls $0.50
+*** SHOW DOWN ***
+OK @ PB: shows [9c 8d] (two pair, Nines and Eights)
+riterman: shows [Kd Kc] (three of a kind, Kings)
+riterman collected $5.60 from pot
+*** SUMMARY ***
+Total pot $5.85 | Rake $0.25 
+Board [9d 8h 3d 7d Kh]
+Seat 1: vit-ivanov (small blind) folded before Flop
+Seat 2: Sub_Se7enxxx (big blind) folded on the Flop
+Seat 3: OK @ PB showed [9c 8d] and lost with two pair, Nines and Eights
+Seat 4: riterman showed [Kd Kc] and won ($5.60) with three of a kind, Kings
+Seat 5: Slaviyaka folded before Flop (didn't bet)
+Seat 6: surething (button) folded before Flop (didn't bet)
+
+
+
+PokerStars Game #39691184552:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:40:40 ET
+Table 'Triton IV' 6-max Seat #1 is the button
+Seat 1: vit-ivanov ($12.50 in chips) 
+Seat 2: Sub_Se7enxxx ($6.25 in chips) 
+Seat 3: OK @ PB ($15.20 in chips) 
+Seat 4: riterman ($11 in chips) 
+Seat 5: Slaviyaka ($13.85 in chips) 
+Seat 6: surething ($9.65 in chips) 
+Sub_Se7enxxx: posts small blind $0.10
+OK @ PB: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [7h Ks]
+riterman: raises $0.25 to $0.50
+Slaviyaka: folds 
+surething: folds 
+vit-ivanov: folds 
+Sub_Se7enxxx: calls $0.40
+OK @ PB: folds 
+*** FLOP *** [Kh Qh 5h]
+Sub_Se7enxxx: bets $0.25
+riterman: calls $0.25
+*** TURN *** [Kh Qh 5h] [3s]
+Sub_Se7enxxx: bets $0.50
+riterman: folds 
+Uncalled bet ($0.50) returned to Sub_Se7enxxx
+Sub_Se7enxxx collected $1.70 from pot
+*** SUMMARY ***
+Total pot $1.75 | Rake $0.05 
+Board [Kh Qh 5h 3s]
+Seat 1: vit-ivanov (button) folded before Flop (didn't bet)
+Seat 2: Sub_Se7enxxx (small blind) collected ($1.70)
+Seat 3: OK @ PB (big blind) folded before Flop
+Seat 4: riterman folded on the Turn
+Seat 5: Slaviyaka folded before Flop (didn't bet)
+Seat 6: surething folded before Flop (didn't bet)
+
+
+
+PokerStars Game #39691211280:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:41:15 ET
+Table 'Triton IV' 6-max Seat #2 is the button
+Seat 1: vit-ivanov ($12.50 in chips) 
+Seat 2: Sub_Se7enxxx ($7.20 in chips) 
+Seat 3: OK @ PB ($14.95 in chips) 
+Seat 4: riterman ($10.25 in chips) 
+Seat 5: Slaviyaka ($13.85 in chips) 
+Seat 6: surething ($9.65 in chips) 
+OK @ PB: posts small blind $0.10
+riterman: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [6h 7s]
+Slaviyaka: folds 
+surething: folds 
+vit-ivanov: raises $0.25 to $0.50
+Sub_Se7enxxx: folds 
+Sub_Se7enxxx leaves the table
+OK @ PB: folds 
+riterman: calls $0.25
+*** FLOP *** [Ac Kh 2d]
+riterman: checks 
+vit-ivanov: bets $0.25
+riterman: folds 
+Uncalled bet ($0.25) returned to vit-ivanov
+vit-ivanov collected $1.05 from pot
+vit-ivanov: doesn't show hand 
+*** SUMMARY ***
+Total pot $1.10 | Rake $0.05 
+Board [Ac Kh 2d]
+Seat 1: vit-ivanov collected ($1.05)
+Seat 2: Sub_Se7enxxx (button) folded before Flop (didn't bet)
+Seat 3: OK @ PB (small blind) folded before Flop
+Seat 4: riterman (big blind) folded on the Flop
+Seat 5: Slaviyaka folded before Flop (didn't bet)
+Seat 6: surething folded before Flop (didn't bet)
+
+
+
+PokerStars Game #39691239523:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:41:52 ET
+Table 'Triton IV' 6-max Seat #3 is the button
+Seat 1: vit-ivanov ($13.05 in chips) 
+Seat 3: OK @ PB ($14.85 in chips) 
+Seat 5: Slaviyaka ($13.85 in chips) 
+Seat 6: surething ($9.65 in chips) 
+riterman: is sitting out 
+Slaviyaka: posts small blind $0.10
+surething: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [2c Jh]
+vit-ivanov: folds 
+OK @ PB: calls $0.25
+Slaviyaka: calls $0.15
+surething: checks 
+*** FLOP *** [5s 4d Qh]
+Slaviyaka: checks 
+surething: checks 
+OK @ PB: bets $0.25
+Slaviyaka: folds 
+surething: calls $0.25
+*** TURN *** [5s 4d Qh] [Ks]
+surething: checks 
+OK @ PB: bets $0.50
+surething: folds 
+Uncalled bet ($0.50) returned to OK @ PB
+OK @ PB collected $1.20 from pot
+*** SUMMARY ***
+Total pot $1.25 | Rake $0.05 
+Board [5s 4d Qh Ks]
+Seat 1: vit-ivanov folded before Flop (didn't bet)
+Seat 3: OK @ PB (button) collected ($1.20)
+Seat 5: Slaviyaka (small blind) folded on the Flop
+Seat 6: surething (big blind) folded on the Turn
+
+
+
+PokerStars Game #39691267062:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:42:26 ET
+Table 'Triton IV' 6-max Seat #5 is the button
+Seat 1: vit-ivanov ($13.05 in chips) 
+Seat 3: OK @ PB ($15.55 in chips) 
+Seat 4: riterman ($9.75 in chips) 
+Seat 5: Slaviyaka ($13.60 in chips) 
+Seat 6: surething ($9.15 in chips) 
+surething: posts small blind $0.10
+vit-ivanov: posts big blind $0.25
+riterman: posts small blind $0.10
+*** HOLE CARDS ***
+Dealt to surething [Td 5d]
+OK @ PB: calls $0.25
+riterman: folds 
+Slaviyaka: folds 
+surething: folds 
+vit-ivanov: checks 
+*** FLOP *** [Qs 8h Kc]
+vit-ivanov: checks 
+OK @ PB: bets $0.25
+vit-ivanov: calls $0.25
+*** TURN *** [Qs 8h Kc] [6s]
+SONAG777 joins the table at seat #2 
+vit-ivanov: checks 
+OK @ PB: bets $0.50
+vit-ivanov: folds 
+Uncalled bet ($0.50) returned to OK @ PB
+OK @ PB collected $1.15 from pot
+*** SUMMARY ***
+Total pot $1.20 | Rake $0.05 
+Board [Qs 8h Kc 6s]
+Seat 1: vit-ivanov (big blind) folded on the Turn
+Seat 3: OK @ PB collected ($1.15)
+Seat 4: riterman folded before Flop
+Seat 5: Slaviyaka (button) folded before Flop (didn't bet)
+Seat 6: surething (small blind) folded before Flop
+
+
+
+PokerStars Game #39691296821:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:43:05 ET
+Table 'Triton IV' 6-max Seat #6 is the button
+Seat 1: vit-ivanov ($12.55 in chips) 
+Seat 2: SONAG777 ($4.15 in chips) 
+Seat 3: OK @ PB ($16.20 in chips) 
+Seat 4: riterman ($9.65 in chips) 
+Seat 5: Slaviyaka ($13.60 in chips) 
+Seat 6: surething ($9.05 in chips) 
+vit-ivanov: posts small blind $0.10
+SONAG777: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [6h Js]
+OK @ PB: calls $0.25
+riterman: calls $0.25
+Slaviyaka: folds 
+surething: folds 
+vit-ivanov: calls $0.15
+SONAG777: checks 
+*** FLOP *** [Qc 4s 2c]
+vit-ivanov: bets $0.25
+SONAG777: calls $0.25
+OK @ PB: folds 
+riterman: folds 
+*** TURN *** [Qc 4s 2c] [8h]
+vit-ivanov: bets $0.50
+SONAG777: calls $0.50
+*** RIVER *** [Qc 4s 2c 8h] [9c]
+vit-ivanov: bets $0.50
+SONAG777: folds 
+Uncalled bet ($0.50) returned to vit-ivanov
+vit-ivanov collected $2.40 from pot
+vit-ivanov: doesn't show hand 
+*** SUMMARY ***
+Total pot $2.50 | Rake $0.10 
+Board [Qc 4s 2c 8h 9c]
+Seat 1: vit-ivanov (small blind) collected ($2.40)
+Seat 2: SONAG777 (big blind) folded on the River
+Seat 3: OK @ PB folded on the Flop
+Seat 4: riterman folded on the Flop
+Seat 5: Slaviyaka folded before Flop (didn't bet)
+Seat 6: surething (button) folded before Flop (didn't bet)
+
+
+
+PokerStars Game #39691327754:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:43:45 ET
+Table 'Triton IV' 6-max Seat #1 is the button
+Seat 1: vit-ivanov ($13.95 in chips) 
+Seat 2: SONAG777 ($3.15 in chips) 
+Seat 3: OK @ PB ($15.95 in chips) 
+Seat 4: riterman ($9.40 in chips) 
+Seat 5: Slaviyaka ($13.60 in chips) 
+Seat 6: surething ($9.05 in chips) 
+SONAG777: posts small blind $0.10
+OK @ PB: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [Th 7d]
+riterman: folds 
+Slaviyaka: folds 
+surething: folds 
+vit-ivanov: folds 
+SONAG777: raises $0.25 to $0.50
+OK @ PB: calls $0.25
+*** FLOP *** [2s Js 6s]
+SONAG777: checks 
+OK @ PB: checks 
+*** TURN *** [2s Js 6s] [Qd]
+SONAG777: checks 
+OK @ PB: checks 
+*** RIVER *** [2s Js 6s Qd] [5s]
+SONAG777: bets $0.50
+OK @ PB: calls $0.50
+*** SHOW DOWN ***
+SONAG777: shows [As Ts] (a flush, Ace high)
+OK @ PB: mucks hand 
+SONAG777 collected $1.95 from pot
+*** SUMMARY ***
+Total pot $2 | Rake $0.05 
+Board [2s Js 6s Qd 5s]
+Seat 1: vit-ivanov (button) folded before Flop (didn't bet)
+Seat 2: SONAG777 (small blind) showed [As Ts] and won ($1.95) with a flush, Ace high
+Seat 3: OK @ PB (big blind) mucked [Ah 9d]
+Seat 4: riterman folded before Flop (didn't bet)
+Seat 5: Slaviyaka folded before Flop (didn't bet)
+Seat 6: surething folded before Flop (didn't bet)
+
+
+
+PokerStars Game #39691348481:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:44:12 ET
+Table 'Triton IV' 6-max Seat #2 is the button
+Seat 1: vit-ivanov ($13.95 in chips) 
+Seat 2: SONAG777 ($4.10 in chips) 
+Seat 3: OK @ PB ($14.95 in chips) 
+Seat 4: riterman ($9.40 in chips) 
+Seat 5: Slaviyaka ($13.60 in chips) 
+Seat 6: surething ($9.05 in chips) 
+OK @ PB: posts small blind $0.10
+riterman: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [6c Js]
+Slaviyaka: folds 
+surething: folds 
+vit-ivanov: folds 
+SONAG777: folds 
+OK @ PB: raises $0.25 to $0.50
+riterman: raises $0.25 to $0.75
+OK @ PB: calls $0.25
+*** FLOP *** [3s Qs 3d]
+OK @ PB: bets $0.25
+riterman: raises $0.25 to $0.50
+OK @ PB: calls $0.25
+*** TURN *** [3s Qs 3d] [7h]
+OK @ PB: bets $0.50
+riterman: raises $0.50 to $1
+OK @ PB: calls $0.50
+*** RIVER *** [3s Qs 3d 7h] [Ks]
+OK @ PB: bets $0.50
+riterman: calls $0.50
+*** SHOW DOWN ***
+OK @ PB: shows [5d As] (a pair of Threes)
+riterman: shows [Ad Qh] (two pair, Queens and Threes)
+riterman collected $5.25 from pot
+*** SUMMARY ***
+Total pot $5.50 | Rake $0.25 
+Board [3s Qs 3d 7h Ks]
+Seat 1: vit-ivanov folded before Flop (didn't bet)
+Seat 2: SONAG777 (button) folded before Flop (didn't bet)
+Seat 3: OK @ PB (small blind) showed [5d As] and lost with a pair of Threes
+Seat 4: riterman (big blind) showed [Ad Qh] and won ($5.25) with two pair, Queens and Threes
+Seat 5: Slaviyaka folded before Flop (didn't bet)
+Seat 6: surething folded before Flop (didn't bet)
+
+
+
+PokerStars Game #39691387427:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:45:02 ET
+Table 'Triton IV' 6-max Seat #3 is the button
+Seat 1: vit-ivanov ($13.95 in chips) 
+Seat 2: SONAG777 ($4.10 in chips) 
+Seat 3: OK @ PB ($12.20 in chips) 
+Seat 4: riterman ($11.90 in chips) 
+Seat 5: Slaviyaka ($13.60 in chips) 
+Seat 6: surething ($9.05 in chips) 
+riterman: posts small blind $0.10
+Slaviyaka: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [7c Ts]
+surething: folds 
+vit-ivanov: folds 
+SONAG777: folds 
+OK @ PB: raises $0.25 to $0.50
+riterman: folds 
+Slaviyaka: folds 
+Uncalled bet ($0.25) returned to OK @ PB
+OK @ PB collected $0.60 from pot
+*** SUMMARY ***
+Total pot $0.60 | Rake $0 
+Seat 1: vit-ivanov folded before Flop (didn't bet)
+Seat 2: SONAG777 folded before Flop (didn't bet)
+Seat 3: OK @ PB (button) collected ($0.60)
+Seat 4: riterman (small blind) folded before Flop
+Seat 5: Slaviyaka (big blind) folded before Flop
+Seat 6: surething folded before Flop (didn't bet)
+
+
+
+PokerStars Game #39691411480:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:45:33 ET
+Table 'Triton IV' 6-max Seat #4 is the button
+Seat 1: vit-ivanov ($13.95 in chips) 
+Seat 2: SONAG777 ($4.10 in chips) 
+Seat 3: OK @ PB ($12.55 in chips) 
+Seat 4: riterman ($11.80 in chips) 
+Seat 5: Slaviyaka ($13.35 in chips) 
+Seat 6: surething ($9.05 in chips) 
+Slaviyaka: posts small blind $0.10
+surething: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [9s 5c]
+vit-ivanov: raises $0.25 to $0.50
+SONAG777: folds 
+OK @ PB: folds 
+riterman: folds 
+OK @ PB leaves the table
+Slaviyaka: folds 
+surething: folds 
+Uncalled bet ($0.25) returned to vit-ivanov
+vit-ivanov collected $0.60 from pot
+vit-ivanov: doesn't show hand 
+*** SUMMARY ***
+Total pot $0.60 | Rake $0 
+Seat 1: vit-ivanov collected ($0.60)
+Seat 2: SONAG777 folded before Flop (didn't bet)
+Seat 3: OK @ PB folded before Flop (didn't bet)
+Seat 4: riterman (button) folded before Flop (didn't bet)
+Seat 5: Slaviyaka (small blind) folded before Flop
+Seat 6: surething (big blind) folded before Flop
+
+
+
+PokerStars Game #39691432966:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:46:01 ET
+Table 'Triton IV' 6-max Seat #5 is the button
+Seat 1: vit-ivanov ($14.30 in chips) 
+Seat 2: SONAG777 ($4.10 in chips) 
+Seat 4: riterman ($11.80 in chips) 
+Seat 5: Slaviyaka ($13.25 in chips) 
+Seat 6: surething ($8.80 in chips) 
+surething: posts small blind $0.10
+vit-ivanov: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [6c Ks]
+SONAG777: folds 
+riterman has timed out
+riterman: folds 
+Slaviyaka: folds 
+surething: raises $0.25 to $0.50
+vit-ivanov: folds 
+Uncalled bet ($0.25) returned to surething
+surething collected $0.50 from pot
+*** SUMMARY ***
+Total pot $0.50 | Rake $0 
+Seat 1: vit-ivanov (big blind) folded before Flop
+Seat 2: SONAG777 folded before Flop (didn't bet)
+Seat 4: riterman folded before Flop (didn't bet)
+Seat 5: Slaviyaka (button) folded before Flop (didn't bet)
+Seat 6: surething (small blind) collected ($0.50)
+
+
+
+PokerStars Game #39691465460:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:46:42 ET
+Table 'Triton IV' 6-max Seat #6 is the button
+Seat 1: vit-ivanov ($14.05 in chips) 
+Seat 2: SONAG777 ($4.10 in chips) 
+Seat 4: riterman ($11.80 in chips) 
+Seat 5: Slaviyaka ($13.25 in chips) 
+Seat 6: surething ($9.05 in chips) 
+vit-ivanov: posts small blind $0.10
+SONAG777: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [9d Jc]
+riterman: folds 
+Slaviyaka: calls $0.25
+surething: folds 
+vit-ivanov: folds 
+SONAG777: checks 
+*** FLOP *** [As Ts Qd]
+SONAG777: checks 
+Slaviyaka: checks 
+*** TURN *** [As Ts Qd] [Td]
+SONAG777: checks 
+Slaviyaka: checks 
+*** RIVER *** [As Ts Qd Td] [7s]
+SONAG777: checks 
+Slaviyaka: checks 
+*** SHOW DOWN ***
+SONAG777: shows [4d Jd] (a pair of Tens)
+Slaviyaka: shows [3d 3h] (two pair, Tens and Threes)
+Slaviyaka collected $0.60 from pot
+*** SUMMARY ***
+Total pot $0.60 | Rake $0 
+Board [As Ts Qd Td 7s]
+Seat 1: vit-ivanov (small blind) folded before Flop
+Seat 2: SONAG777 (big blind) showed [4d Jd] and lost with a pair of Tens
+Seat 4: riterman folded before Flop (didn't bet)
+Seat 5: Slaviyaka showed [3d 3h] and won ($0.60) with two pair, Tens and Threes
+Seat 6: surething (button) folded before Flop (didn't bet)
+
+
+
+PokerStars Game #39691486174:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:47:09 ET
+Table 'Triton IV' 6-max Seat #1 is the button
+Seat 1: vit-ivanov ($13.95 in chips) 
+Seat 2: SONAG777 ($3.85 in chips) 
+Seat 4: riterman ($11.80 in chips) 
+Seat 5: Slaviyaka ($13.60 in chips) 
+Seat 6: surething ($9.05 in chips) 
+SONAG777: posts small blind $0.10
+riterman: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [Th 3h]
+Slaviyaka: folds 
+surething: folds 
+vit-ivanov: folds 
+SONAG777: folds 
+Uncalled bet ($0.15) returned to riterman
+riterman collected $0.20 from pot
+riterman: doesn't show hand 
+*** SUMMARY ***
+Total pot $0.20 | Rake $0 
+Seat 1: vit-ivanov (button) folded before Flop (didn't bet)
+Seat 2: SONAG777 (small blind) folded before Flop
+Seat 4: riterman (big blind) collected ($0.20)
+Seat 5: Slaviyaka folded before Flop (didn't bet)
+Seat 6: surething folded before Flop (didn't bet)
+
+
+
+PokerStars Game #39691496730:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:47:23 ET
+Table 'Triton IV' 6-max Seat #2 is the button
+Seat 1: vit-ivanov ($13.95 in chips) 
+Seat 2: SONAG777 ($3.75 in chips) 
+Seat 4: riterman ($11.90 in chips) 
+Seat 5: Slaviyaka ($13.60 in chips) 
+Seat 6: surething ($9.05 in chips) 
+riterman: posts small blind $0.10
+Slaviyaka: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [Ts 8h]
+surething: folds 
+vit-ivanov: folds 
+SONAG777: folds 
+riterman: folds 
+Uncalled bet ($0.15) returned to Slaviyaka
+Slaviyaka collected $0.20 from pot
+Slaviyaka: doesn't show hand 
+*** SUMMARY ***
+Total pot $0.20 | Rake $0 
+Seat 1: vit-ivanov folded before Flop (didn't bet)
+Seat 2: SONAG777 (button) folded before Flop (didn't bet)
+Seat 4: riterman (small blind) folded before Flop
+Seat 5: Slaviyaka (big blind) collected ($0.20)
+Seat 6: surething folded before Flop (didn't bet)
+
+
+
+PokerStars Game #39691519107:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:47:51 ET
+Table 'Triton IV' 6-max Seat #4 is the button
+Seat 1: vit-ivanov ($13.95 in chips) 
+Seat 2: SONAG777 ($3.75 in chips) 
+Seat 4: riterman ($11.80 in chips) 
+Seat 5: Slaviyaka ($13.70 in chips) 
+Seat 6: surething ($9.05 in chips) 
+Slaviyaka: posts small blind $0.10
+surething: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [Kc Qc]
+vit-ivanov: folds 
+SONAG777: folds 
+riterman: calls $0.25
+Slaviyaka: folds 
+surething: raises $0.25 to $0.50
+riterman: calls $0.25
+*** FLOP *** [4d 8c 6h]
+surething: bets $0.25
+riterman: folds 
+Uncalled bet ($0.25) returned to surething
+surething collected $1.05 from pot
+surething: doesn't show hand 
+*** SUMMARY ***
+Total pot $1.10 | Rake $0.05 
+Board [4d 8c 6h]
+Seat 1: vit-ivanov folded before Flop (didn't bet)
+Seat 2: SONAG777 folded before Flop (didn't bet)
+Seat 4: riterman (button) folded on the Flop
+Seat 5: Slaviyaka (small blind) folded before Flop
+Seat 6: surething (big blind) collected ($1.05)
+
+
+
+PokerStars Game #39691547216:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:48:28 ET
+Table 'Triton IV' 6-max Seat #5 is the button
+Seat 1: vit-ivanov ($13.95 in chips) 
+Seat 2: SONAG777 ($3.75 in chips) 
+Seat 4: riterman ($11.30 in chips) 
+Seat 5: Slaviyaka ($13.60 in chips) 
+Seat 6: surething ($9.60 in chips) 
+surething: posts small blind $0.10
+vit-ivanov: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [9h 4d]
+SONAG777: calls $0.25
+riterman: folds 
+Slaviyaka: folds 
+surething: folds 
+vit-ivanov: checks 
+*** FLOP *** [7s 4h 7c]
+vit-ivanov: bets $0.25
+SONAG777: calls $0.25
+*** TURN *** [7s 4h 7c] [3c]
+vit-ivanov: bets $0.50
+SONAG777: raises $0.50 to $1
+vit-ivanov: raises $0.50 to $1.50
+SONAG777: calls $0.50
+*** RIVER *** [7s 4h 7c 3c] [Ah]
+vit-ivanov: bets $0.50
+SONAG777: calls $0.50
+*** SHOW DOWN ***
+vit-ivanov: shows [6h 5d] (a straight, Three to Seven)
+SONAG777: mucks hand 
+vit-ivanov collected $4.90 from pot
+*** SUMMARY ***
+Total pot $5.10 | Rake $0.20 
+Board [7s 4h 7c 3c Ah]
+Seat 1: vit-ivanov (big blind) showed [6h 5d] and won ($4.90) with a straight, Three to Seven
+Seat 2: SONAG777 mucked [7h 8h]
+Seat 4: riterman folded before Flop (didn't bet)
+Seat 5: Slaviyaka (button) folded before Flop (didn't bet)
+Seat 6: surething (small blind) folded before Flop
+
+
+
+PokerStars Game #39691586292:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:49:18 ET
+Table 'Triton IV' 6-max Seat #6 is the button
+Seat 1: vit-ivanov ($16.35 in chips) 
+Seat 2: SONAG777 ($1.25 in chips) 
+Seat 4: riterman ($11.30 in chips) 
+Seat 5: Slaviyaka ($13.60 in chips) 
+Seat 6: surething ($9.50 in chips) 
+vit-ivanov: posts small blind $0.10
+SONAG777: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [Kh 3c]
+riterman: folds 
+Slaviyaka: folds 
+surething: folds 
+vit-ivanov: folds 
+Uncalled bet ($0.15) returned to SONAG777
+SONAG777 collected $0.20 from pot
+SONAG777: doesn't show hand 
+*** SUMMARY ***
+Total pot $0.20 | Rake $0 
+Seat 1: vit-ivanov (small blind) folded before Flop
+Seat 2: SONAG777 (big blind) collected ($0.20)
+Seat 4: riterman folded before Flop (didn't bet)
+Seat 5: Slaviyaka folded before Flop (didn't bet)
+Seat 6: surething (button) folded before Flop (didn't bet)
+
+
+
+PokerStars Game #39691596912:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:49:32 ET
+Table 'Triton IV' 6-max Seat #1 is the button
+Seat 1: vit-ivanov ($16.25 in chips) 
+Seat 2: SONAG777 ($1.35 in chips) 
+Seat 4: riterman ($11.30 in chips) 
+Seat 5: Slaviyaka ($13.60 in chips) 
+Seat 6: surething ($9.50 in chips) 
+SONAG777: posts small blind $0.10
+riterman: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [7h 6s]
+Slaviyaka: folds 
+surething: folds 
+vit-ivanov: folds 
+SONAG777: folds 
+Uncalled bet ($0.15) returned to riterman
+riterman collected $0.20 from pot
+riterman: doesn't show hand 
+*** SUMMARY ***
+Total pot $0.20 | Rake $0 
+Seat 1: vit-ivanov (button) folded before Flop (didn't bet)
+Seat 2: SONAG777 (small blind) folded before Flop
+Seat 4: riterman (big blind) collected ($0.20)
+Seat 5: Slaviyaka folded before Flop (didn't bet)
+Seat 6: surething folded before Flop (didn't bet)
+
+
+
+PokerStars Game #39691607275:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:49:45 ET
+Table 'Triton IV' 6-max Seat #2 is the button
+Seat 1: vit-ivanov ($16.25 in chips) 
+Seat 2: SONAG777 ($1.25 in chips) 
+Seat 4: riterman ($11.40 in chips) 
+Seat 5: Slaviyaka ($13.60 in chips) 
+Seat 6: surething ($9.50 in chips) 
+riterman: posts small blind $0.10
+Slaviyaka: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [6d 9c]
+surething: folds 
+vit-ivanov: folds 
+SONAG777: folds 
+riterman: calls $0.15
+Slaviyaka: checks 
+*** FLOP *** [Ks 5d Ah]
+riterman: checks 
+Slaviyaka: checks 
+*** TURN *** [Ks 5d Ah] [6s]
+riterman: bets $0.50
+Slaviyaka: calls $0.50
+*** RIVER *** [Ks 5d Ah 6s] [Kd]
+riterman: checks 
+Slaviyaka: bets $0.50
+riterman: calls $0.50
+*** SHOW DOWN ***
+Slaviyaka: shows [8s Qs] (a pair of Kings)
+riterman: shows [9s 6c] (two pair, Kings and Sixes)
+riterman collected $2.40 from pot
+*** SUMMARY ***
+Total pot $2.50 | Rake $0.10 
+Board [Ks 5d Ah 6s Kd]
+Seat 1: vit-ivanov folded before Flop (didn't bet)
+Seat 2: SONAG777 (button) folded before Flop (didn't bet)
+Seat 4: riterman (small blind) showed [9s 6c] and won ($2.40) with two pair, Kings and Sixes
+Seat 5: Slaviyaka (big blind) showed [8s Qs] and lost with a pair of Kings
+Seat 6: surething folded before Flop (didn't bet)
+
+
+
+PokerStars Game #39691801103:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:53:57 ET
+Table 'Triton IV' 6-max Seat #4 is the button
+Seat 2: SONAG777 ($12 in chips) 
+Seat 3: medinaceli2 ($49.15 in chips) 
+Seat 4: riterman ($10.55 in chips) 
+Seat 5: aklsduy28 ($20 in chips) 
+Seat 6: surething ($9.50 in chips) 
+aklsduy28: posts small blind $0.10
+surething: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [2c Jc]
+SONAG777: folds 
+medinaceli2: folds 
+riterman: folds 
+aklsduy28: calls $0.15
+surething: raises $0.25 to $0.50
+aklsduy28: calls $0.25
+*** FLOP *** [Ah Ac 4h]
+aklsduy28: checks 
+surething: bets $0.25
+aklsduy28: folds 
+Uncalled bet ($0.25) returned to surething
+surething collected $0.95 from pot
+surething: doesn't show hand 
+*** SUMMARY ***
+Total pot $1 | Rake $0.05 
+Board [Ah Ac 4h]
+Seat 2: SONAG777 folded before Flop (didn't bet)
+Seat 3: medinaceli2 folded before Flop (didn't bet)
+Seat 4: riterman (button) folded before Flop (didn't bet)
+Seat 5: aklsduy28 (small blind) folded on the Flop
+Seat 6: surething (big blind) collected ($0.95)
+
+
+
+PokerStars Game #39691821986:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:54:24 ET
+Table 'Triton IV' 6-max Seat #5 is the button
+Seat 2: SONAG777 ($12 in chips) 
+Seat 3: medinaceli2 ($49.15 in chips) 
+Seat 4: riterman ($10.55 in chips) 
+Seat 5: aklsduy28 ($19.50 in chips) 
+Seat 6: surething ($9.95 in chips) 
+surething: posts small blind $0.10
+SONAG777: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [Qs 9h]
+medinaceli2: calls $0.25
+riterman: folds 
+aklsduy28: folds 
+surething: folds 
+SONAG777: checks 
+*** FLOP *** [6s 7s 6c]
+SONAG777: checks 
+medinaceli2: bets $0.25
+SONAG777: folds 
+Uncalled bet ($0.25) returned to medinaceli2
+medinaceli2 collected $0.60 from pot
+medinaceli2: doesn't show hand 
+*** SUMMARY ***
+Total pot $0.60 | Rake $0 
+Board [6s 7s 6c]
+Seat 2: SONAG777 (big blind) folded on the Flop
+Seat 3: medinaceli2 collected ($0.60)
+Seat 4: riterman folded before Flop (didn't bet)
+Seat 5: aklsduy28 (button) folded before Flop (didn't bet)
+Seat 6: surething (small blind) folded before Flop
+
+
+
+PokerStars Game #39691843810:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:54:53 ET
+Table 'Triton IV' 6-max Seat #6 is the button
+Seat 2: SONAG777 ($11.75 in chips) 
+Seat 3: medinaceli2 ($49.50 in chips) 
+Seat 4: riterman ($10.55 in chips) 
+Seat 5: aklsduy28 ($19.50 in chips) 
+Seat 6: surething ($9.85 in chips) 
+SONAG777: posts small blind $0.10
+medinaceli2: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [Jd 9d]
+riterman: folds 
+aklsduy28: folds 
+surething: raises $0.25 to $0.50
+SONAG777: calls $0.40
+medinaceli2: calls $0.25
+*** FLOP *** [5c 8d Jh]
+SONAG777: checks 
+medinaceli2: checks 
+surething: bets $0.25
+SONAG777: calls $0.25
+medinaceli2: calls $0.25
+*** TURN *** [5c 8d Jh] [Ac]
+SONAG777: checks 
+medinaceli2: checks 
+surething: checks 
+*** RIVER *** [5c 8d Jh Ac] [4h]
+SONAG777: checks 
+medinaceli2: checks 
+surething: checks 
+*** SHOW DOWN ***
+SONAG777: shows [7d 4d] (a pair of Fours)
+medinaceli2: mucks hand 
+surething: shows [Jd 9d] (a pair of Jacks)
+surething collected $2.15 from pot
+*** SUMMARY ***
+Total pot $2.25 | Rake $0.10 
+Board [5c 8d Jh Ac 4h]
+Seat 2: SONAG777 (small blind) showed [7d 4d] and lost with a pair of Fours
+Seat 3: medinaceli2 (big blind) mucked [7s Qd]
+Seat 4: riterman folded before Flop (didn't bet)
+Seat 5: aklsduy28 folded before Flop (didn't bet)
+Seat 6: surething (button) showed [Jd 9d] and won ($2.15) with a pair of Jacks
+
+
+
+PokerStars Game #39691870299:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:55:31 ET
+Table 'Triton IV' 6-max Seat #2 is the button
+Seat 2: SONAG777 ($11 in chips) 
+Seat 3: medinaceli2 ($48.75 in chips) 
+Seat 4: riterman ($10.55 in chips) 
+Seat 5: aklsduy28 ($19.50 in chips) 
+Seat 6: surething ($11.25 in chips) 
+medinaceli2: posts small blind $0.10
+riterman: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [Jh Tc]
+aklsduy28: folds 
+surething: raises $0.25 to $0.50
+SONAG777: folds 
+medinaceli2: calls $0.40
+riterman: folds 
+*** FLOP *** [5d Th Qd]
+medinaceli2: checks 
+surething: bets $0.25
+medinaceli2: calls $0.25
+*** TURN *** [5d Th Qd] [3c]
+medinaceli2: checks 
+surething: bets $0.50
+medinaceli2: calls $0.50
+*** RIVER *** [5d Th Qd 3c] [Ts]
+medinaceli2: checks 
+surething: bets $0.50
+medinaceli2: folds 
+Uncalled bet ($0.50) returned to surething
+surething collected $2.65 from pot
+surething: doesn't show hand 
+*** SUMMARY ***
+Total pot $2.75 | Rake $0.10 
+Board [5d Th Qd 3c Ts]
+Seat 2: SONAG777 (button) folded before Flop (didn't bet)
+Seat 3: medinaceli2 (small blind) folded on the River
+Seat 4: riterman (big blind) folded before Flop
+Seat 5: aklsduy28 folded before Flop (didn't bet)
+Seat 6: surething collected ($2.65)
+
+
+
+PokerStars Game #39691889933:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:56:04 ET
+Table 'Triton IV' 6-max Seat #3 is the button
+Seat 2: SONAG777 ($11 in chips) 
+Seat 3: medinaceli2 ($47.50 in chips) 
+Seat 4: riterman ($10.30 in chips) 
+Seat 5: aklsduy28 ($19.50 in chips) 
+Seat 6: surething ($12.65 in chips) 
+riterman: posts small blind $0.10
+aklsduy28: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [9s Kh]
+surething: folds 
+SONAG777: folds 
+medinaceli2: calls $0.25
+riterman: calls $0.15
+aklsduy28: checks 
+*** FLOP *** [Td Js 4c]
+riterman: checks 
+aklsduy28: checks 
+medinaceli2: checks 
+*** TURN *** [Td Js 4c] [3d]
+riterman: bets $0.50
+aklsduy28: folds 
+medinaceli2: calls $0.50
+*** RIVER *** [Td Js 4c 3d] [7h]
+riterman: bets $0.50
+medinaceli2: calls $0.50
+*** SHOW DOWN ***
+riterman: shows [3h 4h] (two pair, Fours and Threes)
+medinaceli2: mucks hand 
+riterman collected $2.65 from pot
+*** SUMMARY ***
+Total pot $2.75 | Rake $0.10 
+Board [Td Js 4c 3d 7h]
+Seat 2: SONAG777 folded before Flop (didn't bet)
+Seat 3: medinaceli2 (button) mucked [Ad 3s]
+Seat 4: riterman (small blind) showed [3h 4h] and won ($2.65) with two pair, Fours and Threes
+Seat 5: aklsduy28 (big blind) folded on the Turn
+Seat 6: surething folded before Flop (didn't bet)
+
+
+
+PokerStars Game #39691912877:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:56:42 ET
+Table 'Triton IV' 6-max Seat #4 is the button
+Seat 2: SONAG777 ($11 in chips) 
+Seat 3: medinaceli2 ($46.25 in chips) 
+Seat 4: riterman ($11.70 in chips) 
+Seat 5: aklsduy28 ($19.25 in chips) 
+Seat 6: surething ($12.65 in chips) 
+aklsduy28: posts small blind $0.10
+surething: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [Kc 7c]
+SONAG777: calls $0.25
+medinaceli2: folds 
+riterman: folds 
+aklsduy28: folds 
+surething: checks 
+*** FLOP *** [Jh 8h 6s]
+vit-ivanov leaves the table
+surething: checks 
+SONAG777: bets $0.25
+surething: folds 
+Uncalled bet ($0.25) returned to SONAG777
+SONAG777 collected $0.60 from pot
+SONAG777: doesn't show hand 
+yyyAA joins the table at seat #1 
+*** SUMMARY ***
+Total pot $0.60 | Rake $0 
+Board [Jh 8h 6s]
+Seat 2: SONAG777 collected ($0.60)
+Seat 3: medinaceli2 folded before Flop (didn't bet)
+Seat 4: riterman (button) folded before Flop (didn't bet)
+Seat 5: aklsduy28 (small blind) folded before Flop
+Seat 6: surething (big blind) folded on the Flop
+
+
+
+PokerStars Game #39691930533:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:57:12 ET
+Table 'Triton IV' 6-max Seat #5 is the button
+Seat 1: yyyAA ($10 in chips) 
+Seat 2: SONAG777 ($11.35 in chips) 
+Seat 3: medinaceli2 ($46.25 in chips) 
+Seat 4: riterman ($11.70 in chips) 
+Seat 5: aklsduy28 ($19.15 in chips) 
+Seat 6: surething ($12.40 in chips) 
+surething: posts small blind $0.10
+yyyAA: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [Kc 5d]
+SONAG777: folds 
+medinaceli2: calls $0.25
+riterman: folds 
+aklsduy28: folds 
+surething: folds 
+yyyAA: checks 
+*** FLOP *** [Ah 6h 9c]
+yyyAA: checks 
+medinaceli2: bets $0.25
+yyyAA: calls $0.25
+*** TURN *** [Ah 6h 9c] [Js]
+yyyAA: checks 
+medinaceli2: bets $0.50
+yyyAA: calls $0.50
+*** RIVER *** [Ah 6h 9c Js] [4s]
+yyyAA: checks 
+medinaceli2: bets $0.50
+yyyAA: calls $0.50
+*** SHOW DOWN ***
+medinaceli2: shows [As 4d] (two pair, Aces and Fours)
+yyyAA: mucks hand 
+medinaceli2 collected $2.95 from pot
+*** SUMMARY ***
+Total pot $3.10 | Rake $0.15 
+Board [Ah 6h 9c Js 4s]
+Seat 1: yyyAA (big blind) mucked [Th 9s]
+Seat 2: SONAG777 folded before Flop (didn't bet)
+Seat 3: medinaceli2 showed [As 4d] and won ($2.95) with two pair, Aces and Fours
+Seat 4: riterman folded before Flop (didn't bet)
+Seat 5: aklsduy28 (button) folded before Flop (didn't bet)
+Seat 6: surething (small blind) folded before Flop
+
+
+
+PokerStars Game #39691952975:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:57:48 ET
+Table 'Triton IV' 6-max Seat #6 is the button
+Seat 1: yyyAA ($8.50 in chips) 
+Seat 2: SONAG777 ($11.35 in chips) 
+Seat 3: medinaceli2 ($47.70 in chips) 
+Seat 4: riterman ($11.70 in chips) 
+Seat 5: aklsduy28 ($19.15 in chips) 
+Seat 6: surething ($12.30 in chips) 
+yyyAA: posts small blind $0.10
+SONAG777: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [5h Ac]
+medinaceli2: folds 
+riterman: folds 
+aklsduy28: folds 
+surething: raises $0.25 to $0.50
+yyyAA: calls $0.40
+SONAG777: calls $0.25
+*** FLOP *** [3h Qd Td]
+yyyAA: checks 
+SONAG777: checks 
+surething: bets $0.25
+yyyAA: folds 
+SONAG777: calls $0.25
+*** TURN *** [3h Qd Td] [7s]
+SONAG777: checks 
+surething: checks 
+*** RIVER *** [3h Qd Td 7s] [8c]
+SONAG777: checks 
+surething: checks 
+*** SHOW DOWN ***
+SONAG777: shows [2s 2d] (a pair of Deuces)
+surething: mucks hand 
+SONAG777 collected $1.95 from pot
+*** SUMMARY ***
+Total pot $2 | Rake $0.05 
+Board [3h Qd Td 7s 8c]
+Seat 1: yyyAA (small blind) folded on the Flop
+Seat 2: SONAG777 (big blind) showed [2s 2d] and won ($1.95) with a pair of Deuces
+Seat 3: medinaceli2 folded before Flop (didn't bet)
+Seat 4: riterman folded before Flop (didn't bet)
+Seat 5: aklsduy28 folded before Flop (didn't bet)
+Seat 6: surething (button) mucked [5h Ac]
+
+
+
+PokerStars Game #39691976905:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:58:28 ET
+Table 'Triton IV' 6-max Seat #1 is the button
+Seat 1: yyyAA ($8 in chips) 
+Seat 2: SONAG777 ($12.55 in chips) 
+Seat 3: medinaceli2 ($47.70 in chips) 
+Seat 4: riterman ($11.70 in chips) 
+Seat 5: aklsduy28 ($19.15 in chips) 
+Seat 6: surething ($11.55 in chips) 
+SONAG777: posts small blind $0.10
+medinaceli2: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [8c 8d]
+riterman: folds 
+aklsduy28: folds 
+surething: raises $0.25 to $0.50
+yyyAA: folds 
+SONAG777: folds 
+medinaceli2: calls $0.25
+*** FLOP *** [Ks Td Qh]
+medinaceli2: checks 
+surething: bets $0.25
+medinaceli2: calls $0.25
+*** TURN *** [Ks Td Qh] [7s]
+medinaceli2: checks 
+surething: bets $0.50
+medinaceli2: calls $0.50
+*** RIVER *** [Ks Td Qh 7s] [Kc]
+medinaceli2: checks 
+surething: checks 
+*** SHOW DOWN ***
+medinaceli2: shows [Ah 5s] (a pair of Kings)
+surething: shows [8c 8d] (two pair, Kings and Eights)
+surething collected $2.50 from pot
+*** SUMMARY ***
+Total pot $2.60 | Rake $0.10 
+Board [Ks Td Qh 7s Kc]
+Seat 1: yyyAA (button) folded before Flop (didn't bet)
+Seat 2: SONAG777 (small blind) folded before Flop
+Seat 3: medinaceli2 (big blind) showed [Ah 5s] and lost with a pair of Kings
+Seat 4: riterman folded before Flop (didn't bet)
+Seat 5: aklsduy28 folded before Flop (didn't bet)
+Seat 6: surething showed [8c 8d] and won ($2.50) with two pair, Kings and Eights
+
+
+
+PokerStars Game #39691999120:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:59:04 ET
+Table 'Triton IV' 6-max Seat #2 is the button
+Seat 1: yyyAA ($8 in chips) 
+Seat 2: SONAG777 ($12.45 in chips) 
+Seat 3: medinaceli2 ($46.45 in chips) 
+Seat 4: riterman ($11.70 in chips) 
+Seat 5: aklsduy28 ($19.15 in chips) 
+Seat 6: surething ($12.80 in chips) 
+medinaceli2: posts small blind $0.10
+riterman: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [3c 4d]
+aklsduy28: folds 
+surething: folds 
+yyyAA: calls $0.25
+SONAG777: folds 
+medinaceli2: folds 
+riterman: checks 
+*** FLOP *** [2c Tc 9h]
+riterman: checks 
+yyyAA: checks 
+*** TURN *** [2c Tc 9h] [5c]
+riterman: checks 
+yyyAA: bets $0.50
+riterman: folds 
+Uncalled bet ($0.50) returned to yyyAA
+yyyAA collected $0.60 from pot
+*** SUMMARY ***
+Total pot $0.60 | Rake $0 
+Board [2c Tc 9h 5c]
+Seat 1: yyyAA collected ($0.60)
+Seat 2: SONAG777 (button) folded before Flop (didn't bet)
+Seat 3: medinaceli2 (small blind) folded before Flop
+Seat 4: riterman (big blind) folded on the Turn
+Seat 5: aklsduy28 folded before Flop (didn't bet)
+Seat 6: surething folded before Flop (didn't bet)
+
+
+
+PokerStars Game #39692013863:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:59:28 ET
+Table 'Triton IV' 6-max Seat #3 is the button
+Seat 1: yyyAA ($8.35 in chips) 
+Seat 2: SONAG777 ($12.45 in chips) 
+Seat 3: medinaceli2 ($46.35 in chips) 
+Seat 6: surething ($12.80 in chips) 
+riterman: is sitting out 
+aklsduy28: is sitting out 
+surething: posts small blind $0.10
+yyyAA: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [8c 8h]
+SONAG777: folds 
+medinaceli2: folds 
+surething: raises $0.25 to $0.50
+yyyAA: folds 
+Uncalled bet ($0.25) returned to surething
+surething collected $0.50 from pot
+surething: doesn't show hand 
+*** SUMMARY ***
+Total pot $0.50 | Rake $0 
+Seat 1: yyyAA (big blind) folded before Flop
+Seat 2: SONAG777 folded before Flop (didn't bet)
+Seat 3: medinaceli2 (button) folded before Flop (didn't bet)
+Seat 6: surething (small blind) collected ($0.50)
+
+
+
+PokerStars Game #39692023622:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:59:44 ET
+Table 'Triton IV' 6-max Seat #6 is the button
+Seat 1: yyyAA ($8.10 in chips) 
+Seat 2: SONAG777 ($12.45 in chips) 
+Seat 3: medinaceli2 ($46.35 in chips) 
+Seat 6: surething ($13.05 in chips) 
+yyyAA: posts small blind $0.10
+SONAG777: posts big blind $0.25
+aklsduy28 leaves the table
+riterman: sits out 
+*** HOLE CARDS ***
+Dealt to surething [5c 3d]
+medinaceli2: raises $0.25 to $0.50
+surething: folds 
+yyyAA: folds 
+SONAG777: calls $0.25
+*** FLOP *** [Qs Qh 8h]
+SONAG777: checks 
+medinaceli2: bets $0.25
+SONAG777: folds 
+Uncalled bet ($0.25) returned to medinaceli2
+medinaceli2 collected $1.05 from pot
+medinaceli2: doesn't show hand 
+*** SUMMARY ***
+Total pot $1.10 | Rake $0.05 
+Board [Qs Qh 8h]
+Seat 1: yyyAA (small blind) folded before Flop
+Seat 2: SONAG777 (big blind) folded on the Flop
+Seat 3: medinaceli2 collected ($1.05)
+Seat 6: surething (button) folded before Flop (didn't bet)
+
+
+
+PokerStars Game #39692039868:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 13:00:11 ET
+Table 'Triton IV' 6-max Seat #1 is the button
+Seat 1: yyyAA ($8 in chips) 
+Seat 2: SONAG777 ($11.95 in chips) 
+Seat 3: medinaceli2 ($46.90 in chips) 
+Seat 6: surething ($13.05 in chips) 
+SONAG777: posts small blind $0.10
+medinaceli2: posts big blind $0.25
+riterman: sits out 
+*** HOLE CARDS ***
+Dealt to surething [9h Td]
+surething: folds 
+yyyAA: folds 
+SONAG777: raises $0.25 to $0.50
+medinaceli2: folds 
+Uncalled bet ($0.25) returned to SONAG777
+SONAG777 collected $0.50 from pot
+SONAG777: doesn't show hand 
+*** SUMMARY ***
+Total pot $0.50 | Rake $0 
+Seat 1: yyyAA (button) folded before Flop (didn't bet)
+Seat 2: SONAG777 (small blind) collected ($0.50)
+Seat 3: medinaceli2 (big blind) folded before Flop
+Seat 6: surething folded before Flop (didn't bet)
+
+
+
+PokerStars Game #39692048321:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 13:00:24 ET
+Table 'Triton IV' 6-max Seat #2 is the button
+Seat 1: yyyAA ($8 in chips) 
+Seat 2: SONAG777 ($12.20 in chips) 
+Seat 3: medinaceli2 ($46.65 in chips) 
+Seat 4: riterman ($11.45 in chips) 
+Seat 6: surething ($13.05 in chips) 
+medinaceli2: posts small blind $0.10
+riterman: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [9s Tc]
+surething: folds 
+yyyAA: folds 
+SONAG777: calls $0.25
+medinaceli2: calls $0.15
+riterman: checks 
+*** FLOP *** [Ac 7d 8d]
+medinaceli2: bets $0.25
+riterman: folds 
+SONAG777: raises $0.25 to $0.50
+medinaceli2: calls $0.25
+*** TURN *** [Ac 7d 8d] [Jc]
+medinaceli2: checks 
+SONAG777: bets $0.50
+medinaceli2: calls $0.50
+*** RIVER *** [Ac 7d 8d Jc] [Ad]
+medinaceli2: checks 
+SONAG777: checks 
+*** SHOW DOWN ***
+medinaceli2: shows [2d 6d] (a flush, Ace high)
+SONAG777: mucks hand 
+medinaceli2 collected $2.65 from pot
+*** SUMMARY ***
+Total pot $2.75 | Rake $0.10 
+Board [Ac 7d 8d Jc Ad]
+Seat 1: yyyAA folded before Flop (didn't bet)
+Seat 2: SONAG777 (button) mucked [7c 8s]
+Seat 3: medinaceli2 (small blind) showed [2d 6d] and won ($2.65) with a flush, Ace high
+Seat 4: riterman (big blind) folded on the Flop
+Seat 6: surething folded before Flop (didn't bet)
+
+
+
+PokerStars Game #39692083720:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 13:01:18 ET
+Table 'Triton IV' 6-max Seat #3 is the button
+Seat 1: yyyAA ($8 in chips) 
+Seat 2: SONAG777 ($10.95 in chips) 
+Seat 3: medinaceli2 ($48.05 in chips) 
+Seat 4: riterman ($11.20 in chips) 
+Seat 6: surething ($13.05 in chips) 
+riterman: posts small blind $0.10
+surething: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [2h 6c]
+yyyAA: folds 
+SONAG777: calls $0.25
+medinaceli2: folds 
+GavinRich joins the table at seat #5 
+riterman: folds 
+surething: checks 
+*** FLOP *** [6h Ah Qs]
+surething: checks 
+SONAG777: checks 
+*** TURN *** [6h Ah Qs] [8s]
+surething: bets $0.50
+SONAG777: calls $0.50
+*** RIVER *** [6h Ah Qs 8s] [4c]
+surething: checks 
+SONAG777: checks 
+*** SHOW DOWN ***
+surething: shows [2h 6c] (a pair of Sixes)
+SONAG777: shows [8h Td] (a pair of Eights)
+SONAG777 collected $1.55 from pot
+*** SUMMARY ***
+Total pot $1.60 | Rake $0.05 
+Board [6h Ah Qs 8s 4c]
+Seat 1: yyyAA folded before Flop (didn't bet)
+Seat 2: SONAG777 showed [8h Td] and won ($1.55) with a pair of Eights
+Seat 3: medinaceli2 (button) folded before Flop (didn't bet)
+Seat 4: riterman (small blind) folded before Flop
+Seat 6: surething (big blind) showed [2h 6c] and lost with a pair of Sixes
+
+
+
+PokerStars Game #39692108865:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 13:01:54 ET
+Table 'Triton IV' 6-max Seat #4 is the button
+Seat 1: yyyAA ($8 in chips) 
+Seat 2: SONAG777 ($11.75 in chips) 
+Seat 3: medinaceli2 ($48.05 in chips) 
+Seat 4: riterman ($11.10 in chips) 
+Seat 6: surething ($12.30 in chips) 
+GavinRich will be allowed to play after the button
+surething: posts small blind $0.10
+yyyAA: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [Jc 2h]
+SONAG777: folds 
+medinaceli2: folds 
+riterman has timed out
+riterman: folds 
+surething: folds 
+Uncalled bet ($0.15) returned to yyyAA
+yyyAA collected $0.20 from pot
+*** SUMMARY ***
+Total pot $0.20 | Rake $0 
+Seat 1: yyyAA (big blind) collected ($0.20)
+Seat 2: SONAG777 folded before Flop (didn't bet)
+Seat 3: medinaceli2 folded before Flop (didn't bet)
+Seat 4: riterman (button) folded before Flop (didn't bet)
+Seat 6: surething (small blind) folded before Flop
+
+
+
+PokerStars Game #39692128751:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 13:02:21 ET
+Table 'Triton IV' 6-max Seat #6 is the button
+Seat 1: yyyAA ($8.10 in chips) 
+Seat 2: SONAG777 ($11.75 in chips) 
+Seat 3: medinaceli2 ($48.05 in chips) 
+Seat 4: riterman ($11.10 in chips) 
+Seat 5: GavinRich ($4.85 in chips) 
+Seat 6: surething ($12.20 in chips) 
+yyyAA: posts small blind $0.10
+SONAG777: posts big blind $0.25
+GavinRich: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [7c 5s]
+medinaceli2: raises $0.25 to $0.50
+riterman: folds 
+GavinRich: calls $0.25
+surething: folds 
+yyyAA: calls $0.40
+SONAG777: calls $0.25
+*** FLOP *** [7h 4h 6d]
+yyyAA: checks 
+SONAG777: checks 
+medinaceli2: checks 
+GavinRich: checks 
+*** TURN *** [7h 4h 6d] [5h]
+yyyAA: bets $0.50
+SONAG777: folds 
+medinaceli2: folds 
+GavinRich: calls $0.50
+*** RIVER *** [7h 4h 6d 5h] [3h]
+yyyAA: bets $0.50
+GavinRich: raises $0.50 to $1
+yyyAA: calls $0.50
+*** SHOW DOWN ***
+GavinRich: shows [Ts 8d] (a straight, Four to Eight)
+yyyAA: shows [Ah 5c] (a flush, Ace high)
+yyyAA collected $4.80 from pot
+*** SUMMARY ***
+Total pot $5 | Rake $0.20 
+Board [7h 4h 6d 5h 3h]
+Seat 1: yyyAA (small blind) showed [Ah 5c] and won ($4.80) with a flush, Ace high
+Seat 2: SONAG777 (big blind) folded on the Turn
+Seat 3: medinaceli2 folded on the Turn
+Seat 4: riterman folded before Flop (didn't bet)
+Seat 5: GavinRich showed [Ts 8d] and lost with a straight, Four to Eight
+Seat 6: surething (button) folded before Flop (didn't bet)
+
+
+
+PokerStars Game #39692163067:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 13:03:05 ET
+Table 'Triton IV' 6-max Seat #1 is the button
+Seat 1: yyyAA ($10.90 in chips) 
+Seat 2: SONAG777 ($11.25 in chips) 
+Seat 3: medinaceli2 ($47.55 in chips) 
+Seat 4: riterman ($11.10 in chips) 
+Seat 5: GavinRich ($2.85 in chips) 
+Seat 6: surething ($12.20 in chips) 
+SONAG777: posts small blind $0.10
+medinaceli2: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [2h Qh]
+riterman: folds 
+GavinRich: calls $0.25
+surething: folds 
+yyyAA: raises $0.25 to $0.50
+SONAG777: folds 
+medinaceli2: calls $0.25
+GavinRich: calls $0.25
+*** FLOP *** [9s Kc 3d]
+medinaceli2: checks 
+GavinRich: checks 
+yyyAA: bets $0.25
+medinaceli2: calls $0.25
+GavinRich: folds 
+*** TURN *** [9s Kc 3d] [Js]
+medinaceli2: checks 
+yyyAA: bets $0.50
+medinaceli2: calls $0.50
+*** RIVER *** [9s Kc 3d Js] [8s]
+medinaceli2: checks 
+yyyAA: bets $0.50
+medinaceli2: folds 
+Uncalled bet ($0.50) returned to yyyAA
+yyyAA collected $2.95 from pot
+*** SUMMARY ***
+Total pot $3.10 | Rake $0.15 
+Board [9s Kc 3d Js 8s]
+Seat 1: yyyAA (button) collected ($2.95)
+Seat 2: SONAG777 (small blind) folded before Flop
+Seat 3: medinaceli2 (big blind) folded on the River
+Seat 4: riterman folded before Flop (didn't bet)
+Seat 5: GavinRich folded on the Flop
+Seat 6: surething folded before Flop (didn't bet)
+
+
+
+PokerStars Game #39692229360:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 13:04:31 ET
+Table 'Triton IV' 6-max Seat #2 is the button
+Seat 1: yyyAA ($12.60 in chips) 
+Seat 2: SONAG777 ($11.15 in chips) 
+Seat 3: medinaceli2 ($46.30 in chips) 
+Seat 4: riterman ($11.10 in chips) 
+Seat 5: GavinRich ($2.35 in chips) 
+Seat 6: surething ($12.20 in chips) 
+medinaceli2: posts small blind $0.10
+riterman: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [3c As]
+GavinRich: calls $0.25
+surething: folds 
+yyyAA: folds 
+SONAG777: folds 
+medinaceli2: calls $0.15
+riterman: checks 
+*** FLOP *** [Qd 9c 2h]
+medinaceli2: bets $0.25
+riterman: folds 
+GavinRich: calls $0.25
+*** TURN *** [Qd 9c 2h] [3h]
+medinaceli2: checks 
+GavinRich: checks 
+*** RIVER *** [Qd 9c 2h 3h] [Tc]
+medinaceli2: checks 
+GavinRich: bets $0.50
+medinaceli2: folds 
+Uncalled bet ($0.50) returned to GavinRich
+GavinRich collected $1.20 from pot
+*** SUMMARY ***
+Total pot $1.25 | Rake $0.05 
+Board [Qd 9c 2h 3h Tc]
+Seat 1: yyyAA folded before Flop (didn't bet)
+Seat 2: SONAG777 (button) folded before Flop (didn't bet)
+Seat 3: medinaceli2 (small blind) folded on the River
+Seat 4: riterman (big blind) folded on the Flop
+Seat 5: GavinRich collected ($1.20)
+Seat 6: surething folded before Flop (didn't bet)
+
+
+

From 857c7f524d808c2246c0ddf2738b279decc9398f Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sun, 14 Feb 2010 23:54:19 +0800
Subject: [PATCH 246/320] PokerStarsToFpdb - regex fix for actions

sqlcoder had a hh file containing

"playername: folds " - ie with a space on the end.
---
 pyfpdb/PokerStarsToFpdb.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
index 90a8bfd0..21246b12 100755
--- a/pyfpdb/PokerStarsToFpdb.py
+++ b/pyfpdb/PokerStarsToFpdb.py
@@ -101,7 +101,7 @@ class PokerStars(HandHistoryConverter):
             self.re_PostBoth         = re.compile(r"^%(PLYR)s: posts small \& big blinds %(CUR)s(?P<SBBB>[.0-9]+)" %  subst, re.MULTILINE)
             self.re_HeroCards        = re.compile(r"^Dealt to %(PLYR)s(?: \[(?P<OLDCARDS>.+?)\])?( \[(?P<NEWCARDS>.+?)\])" % subst, re.MULTILINE)
             self.re_Action           = re.compile(r"""
-                        ^%(PLYR)s:(?P<ATYPE>\sbets|\schecks|\sraises|\scalls|\sfolds|\sdiscards|\sstands\spat)
+                        ^%(PLYR)s:(?P<ATYPE>\sbets|\schecks|\sraises|\scalls|\sfolds|\sdiscards|\sstands\spat)\s?
                         (\s(%(CUR)s)?(?P<BET>[.\d]+))?(\sto\s%(CUR)s(?P<BETTO>[.\d]+))?  # the number discarded goes in <BET>
                         (\scards?(\s\[(?P<DISCARDED>.+?)\])?)?$"""
                          %  subst, re.MULTILINE|re.VERBOSE)
@@ -336,6 +336,7 @@ class PokerStars(HandHistoryConverter):
         m = self.re_Action.finditer(hand.streets[street])
         for action in m:
             acts = action.groupdict()
+            #print "DEBUG: acts: %s" %acts
             if action.group('ATYPE') == ' raises':
                 hand.addRaiseBy( street, action.group('PNAME'), action.group('BET') )
             elif action.group('ATYPE') == ' calls':

From d37f301b1060a24567731819137d60df131c1b54 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Mon, 15 Feb 2010 00:01:36 +0800
Subject: [PATCH 247/320] Revert "a wtsd fix, but figures looks further out if
 anything now. see riterman in FLHE_6max_sawflop_wrong.txt for an example
 where street1seen is still not set"

This reverts commit 6814538594bb56faaf7d0234fae4ea426d5e90a0.
---
 pyfpdb/DerivedStats.py                        |    9 +-
 .../cash/Stars/Flop/FLHE_6max_mult_calls.txt  |   49 -
 .../Stars/Flop/FLHE_6max_sawflop_wrong.txt    |   41 -
 .../Stars/Flop/FLHE_6max_sawflop_wrong2.txt   |   38 -
 .../cash/Stars/Flop/FLHE_6max_wtsd_wrong.txt  | 1516 -----------------
 5 files changed, 1 insertion(+), 1652 deletions(-)
 delete mode 100755 pyfpdb/regression-test-files/cash/Stars/Flop/FLHE_6max_mult_calls.txt
 delete mode 100755 pyfpdb/regression-test-files/cash/Stars/Flop/FLHE_6max_sawflop_wrong.txt
 delete mode 100755 pyfpdb/regression-test-files/cash/Stars/Flop/FLHE_6max_sawflop_wrong2.txt
 delete mode 100755 pyfpdb/regression-test-files/cash/Stars/Flop/FLHE_6max_wtsd_wrong.txt

diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py
index 6084de28..23f1f99c 100644
--- a/pyfpdb/DerivedStats.py
+++ b/pyfpdb/DerivedStats.py
@@ -264,10 +264,6 @@ class DerivedStats():
         if self.hands['playersAtShowdown'] > 1:
             for player in pas:
                 self.handsplayers[player]['sawShowdown'] = True
-                # streetXseenFix: streetXseen values miss out streets that were checked through,
-                # make sure all are set if showdown is seen
-                for i in xrange(1, len(hand.actionStreets)-1):
-                    self.handsplayers[player]['street%sSeen' % i] = True
 
     def streetXRaises(self, hand):
         # self.actions[street] is a list of all actions in a tuple, contining the action as the second element
@@ -379,10 +375,7 @@ class DerivedStats():
 
         for player in hand.players:
             if player[1] in pas:
-                # streetXseenFix: streetXseen values miss out streets that were checked through,
-                # make sure earlier ones are set if action on later street
-                for j in xrange(1,i+1):
-                    self.handsplayers[player[1]]['street%sSeen' % j] = True
+                self.handsplayers[player[1]]['street%sSeen' % i] = True
             else:
                 self.handsplayers[player[1]]['street%sSeen' % i] = False
 
diff --git a/pyfpdb/regression-test-files/cash/Stars/Flop/FLHE_6max_mult_calls.txt b/pyfpdb/regression-test-files/cash/Stars/Flop/FLHE_6max_mult_calls.txt
deleted file mode 100755
index 87d226da..00000000
--- a/pyfpdb/regression-test-files/cash/Stars/Flop/FLHE_6max_mult_calls.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-PokerStars Game #39691143951:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:39:47 ET
-Table 'Triton IV' 6-max Seat #6 is the button
-Seat 1: vit-ivanov ($12.60 in chips) 
-Seat 2: Sub_Se7enxxx ($7 in chips) 
-Seat 3: OK @ PB ($17.70 in chips) 
-Seat 4: riterman ($7.90 in chips) 
-Seat 5: Slaviyaka ($13.85 in chips) 
-Seat 6: surething ($9.65 in chips) 
-vit-ivanov: posts small blind $0.10
-Sub_Se7enxxx: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [3s 7c]
-OK @ PB: calls $0.25
-riterman: raises $0.25 to $0.50
-Slaviyaka: folds 
-surething: folds 
-vit-ivanov: folds 
-Sub_Se7enxxx: calls $0.25
-OK @ PB: calls $0.25
-*** FLOP *** [9d 8h 3d]
-Sub_Se7enxxx: bets $0.25
-OK @ PB: calls $0.25
-riterman: raises $0.25 to $0.50
-Sub_Se7enxxx: folds 
-OK @ PB: calls $0.25
-*** TURN *** [9d 8h 3d] [7d]
-OK @ PB: checks 
-riterman: bets $0.50
-OK @ PB: raises $0.50 to $1
-riterman: calls $0.50
-*** RIVER *** [9d 8h 3d 7d] [Kh]
-OK @ PB: bets $0.50
-riterman: calls $0.50
-*** SHOW DOWN ***
-OK @ PB: shows [9c 8d] (two pair, Nines and Eights)
-riterman: shows [Kd Kc] (three of a kind, Kings)
-riterman collected $5.60 from pot
-*** SUMMARY ***
-Total pot $5.85 | Rake $0.25 
-Board [9d 8h 3d 7d Kh]
-Seat 1: vit-ivanov (small blind) folded before Flop
-Seat 2: Sub_Se7enxxx (big blind) folded on the Flop
-Seat 3: OK @ PB showed [9c 8d] and lost with two pair, Nines and Eights
-Seat 4: riterman showed [Kd Kc] and won ($5.60) with three of a kind, Kings
-Seat 5: Slaviyaka folded before Flop (didn't bet)
-Seat 6: surething (button) folded before Flop (didn't bet)
-
diff --git a/pyfpdb/regression-test-files/cash/Stars/Flop/FLHE_6max_sawflop_wrong.txt b/pyfpdb/regression-test-files/cash/Stars/Flop/FLHE_6max_sawflop_wrong.txt
deleted file mode 100755
index b14176e3..00000000
--- a/pyfpdb/regression-test-files/cash/Stars/Flop/FLHE_6max_sawflop_wrong.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-PokerStars Game #39691607275:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:49:45 ET
-Table 'Triton IV' 6-max Seat #2 is the button
-Seat 1: vit-ivanov ($16.25 in chips) 
-Seat 2: SONAG777 ($1.25 in chips) 
-Seat 4: riterman ($11.40 in chips) 
-Seat 5: Slaviyaka ($13.60 in chips) 
-Seat 6: surething ($9.50 in chips) 
-riterman: posts small blind $0.10
-Slaviyaka: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [6d 9c]
-surething: folds 
-vit-ivanov: folds 
-SONAG777: folds 
-riterman: calls $0.15
-Slaviyaka: checks 
-*** FLOP *** [Ks 5d Ah]
-riterman: checks 
-Slaviyaka: checks 
-*** TURN *** [Ks 5d Ah] [6s]
-riterman: bets $0.50
-Slaviyaka: calls $0.50
-*** RIVER *** [Ks 5d Ah 6s] [Kd]
-riterman: checks 
-Slaviyaka: bets $0.50
-riterman: calls $0.50
-*** SHOW DOWN ***
-Slaviyaka: shows [8s Qs] (a pair of Kings)
-riterman: shows [9s 6c] (two pair, Kings and Sixes)
-riterman collected $2.40 from pot
-*** SUMMARY ***
-Total pot $2.50 | Rake $0.10 
-Board [Ks 5d Ah 6s Kd]
-Seat 1: vit-ivanov folded before Flop (didn't bet)
-Seat 2: SONAG777 (button) folded before Flop (didn't bet)
-Seat 4: riterman (small blind) showed [9s 6c] and won ($2.40) with two pair, Kings and Sixes
-Seat 5: Slaviyaka (big blind) showed [8s Qs] and lost with a pair of Kings
-Seat 6: surething folded before Flop (didn't bet)
-
diff --git a/pyfpdb/regression-test-files/cash/Stars/Flop/FLHE_6max_sawflop_wrong2.txt b/pyfpdb/regression-test-files/cash/Stars/Flop/FLHE_6max_sawflop_wrong2.txt
deleted file mode 100755
index a608919d..00000000
--- a/pyfpdb/regression-test-files/cash/Stars/Flop/FLHE_6max_sawflop_wrong2.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-PokerStars Game #39691211280:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:41:15 ET
-Table 'Triton IV' 6-max Seat #2 is the button
-Seat 1: vit-ivanov ($12.50 in chips) 
-Seat 2: Sub_Se7enxxx ($7.20 in chips) 
-Seat 3: OK @ PB ($14.95 in chips) 
-Seat 4: riterman ($10.25 in chips) 
-Seat 5: Slaviyaka ($13.85 in chips) 
-Seat 6: surething ($9.65 in chips) 
-OK @ PB: posts small blind $0.10
-riterman: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [6h 7s]
-Slaviyaka: folds 
-surething: folds 
-vit-ivanov: raises $0.25 to $0.50
-Sub_Se7enxxx: folds 
-Sub_Se7enxxx leaves the table
-OK @ PB: folds 
-riterman: calls $0.25
-*** FLOP *** [Ac Kh 2d]
-riterman: checks 
-vit-ivanov: bets $0.25
-riterman: folds 
-Uncalled bet ($0.25) returned to vit-ivanov
-vit-ivanov collected $1.05 from pot
-vit-ivanov: doesn't show hand 
-*** SUMMARY ***
-Total pot $1.10 | Rake $0.05 
-Board [Ac Kh 2d]
-Seat 1: vit-ivanov collected ($1.05)
-Seat 2: Sub_Se7enxxx (button) folded before Flop (didn't bet)
-Seat 3: OK @ PB (small blind) folded before Flop
-Seat 4: riterman (big blind) folded on the Flop
-Seat 5: Slaviyaka folded before Flop (didn't bet)
-Seat 6: surething folded before Flop (didn't bet)
-
diff --git a/pyfpdb/regression-test-files/cash/Stars/Flop/FLHE_6max_wtsd_wrong.txt b/pyfpdb/regression-test-files/cash/Stars/Flop/FLHE_6max_wtsd_wrong.txt
deleted file mode 100755
index ec67cc9f..00000000
--- a/pyfpdb/regression-test-files/cash/Stars/Flop/FLHE_6max_wtsd_wrong.txt
+++ /dev/null
@@ -1,1516 +0,0 @@
-PokerStars Game #39691083604:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:38:28 ET
-Table 'Triton IV' 6-max Seat #4 is the button
-Seat 1: vit-ivanov ($12.85 in chips) 
-Seat 2: Sub_Se7enxxx ($6.05 in chips) 
-Seat 3: OK @ PB ($17.95 in chips) 
-Seat 4: riterman ($7.90 in chips) 
-Seat 5: Slaviyaka ($13.95 in chips) 
-Seat 6: surething ($10 in chips) 
-Slaviyaka: posts small blind $0.10
-surething: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [5h Jc]
-vit-ivanov: folds 
-Sub_Se7enxxx: raises $0.25 to $0.50
-OK @ PB has timed out
-OK @ PB: folds 
-riterman: folds 
-Slaviyaka: folds 
-surething: folds 
-Uncalled bet ($0.25) returned to Sub_Se7enxxx
-Sub_Se7enxxx collected $0.60 from pot
-*** SUMMARY ***
-Total pot $0.60 | Rake $0 
-Seat 1: vit-ivanov folded before Flop (didn't bet)
-Seat 2: Sub_Se7enxxx collected ($0.60)
-Seat 3: OK @ PB folded before Flop (didn't bet)
-Seat 4: riterman (button) folded before Flop (didn't bet)
-Seat 5: Slaviyaka (small blind) folded before Flop
-Seat 6: surething (big blind) folded before Flop
-
-
-
-PokerStars Game #39691117574:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:39:13 ET
-Table 'Triton IV' 6-max Seat #5 is the button
-Seat 1: vit-ivanov ($12.85 in chips) 
-Seat 2: Sub_Se7enxxx ($6.40 in chips) 
-Seat 3: OK @ PB ($17.95 in chips) 
-Seat 4: riterman ($7.90 in chips) 
-Seat 5: Slaviyaka ($13.85 in chips) 
-Seat 6: surething ($9.75 in chips) 
-surething: posts small blind $0.10
-vit-ivanov: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [9c 2s]
-Sub_Se7enxxx: calls $0.25
-OK @ PB: calls $0.25
-riterman: folds 
-Slaviyaka: folds 
-surething: folds 
-vit-ivanov: checks 
-*** FLOP *** [3c Qc Ad]
-vit-ivanov: checks 
-Sub_Se7enxxx: bets $0.25
-OK @ PB: folds 
-vit-ivanov: folds 
-Uncalled bet ($0.25) returned to Sub_Se7enxxx
-Sub_Se7enxxx collected $0.85 from pot
-*** SUMMARY ***
-Total pot $0.85 | Rake $0 
-Board [3c Qc Ad]
-Seat 1: vit-ivanov (big blind) folded on the Flop
-Seat 2: Sub_Se7enxxx collected ($0.85)
-Seat 3: OK @ PB folded on the Flop
-Seat 4: riterman folded before Flop (didn't bet)
-Seat 5: Slaviyaka (button) folded before Flop (didn't bet)
-Seat 6: surething (small blind) folded before Flop
-
-
-
-PokerStars Game #39691143951:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:39:47 ET
-Table 'Triton IV' 6-max Seat #6 is the button
-Seat 1: vit-ivanov ($12.60 in chips) 
-Seat 2: Sub_Se7enxxx ($7 in chips) 
-Seat 3: OK @ PB ($17.70 in chips) 
-Seat 4: riterman ($7.90 in chips) 
-Seat 5: Slaviyaka ($13.85 in chips) 
-Seat 6: surething ($9.65 in chips) 
-vit-ivanov: posts small blind $0.10
-Sub_Se7enxxx: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [3s 7c]
-OK @ PB: calls $0.25
-riterman: raises $0.25 to $0.50
-Slaviyaka: folds 
-surething: folds 
-vit-ivanov: folds 
-Sub_Se7enxxx: calls $0.25
-OK @ PB: calls $0.25
-*** FLOP *** [9d 8h 3d]
-Sub_Se7enxxx: bets $0.25
-OK @ PB: calls $0.25
-riterman: raises $0.25 to $0.50
-Sub_Se7enxxx: folds 
-OK @ PB: calls $0.25
-*** TURN *** [9d 8h 3d] [7d]
-OK @ PB: checks 
-riterman: bets $0.50
-OK @ PB: raises $0.50 to $1
-riterman: calls $0.50
-*** RIVER *** [9d 8h 3d 7d] [Kh]
-OK @ PB: bets $0.50
-riterman: calls $0.50
-*** SHOW DOWN ***
-OK @ PB: shows [9c 8d] (two pair, Nines and Eights)
-riterman: shows [Kd Kc] (three of a kind, Kings)
-riterman collected $5.60 from pot
-*** SUMMARY ***
-Total pot $5.85 | Rake $0.25 
-Board [9d 8h 3d 7d Kh]
-Seat 1: vit-ivanov (small blind) folded before Flop
-Seat 2: Sub_Se7enxxx (big blind) folded on the Flop
-Seat 3: OK @ PB showed [9c 8d] and lost with two pair, Nines and Eights
-Seat 4: riterman showed [Kd Kc] and won ($5.60) with three of a kind, Kings
-Seat 5: Slaviyaka folded before Flop (didn't bet)
-Seat 6: surething (button) folded before Flop (didn't bet)
-
-
-
-PokerStars Game #39691184552:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:40:40 ET
-Table 'Triton IV' 6-max Seat #1 is the button
-Seat 1: vit-ivanov ($12.50 in chips) 
-Seat 2: Sub_Se7enxxx ($6.25 in chips) 
-Seat 3: OK @ PB ($15.20 in chips) 
-Seat 4: riterman ($11 in chips) 
-Seat 5: Slaviyaka ($13.85 in chips) 
-Seat 6: surething ($9.65 in chips) 
-Sub_Se7enxxx: posts small blind $0.10
-OK @ PB: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [7h Ks]
-riterman: raises $0.25 to $0.50
-Slaviyaka: folds 
-surething: folds 
-vit-ivanov: folds 
-Sub_Se7enxxx: calls $0.40
-OK @ PB: folds 
-*** FLOP *** [Kh Qh 5h]
-Sub_Se7enxxx: bets $0.25
-riterman: calls $0.25
-*** TURN *** [Kh Qh 5h] [3s]
-Sub_Se7enxxx: bets $0.50
-riterman: folds 
-Uncalled bet ($0.50) returned to Sub_Se7enxxx
-Sub_Se7enxxx collected $1.70 from pot
-*** SUMMARY ***
-Total pot $1.75 | Rake $0.05 
-Board [Kh Qh 5h 3s]
-Seat 1: vit-ivanov (button) folded before Flop (didn't bet)
-Seat 2: Sub_Se7enxxx (small blind) collected ($1.70)
-Seat 3: OK @ PB (big blind) folded before Flop
-Seat 4: riterman folded on the Turn
-Seat 5: Slaviyaka folded before Flop (didn't bet)
-Seat 6: surething folded before Flop (didn't bet)
-
-
-
-PokerStars Game #39691211280:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:41:15 ET
-Table 'Triton IV' 6-max Seat #2 is the button
-Seat 1: vit-ivanov ($12.50 in chips) 
-Seat 2: Sub_Se7enxxx ($7.20 in chips) 
-Seat 3: OK @ PB ($14.95 in chips) 
-Seat 4: riterman ($10.25 in chips) 
-Seat 5: Slaviyaka ($13.85 in chips) 
-Seat 6: surething ($9.65 in chips) 
-OK @ PB: posts small blind $0.10
-riterman: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [6h 7s]
-Slaviyaka: folds 
-surething: folds 
-vit-ivanov: raises $0.25 to $0.50
-Sub_Se7enxxx: folds 
-Sub_Se7enxxx leaves the table
-OK @ PB: folds 
-riterman: calls $0.25
-*** FLOP *** [Ac Kh 2d]
-riterman: checks 
-vit-ivanov: bets $0.25
-riterman: folds 
-Uncalled bet ($0.25) returned to vit-ivanov
-vit-ivanov collected $1.05 from pot
-vit-ivanov: doesn't show hand 
-*** SUMMARY ***
-Total pot $1.10 | Rake $0.05 
-Board [Ac Kh 2d]
-Seat 1: vit-ivanov collected ($1.05)
-Seat 2: Sub_Se7enxxx (button) folded before Flop (didn't bet)
-Seat 3: OK @ PB (small blind) folded before Flop
-Seat 4: riterman (big blind) folded on the Flop
-Seat 5: Slaviyaka folded before Flop (didn't bet)
-Seat 6: surething folded before Flop (didn't bet)
-
-
-
-PokerStars Game #39691239523:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:41:52 ET
-Table 'Triton IV' 6-max Seat #3 is the button
-Seat 1: vit-ivanov ($13.05 in chips) 
-Seat 3: OK @ PB ($14.85 in chips) 
-Seat 5: Slaviyaka ($13.85 in chips) 
-Seat 6: surething ($9.65 in chips) 
-riterman: is sitting out 
-Slaviyaka: posts small blind $0.10
-surething: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [2c Jh]
-vit-ivanov: folds 
-OK @ PB: calls $0.25
-Slaviyaka: calls $0.15
-surething: checks 
-*** FLOP *** [5s 4d Qh]
-Slaviyaka: checks 
-surething: checks 
-OK @ PB: bets $0.25
-Slaviyaka: folds 
-surething: calls $0.25
-*** TURN *** [5s 4d Qh] [Ks]
-surething: checks 
-OK @ PB: bets $0.50
-surething: folds 
-Uncalled bet ($0.50) returned to OK @ PB
-OK @ PB collected $1.20 from pot
-*** SUMMARY ***
-Total pot $1.25 | Rake $0.05 
-Board [5s 4d Qh Ks]
-Seat 1: vit-ivanov folded before Flop (didn't bet)
-Seat 3: OK @ PB (button) collected ($1.20)
-Seat 5: Slaviyaka (small blind) folded on the Flop
-Seat 6: surething (big blind) folded on the Turn
-
-
-
-PokerStars Game #39691267062:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:42:26 ET
-Table 'Triton IV' 6-max Seat #5 is the button
-Seat 1: vit-ivanov ($13.05 in chips) 
-Seat 3: OK @ PB ($15.55 in chips) 
-Seat 4: riterman ($9.75 in chips) 
-Seat 5: Slaviyaka ($13.60 in chips) 
-Seat 6: surething ($9.15 in chips) 
-surething: posts small blind $0.10
-vit-ivanov: posts big blind $0.25
-riterman: posts small blind $0.10
-*** HOLE CARDS ***
-Dealt to surething [Td 5d]
-OK @ PB: calls $0.25
-riterman: folds 
-Slaviyaka: folds 
-surething: folds 
-vit-ivanov: checks 
-*** FLOP *** [Qs 8h Kc]
-vit-ivanov: checks 
-OK @ PB: bets $0.25
-vit-ivanov: calls $0.25
-*** TURN *** [Qs 8h Kc] [6s]
-SONAG777 joins the table at seat #2 
-vit-ivanov: checks 
-OK @ PB: bets $0.50
-vit-ivanov: folds 
-Uncalled bet ($0.50) returned to OK @ PB
-OK @ PB collected $1.15 from pot
-*** SUMMARY ***
-Total pot $1.20 | Rake $0.05 
-Board [Qs 8h Kc 6s]
-Seat 1: vit-ivanov (big blind) folded on the Turn
-Seat 3: OK @ PB collected ($1.15)
-Seat 4: riterman folded before Flop
-Seat 5: Slaviyaka (button) folded before Flop (didn't bet)
-Seat 6: surething (small blind) folded before Flop
-
-
-
-PokerStars Game #39691296821:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:43:05 ET
-Table 'Triton IV' 6-max Seat #6 is the button
-Seat 1: vit-ivanov ($12.55 in chips) 
-Seat 2: SONAG777 ($4.15 in chips) 
-Seat 3: OK @ PB ($16.20 in chips) 
-Seat 4: riterman ($9.65 in chips) 
-Seat 5: Slaviyaka ($13.60 in chips) 
-Seat 6: surething ($9.05 in chips) 
-vit-ivanov: posts small blind $0.10
-SONAG777: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [6h Js]
-OK @ PB: calls $0.25
-riterman: calls $0.25
-Slaviyaka: folds 
-surething: folds 
-vit-ivanov: calls $0.15
-SONAG777: checks 
-*** FLOP *** [Qc 4s 2c]
-vit-ivanov: bets $0.25
-SONAG777: calls $0.25
-OK @ PB: folds 
-riterman: folds 
-*** TURN *** [Qc 4s 2c] [8h]
-vit-ivanov: bets $0.50
-SONAG777: calls $0.50
-*** RIVER *** [Qc 4s 2c 8h] [9c]
-vit-ivanov: bets $0.50
-SONAG777: folds 
-Uncalled bet ($0.50) returned to vit-ivanov
-vit-ivanov collected $2.40 from pot
-vit-ivanov: doesn't show hand 
-*** SUMMARY ***
-Total pot $2.50 | Rake $0.10 
-Board [Qc 4s 2c 8h 9c]
-Seat 1: vit-ivanov (small blind) collected ($2.40)
-Seat 2: SONAG777 (big blind) folded on the River
-Seat 3: OK @ PB folded on the Flop
-Seat 4: riterman folded on the Flop
-Seat 5: Slaviyaka folded before Flop (didn't bet)
-Seat 6: surething (button) folded before Flop (didn't bet)
-
-
-
-PokerStars Game #39691327754:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:43:45 ET
-Table 'Triton IV' 6-max Seat #1 is the button
-Seat 1: vit-ivanov ($13.95 in chips) 
-Seat 2: SONAG777 ($3.15 in chips) 
-Seat 3: OK @ PB ($15.95 in chips) 
-Seat 4: riterman ($9.40 in chips) 
-Seat 5: Slaviyaka ($13.60 in chips) 
-Seat 6: surething ($9.05 in chips) 
-SONAG777: posts small blind $0.10
-OK @ PB: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [Th 7d]
-riterman: folds 
-Slaviyaka: folds 
-surething: folds 
-vit-ivanov: folds 
-SONAG777: raises $0.25 to $0.50
-OK @ PB: calls $0.25
-*** FLOP *** [2s Js 6s]
-SONAG777: checks 
-OK @ PB: checks 
-*** TURN *** [2s Js 6s] [Qd]
-SONAG777: checks 
-OK @ PB: checks 
-*** RIVER *** [2s Js 6s Qd] [5s]
-SONAG777: bets $0.50
-OK @ PB: calls $0.50
-*** SHOW DOWN ***
-SONAG777: shows [As Ts] (a flush, Ace high)
-OK @ PB: mucks hand 
-SONAG777 collected $1.95 from pot
-*** SUMMARY ***
-Total pot $2 | Rake $0.05 
-Board [2s Js 6s Qd 5s]
-Seat 1: vit-ivanov (button) folded before Flop (didn't bet)
-Seat 2: SONAG777 (small blind) showed [As Ts] and won ($1.95) with a flush, Ace high
-Seat 3: OK @ PB (big blind) mucked [Ah 9d]
-Seat 4: riterman folded before Flop (didn't bet)
-Seat 5: Slaviyaka folded before Flop (didn't bet)
-Seat 6: surething folded before Flop (didn't bet)
-
-
-
-PokerStars Game #39691348481:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:44:12 ET
-Table 'Triton IV' 6-max Seat #2 is the button
-Seat 1: vit-ivanov ($13.95 in chips) 
-Seat 2: SONAG777 ($4.10 in chips) 
-Seat 3: OK @ PB ($14.95 in chips) 
-Seat 4: riterman ($9.40 in chips) 
-Seat 5: Slaviyaka ($13.60 in chips) 
-Seat 6: surething ($9.05 in chips) 
-OK @ PB: posts small blind $0.10
-riterman: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [6c Js]
-Slaviyaka: folds 
-surething: folds 
-vit-ivanov: folds 
-SONAG777: folds 
-OK @ PB: raises $0.25 to $0.50
-riterman: raises $0.25 to $0.75
-OK @ PB: calls $0.25
-*** FLOP *** [3s Qs 3d]
-OK @ PB: bets $0.25
-riterman: raises $0.25 to $0.50
-OK @ PB: calls $0.25
-*** TURN *** [3s Qs 3d] [7h]
-OK @ PB: bets $0.50
-riterman: raises $0.50 to $1
-OK @ PB: calls $0.50
-*** RIVER *** [3s Qs 3d 7h] [Ks]
-OK @ PB: bets $0.50
-riterman: calls $0.50
-*** SHOW DOWN ***
-OK @ PB: shows [5d As] (a pair of Threes)
-riterman: shows [Ad Qh] (two pair, Queens and Threes)
-riterman collected $5.25 from pot
-*** SUMMARY ***
-Total pot $5.50 | Rake $0.25 
-Board [3s Qs 3d 7h Ks]
-Seat 1: vit-ivanov folded before Flop (didn't bet)
-Seat 2: SONAG777 (button) folded before Flop (didn't bet)
-Seat 3: OK @ PB (small blind) showed [5d As] and lost with a pair of Threes
-Seat 4: riterman (big blind) showed [Ad Qh] and won ($5.25) with two pair, Queens and Threes
-Seat 5: Slaviyaka folded before Flop (didn't bet)
-Seat 6: surething folded before Flop (didn't bet)
-
-
-
-PokerStars Game #39691387427:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:45:02 ET
-Table 'Triton IV' 6-max Seat #3 is the button
-Seat 1: vit-ivanov ($13.95 in chips) 
-Seat 2: SONAG777 ($4.10 in chips) 
-Seat 3: OK @ PB ($12.20 in chips) 
-Seat 4: riterman ($11.90 in chips) 
-Seat 5: Slaviyaka ($13.60 in chips) 
-Seat 6: surething ($9.05 in chips) 
-riterman: posts small blind $0.10
-Slaviyaka: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [7c Ts]
-surething: folds 
-vit-ivanov: folds 
-SONAG777: folds 
-OK @ PB: raises $0.25 to $0.50
-riterman: folds 
-Slaviyaka: folds 
-Uncalled bet ($0.25) returned to OK @ PB
-OK @ PB collected $0.60 from pot
-*** SUMMARY ***
-Total pot $0.60 | Rake $0 
-Seat 1: vit-ivanov folded before Flop (didn't bet)
-Seat 2: SONAG777 folded before Flop (didn't bet)
-Seat 3: OK @ PB (button) collected ($0.60)
-Seat 4: riterman (small blind) folded before Flop
-Seat 5: Slaviyaka (big blind) folded before Flop
-Seat 6: surething folded before Flop (didn't bet)
-
-
-
-PokerStars Game #39691411480:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:45:33 ET
-Table 'Triton IV' 6-max Seat #4 is the button
-Seat 1: vit-ivanov ($13.95 in chips) 
-Seat 2: SONAG777 ($4.10 in chips) 
-Seat 3: OK @ PB ($12.55 in chips) 
-Seat 4: riterman ($11.80 in chips) 
-Seat 5: Slaviyaka ($13.35 in chips) 
-Seat 6: surething ($9.05 in chips) 
-Slaviyaka: posts small blind $0.10
-surething: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [9s 5c]
-vit-ivanov: raises $0.25 to $0.50
-SONAG777: folds 
-OK @ PB: folds 
-riterman: folds 
-OK @ PB leaves the table
-Slaviyaka: folds 
-surething: folds 
-Uncalled bet ($0.25) returned to vit-ivanov
-vit-ivanov collected $0.60 from pot
-vit-ivanov: doesn't show hand 
-*** SUMMARY ***
-Total pot $0.60 | Rake $0 
-Seat 1: vit-ivanov collected ($0.60)
-Seat 2: SONAG777 folded before Flop (didn't bet)
-Seat 3: OK @ PB folded before Flop (didn't bet)
-Seat 4: riterman (button) folded before Flop (didn't bet)
-Seat 5: Slaviyaka (small blind) folded before Flop
-Seat 6: surething (big blind) folded before Flop
-
-
-
-PokerStars Game #39691432966:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:46:01 ET
-Table 'Triton IV' 6-max Seat #5 is the button
-Seat 1: vit-ivanov ($14.30 in chips) 
-Seat 2: SONAG777 ($4.10 in chips) 
-Seat 4: riterman ($11.80 in chips) 
-Seat 5: Slaviyaka ($13.25 in chips) 
-Seat 6: surething ($8.80 in chips) 
-surething: posts small blind $0.10
-vit-ivanov: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [6c Ks]
-SONAG777: folds 
-riterman has timed out
-riterman: folds 
-Slaviyaka: folds 
-surething: raises $0.25 to $0.50
-vit-ivanov: folds 
-Uncalled bet ($0.25) returned to surething
-surething collected $0.50 from pot
-*** SUMMARY ***
-Total pot $0.50 | Rake $0 
-Seat 1: vit-ivanov (big blind) folded before Flop
-Seat 2: SONAG777 folded before Flop (didn't bet)
-Seat 4: riterman folded before Flop (didn't bet)
-Seat 5: Slaviyaka (button) folded before Flop (didn't bet)
-Seat 6: surething (small blind) collected ($0.50)
-
-
-
-PokerStars Game #39691465460:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:46:42 ET
-Table 'Triton IV' 6-max Seat #6 is the button
-Seat 1: vit-ivanov ($14.05 in chips) 
-Seat 2: SONAG777 ($4.10 in chips) 
-Seat 4: riterman ($11.80 in chips) 
-Seat 5: Slaviyaka ($13.25 in chips) 
-Seat 6: surething ($9.05 in chips) 
-vit-ivanov: posts small blind $0.10
-SONAG777: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [9d Jc]
-riterman: folds 
-Slaviyaka: calls $0.25
-surething: folds 
-vit-ivanov: folds 
-SONAG777: checks 
-*** FLOP *** [As Ts Qd]
-SONAG777: checks 
-Slaviyaka: checks 
-*** TURN *** [As Ts Qd] [Td]
-SONAG777: checks 
-Slaviyaka: checks 
-*** RIVER *** [As Ts Qd Td] [7s]
-SONAG777: checks 
-Slaviyaka: checks 
-*** SHOW DOWN ***
-SONAG777: shows [4d Jd] (a pair of Tens)
-Slaviyaka: shows [3d 3h] (two pair, Tens and Threes)
-Slaviyaka collected $0.60 from pot
-*** SUMMARY ***
-Total pot $0.60 | Rake $0 
-Board [As Ts Qd Td 7s]
-Seat 1: vit-ivanov (small blind) folded before Flop
-Seat 2: SONAG777 (big blind) showed [4d Jd] and lost with a pair of Tens
-Seat 4: riterman folded before Flop (didn't bet)
-Seat 5: Slaviyaka showed [3d 3h] and won ($0.60) with two pair, Tens and Threes
-Seat 6: surething (button) folded before Flop (didn't bet)
-
-
-
-PokerStars Game #39691486174:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:47:09 ET
-Table 'Triton IV' 6-max Seat #1 is the button
-Seat 1: vit-ivanov ($13.95 in chips) 
-Seat 2: SONAG777 ($3.85 in chips) 
-Seat 4: riterman ($11.80 in chips) 
-Seat 5: Slaviyaka ($13.60 in chips) 
-Seat 6: surething ($9.05 in chips) 
-SONAG777: posts small blind $0.10
-riterman: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [Th 3h]
-Slaviyaka: folds 
-surething: folds 
-vit-ivanov: folds 
-SONAG777: folds 
-Uncalled bet ($0.15) returned to riterman
-riterman collected $0.20 from pot
-riterman: doesn't show hand 
-*** SUMMARY ***
-Total pot $0.20 | Rake $0 
-Seat 1: vit-ivanov (button) folded before Flop (didn't bet)
-Seat 2: SONAG777 (small blind) folded before Flop
-Seat 4: riterman (big blind) collected ($0.20)
-Seat 5: Slaviyaka folded before Flop (didn't bet)
-Seat 6: surething folded before Flop (didn't bet)
-
-
-
-PokerStars Game #39691496730:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:47:23 ET
-Table 'Triton IV' 6-max Seat #2 is the button
-Seat 1: vit-ivanov ($13.95 in chips) 
-Seat 2: SONAG777 ($3.75 in chips) 
-Seat 4: riterman ($11.90 in chips) 
-Seat 5: Slaviyaka ($13.60 in chips) 
-Seat 6: surething ($9.05 in chips) 
-riterman: posts small blind $0.10
-Slaviyaka: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [Ts 8h]
-surething: folds 
-vit-ivanov: folds 
-SONAG777: folds 
-riterman: folds 
-Uncalled bet ($0.15) returned to Slaviyaka
-Slaviyaka collected $0.20 from pot
-Slaviyaka: doesn't show hand 
-*** SUMMARY ***
-Total pot $0.20 | Rake $0 
-Seat 1: vit-ivanov folded before Flop (didn't bet)
-Seat 2: SONAG777 (button) folded before Flop (didn't bet)
-Seat 4: riterman (small blind) folded before Flop
-Seat 5: Slaviyaka (big blind) collected ($0.20)
-Seat 6: surething folded before Flop (didn't bet)
-
-
-
-PokerStars Game #39691519107:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:47:51 ET
-Table 'Triton IV' 6-max Seat #4 is the button
-Seat 1: vit-ivanov ($13.95 in chips) 
-Seat 2: SONAG777 ($3.75 in chips) 
-Seat 4: riterman ($11.80 in chips) 
-Seat 5: Slaviyaka ($13.70 in chips) 
-Seat 6: surething ($9.05 in chips) 
-Slaviyaka: posts small blind $0.10
-surething: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [Kc Qc]
-vit-ivanov: folds 
-SONAG777: folds 
-riterman: calls $0.25
-Slaviyaka: folds 
-surething: raises $0.25 to $0.50
-riterman: calls $0.25
-*** FLOP *** [4d 8c 6h]
-surething: bets $0.25
-riterman: folds 
-Uncalled bet ($0.25) returned to surething
-surething collected $1.05 from pot
-surething: doesn't show hand 
-*** SUMMARY ***
-Total pot $1.10 | Rake $0.05 
-Board [4d 8c 6h]
-Seat 1: vit-ivanov folded before Flop (didn't bet)
-Seat 2: SONAG777 folded before Flop (didn't bet)
-Seat 4: riterman (button) folded on the Flop
-Seat 5: Slaviyaka (small blind) folded before Flop
-Seat 6: surething (big blind) collected ($1.05)
-
-
-
-PokerStars Game #39691547216:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:48:28 ET
-Table 'Triton IV' 6-max Seat #5 is the button
-Seat 1: vit-ivanov ($13.95 in chips) 
-Seat 2: SONAG777 ($3.75 in chips) 
-Seat 4: riterman ($11.30 in chips) 
-Seat 5: Slaviyaka ($13.60 in chips) 
-Seat 6: surething ($9.60 in chips) 
-surething: posts small blind $0.10
-vit-ivanov: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [9h 4d]
-SONAG777: calls $0.25
-riterman: folds 
-Slaviyaka: folds 
-surething: folds 
-vit-ivanov: checks 
-*** FLOP *** [7s 4h 7c]
-vit-ivanov: bets $0.25
-SONAG777: calls $0.25
-*** TURN *** [7s 4h 7c] [3c]
-vit-ivanov: bets $0.50
-SONAG777: raises $0.50 to $1
-vit-ivanov: raises $0.50 to $1.50
-SONAG777: calls $0.50
-*** RIVER *** [7s 4h 7c 3c] [Ah]
-vit-ivanov: bets $0.50
-SONAG777: calls $0.50
-*** SHOW DOWN ***
-vit-ivanov: shows [6h 5d] (a straight, Three to Seven)
-SONAG777: mucks hand 
-vit-ivanov collected $4.90 from pot
-*** SUMMARY ***
-Total pot $5.10 | Rake $0.20 
-Board [7s 4h 7c 3c Ah]
-Seat 1: vit-ivanov (big blind) showed [6h 5d] and won ($4.90) with a straight, Three to Seven
-Seat 2: SONAG777 mucked [7h 8h]
-Seat 4: riterman folded before Flop (didn't bet)
-Seat 5: Slaviyaka (button) folded before Flop (didn't bet)
-Seat 6: surething (small blind) folded before Flop
-
-
-
-PokerStars Game #39691586292:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:49:18 ET
-Table 'Triton IV' 6-max Seat #6 is the button
-Seat 1: vit-ivanov ($16.35 in chips) 
-Seat 2: SONAG777 ($1.25 in chips) 
-Seat 4: riterman ($11.30 in chips) 
-Seat 5: Slaviyaka ($13.60 in chips) 
-Seat 6: surething ($9.50 in chips) 
-vit-ivanov: posts small blind $0.10
-SONAG777: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [Kh 3c]
-riterman: folds 
-Slaviyaka: folds 
-surething: folds 
-vit-ivanov: folds 
-Uncalled bet ($0.15) returned to SONAG777
-SONAG777 collected $0.20 from pot
-SONAG777: doesn't show hand 
-*** SUMMARY ***
-Total pot $0.20 | Rake $0 
-Seat 1: vit-ivanov (small blind) folded before Flop
-Seat 2: SONAG777 (big blind) collected ($0.20)
-Seat 4: riterman folded before Flop (didn't bet)
-Seat 5: Slaviyaka folded before Flop (didn't bet)
-Seat 6: surething (button) folded before Flop (didn't bet)
-
-
-
-PokerStars Game #39691596912:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:49:32 ET
-Table 'Triton IV' 6-max Seat #1 is the button
-Seat 1: vit-ivanov ($16.25 in chips) 
-Seat 2: SONAG777 ($1.35 in chips) 
-Seat 4: riterman ($11.30 in chips) 
-Seat 5: Slaviyaka ($13.60 in chips) 
-Seat 6: surething ($9.50 in chips) 
-SONAG777: posts small blind $0.10
-riterman: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [7h 6s]
-Slaviyaka: folds 
-surething: folds 
-vit-ivanov: folds 
-SONAG777: folds 
-Uncalled bet ($0.15) returned to riterman
-riterman collected $0.20 from pot
-riterman: doesn't show hand 
-*** SUMMARY ***
-Total pot $0.20 | Rake $0 
-Seat 1: vit-ivanov (button) folded before Flop (didn't bet)
-Seat 2: SONAG777 (small blind) folded before Flop
-Seat 4: riterman (big blind) collected ($0.20)
-Seat 5: Slaviyaka folded before Flop (didn't bet)
-Seat 6: surething folded before Flop (didn't bet)
-
-
-
-PokerStars Game #39691607275:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:49:45 ET
-Table 'Triton IV' 6-max Seat #2 is the button
-Seat 1: vit-ivanov ($16.25 in chips) 
-Seat 2: SONAG777 ($1.25 in chips) 
-Seat 4: riterman ($11.40 in chips) 
-Seat 5: Slaviyaka ($13.60 in chips) 
-Seat 6: surething ($9.50 in chips) 
-riterman: posts small blind $0.10
-Slaviyaka: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [6d 9c]
-surething: folds 
-vit-ivanov: folds 
-SONAG777: folds 
-riterman: calls $0.15
-Slaviyaka: checks 
-*** FLOP *** [Ks 5d Ah]
-riterman: checks 
-Slaviyaka: checks 
-*** TURN *** [Ks 5d Ah] [6s]
-riterman: bets $0.50
-Slaviyaka: calls $0.50
-*** RIVER *** [Ks 5d Ah 6s] [Kd]
-riterman: checks 
-Slaviyaka: bets $0.50
-riterman: calls $0.50
-*** SHOW DOWN ***
-Slaviyaka: shows [8s Qs] (a pair of Kings)
-riterman: shows [9s 6c] (two pair, Kings and Sixes)
-riterman collected $2.40 from pot
-*** SUMMARY ***
-Total pot $2.50 | Rake $0.10 
-Board [Ks 5d Ah 6s Kd]
-Seat 1: vit-ivanov folded before Flop (didn't bet)
-Seat 2: SONAG777 (button) folded before Flop (didn't bet)
-Seat 4: riterman (small blind) showed [9s 6c] and won ($2.40) with two pair, Kings and Sixes
-Seat 5: Slaviyaka (big blind) showed [8s Qs] and lost with a pair of Kings
-Seat 6: surething folded before Flop (didn't bet)
-
-
-
-PokerStars Game #39691801103:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:53:57 ET
-Table 'Triton IV' 6-max Seat #4 is the button
-Seat 2: SONAG777 ($12 in chips) 
-Seat 3: medinaceli2 ($49.15 in chips) 
-Seat 4: riterman ($10.55 in chips) 
-Seat 5: aklsduy28 ($20 in chips) 
-Seat 6: surething ($9.50 in chips) 
-aklsduy28: posts small blind $0.10
-surething: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [2c Jc]
-SONAG777: folds 
-medinaceli2: folds 
-riterman: folds 
-aklsduy28: calls $0.15
-surething: raises $0.25 to $0.50
-aklsduy28: calls $0.25
-*** FLOP *** [Ah Ac 4h]
-aklsduy28: checks 
-surething: bets $0.25
-aklsduy28: folds 
-Uncalled bet ($0.25) returned to surething
-surething collected $0.95 from pot
-surething: doesn't show hand 
-*** SUMMARY ***
-Total pot $1 | Rake $0.05 
-Board [Ah Ac 4h]
-Seat 2: SONAG777 folded before Flop (didn't bet)
-Seat 3: medinaceli2 folded before Flop (didn't bet)
-Seat 4: riterman (button) folded before Flop (didn't bet)
-Seat 5: aklsduy28 (small blind) folded on the Flop
-Seat 6: surething (big blind) collected ($0.95)
-
-
-
-PokerStars Game #39691821986:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:54:24 ET
-Table 'Triton IV' 6-max Seat #5 is the button
-Seat 2: SONAG777 ($12 in chips) 
-Seat 3: medinaceli2 ($49.15 in chips) 
-Seat 4: riterman ($10.55 in chips) 
-Seat 5: aklsduy28 ($19.50 in chips) 
-Seat 6: surething ($9.95 in chips) 
-surething: posts small blind $0.10
-SONAG777: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [Qs 9h]
-medinaceli2: calls $0.25
-riterman: folds 
-aklsduy28: folds 
-surething: folds 
-SONAG777: checks 
-*** FLOP *** [6s 7s 6c]
-SONAG777: checks 
-medinaceli2: bets $0.25
-SONAG777: folds 
-Uncalled bet ($0.25) returned to medinaceli2
-medinaceli2 collected $0.60 from pot
-medinaceli2: doesn't show hand 
-*** SUMMARY ***
-Total pot $0.60 | Rake $0 
-Board [6s 7s 6c]
-Seat 2: SONAG777 (big blind) folded on the Flop
-Seat 3: medinaceli2 collected ($0.60)
-Seat 4: riterman folded before Flop (didn't bet)
-Seat 5: aklsduy28 (button) folded before Flop (didn't bet)
-Seat 6: surething (small blind) folded before Flop
-
-
-
-PokerStars Game #39691843810:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:54:53 ET
-Table 'Triton IV' 6-max Seat #6 is the button
-Seat 2: SONAG777 ($11.75 in chips) 
-Seat 3: medinaceli2 ($49.50 in chips) 
-Seat 4: riterman ($10.55 in chips) 
-Seat 5: aklsduy28 ($19.50 in chips) 
-Seat 6: surething ($9.85 in chips) 
-SONAG777: posts small blind $0.10
-medinaceli2: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [Jd 9d]
-riterman: folds 
-aklsduy28: folds 
-surething: raises $0.25 to $0.50
-SONAG777: calls $0.40
-medinaceli2: calls $0.25
-*** FLOP *** [5c 8d Jh]
-SONAG777: checks 
-medinaceli2: checks 
-surething: bets $0.25
-SONAG777: calls $0.25
-medinaceli2: calls $0.25
-*** TURN *** [5c 8d Jh] [Ac]
-SONAG777: checks 
-medinaceli2: checks 
-surething: checks 
-*** RIVER *** [5c 8d Jh Ac] [4h]
-SONAG777: checks 
-medinaceli2: checks 
-surething: checks 
-*** SHOW DOWN ***
-SONAG777: shows [7d 4d] (a pair of Fours)
-medinaceli2: mucks hand 
-surething: shows [Jd 9d] (a pair of Jacks)
-surething collected $2.15 from pot
-*** SUMMARY ***
-Total pot $2.25 | Rake $0.10 
-Board [5c 8d Jh Ac 4h]
-Seat 2: SONAG777 (small blind) showed [7d 4d] and lost with a pair of Fours
-Seat 3: medinaceli2 (big blind) mucked [7s Qd]
-Seat 4: riterman folded before Flop (didn't bet)
-Seat 5: aklsduy28 folded before Flop (didn't bet)
-Seat 6: surething (button) showed [Jd 9d] and won ($2.15) with a pair of Jacks
-
-
-
-PokerStars Game #39691870299:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:55:31 ET
-Table 'Triton IV' 6-max Seat #2 is the button
-Seat 2: SONAG777 ($11 in chips) 
-Seat 3: medinaceli2 ($48.75 in chips) 
-Seat 4: riterman ($10.55 in chips) 
-Seat 5: aklsduy28 ($19.50 in chips) 
-Seat 6: surething ($11.25 in chips) 
-medinaceli2: posts small blind $0.10
-riterman: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [Jh Tc]
-aklsduy28: folds 
-surething: raises $0.25 to $0.50
-SONAG777: folds 
-medinaceli2: calls $0.40
-riterman: folds 
-*** FLOP *** [5d Th Qd]
-medinaceli2: checks 
-surething: bets $0.25
-medinaceli2: calls $0.25
-*** TURN *** [5d Th Qd] [3c]
-medinaceli2: checks 
-surething: bets $0.50
-medinaceli2: calls $0.50
-*** RIVER *** [5d Th Qd 3c] [Ts]
-medinaceli2: checks 
-surething: bets $0.50
-medinaceli2: folds 
-Uncalled bet ($0.50) returned to surething
-surething collected $2.65 from pot
-surething: doesn't show hand 
-*** SUMMARY ***
-Total pot $2.75 | Rake $0.10 
-Board [5d Th Qd 3c Ts]
-Seat 2: SONAG777 (button) folded before Flop (didn't bet)
-Seat 3: medinaceli2 (small blind) folded on the River
-Seat 4: riterman (big blind) folded before Flop
-Seat 5: aklsduy28 folded before Flop (didn't bet)
-Seat 6: surething collected ($2.65)
-
-
-
-PokerStars Game #39691889933:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:56:04 ET
-Table 'Triton IV' 6-max Seat #3 is the button
-Seat 2: SONAG777 ($11 in chips) 
-Seat 3: medinaceli2 ($47.50 in chips) 
-Seat 4: riterman ($10.30 in chips) 
-Seat 5: aklsduy28 ($19.50 in chips) 
-Seat 6: surething ($12.65 in chips) 
-riterman: posts small blind $0.10
-aklsduy28: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [9s Kh]
-surething: folds 
-SONAG777: folds 
-medinaceli2: calls $0.25
-riterman: calls $0.15
-aklsduy28: checks 
-*** FLOP *** [Td Js 4c]
-riterman: checks 
-aklsduy28: checks 
-medinaceli2: checks 
-*** TURN *** [Td Js 4c] [3d]
-riterman: bets $0.50
-aklsduy28: folds 
-medinaceli2: calls $0.50
-*** RIVER *** [Td Js 4c 3d] [7h]
-riterman: bets $0.50
-medinaceli2: calls $0.50
-*** SHOW DOWN ***
-riterman: shows [3h 4h] (two pair, Fours and Threes)
-medinaceli2: mucks hand 
-riterman collected $2.65 from pot
-*** SUMMARY ***
-Total pot $2.75 | Rake $0.10 
-Board [Td Js 4c 3d 7h]
-Seat 2: SONAG777 folded before Flop (didn't bet)
-Seat 3: medinaceli2 (button) mucked [Ad 3s]
-Seat 4: riterman (small blind) showed [3h 4h] and won ($2.65) with two pair, Fours and Threes
-Seat 5: aklsduy28 (big blind) folded on the Turn
-Seat 6: surething folded before Flop (didn't bet)
-
-
-
-PokerStars Game #39691912877:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:56:42 ET
-Table 'Triton IV' 6-max Seat #4 is the button
-Seat 2: SONAG777 ($11 in chips) 
-Seat 3: medinaceli2 ($46.25 in chips) 
-Seat 4: riterman ($11.70 in chips) 
-Seat 5: aklsduy28 ($19.25 in chips) 
-Seat 6: surething ($12.65 in chips) 
-aklsduy28: posts small blind $0.10
-surething: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [Kc 7c]
-SONAG777: calls $0.25
-medinaceli2: folds 
-riterman: folds 
-aklsduy28: folds 
-surething: checks 
-*** FLOP *** [Jh 8h 6s]
-vit-ivanov leaves the table
-surething: checks 
-SONAG777: bets $0.25
-surething: folds 
-Uncalled bet ($0.25) returned to SONAG777
-SONAG777 collected $0.60 from pot
-SONAG777: doesn't show hand 
-yyyAA joins the table at seat #1 
-*** SUMMARY ***
-Total pot $0.60 | Rake $0 
-Board [Jh 8h 6s]
-Seat 2: SONAG777 collected ($0.60)
-Seat 3: medinaceli2 folded before Flop (didn't bet)
-Seat 4: riterman (button) folded before Flop (didn't bet)
-Seat 5: aklsduy28 (small blind) folded before Flop
-Seat 6: surething (big blind) folded on the Flop
-
-
-
-PokerStars Game #39691930533:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:57:12 ET
-Table 'Triton IV' 6-max Seat #5 is the button
-Seat 1: yyyAA ($10 in chips) 
-Seat 2: SONAG777 ($11.35 in chips) 
-Seat 3: medinaceli2 ($46.25 in chips) 
-Seat 4: riterman ($11.70 in chips) 
-Seat 5: aklsduy28 ($19.15 in chips) 
-Seat 6: surething ($12.40 in chips) 
-surething: posts small blind $0.10
-yyyAA: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [Kc 5d]
-SONAG777: folds 
-medinaceli2: calls $0.25
-riterman: folds 
-aklsduy28: folds 
-surething: folds 
-yyyAA: checks 
-*** FLOP *** [Ah 6h 9c]
-yyyAA: checks 
-medinaceli2: bets $0.25
-yyyAA: calls $0.25
-*** TURN *** [Ah 6h 9c] [Js]
-yyyAA: checks 
-medinaceli2: bets $0.50
-yyyAA: calls $0.50
-*** RIVER *** [Ah 6h 9c Js] [4s]
-yyyAA: checks 
-medinaceli2: bets $0.50
-yyyAA: calls $0.50
-*** SHOW DOWN ***
-medinaceli2: shows [As 4d] (two pair, Aces and Fours)
-yyyAA: mucks hand 
-medinaceli2 collected $2.95 from pot
-*** SUMMARY ***
-Total pot $3.10 | Rake $0.15 
-Board [Ah 6h 9c Js 4s]
-Seat 1: yyyAA (big blind) mucked [Th 9s]
-Seat 2: SONAG777 folded before Flop (didn't bet)
-Seat 3: medinaceli2 showed [As 4d] and won ($2.95) with two pair, Aces and Fours
-Seat 4: riterman folded before Flop (didn't bet)
-Seat 5: aklsduy28 (button) folded before Flop (didn't bet)
-Seat 6: surething (small blind) folded before Flop
-
-
-
-PokerStars Game #39691952975:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:57:48 ET
-Table 'Triton IV' 6-max Seat #6 is the button
-Seat 1: yyyAA ($8.50 in chips) 
-Seat 2: SONAG777 ($11.35 in chips) 
-Seat 3: medinaceli2 ($47.70 in chips) 
-Seat 4: riterman ($11.70 in chips) 
-Seat 5: aklsduy28 ($19.15 in chips) 
-Seat 6: surething ($12.30 in chips) 
-yyyAA: posts small blind $0.10
-SONAG777: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [5h Ac]
-medinaceli2: folds 
-riterman: folds 
-aklsduy28: folds 
-surething: raises $0.25 to $0.50
-yyyAA: calls $0.40
-SONAG777: calls $0.25
-*** FLOP *** [3h Qd Td]
-yyyAA: checks 
-SONAG777: checks 
-surething: bets $0.25
-yyyAA: folds 
-SONAG777: calls $0.25
-*** TURN *** [3h Qd Td] [7s]
-SONAG777: checks 
-surething: checks 
-*** RIVER *** [3h Qd Td 7s] [8c]
-SONAG777: checks 
-surething: checks 
-*** SHOW DOWN ***
-SONAG777: shows [2s 2d] (a pair of Deuces)
-surething: mucks hand 
-SONAG777 collected $1.95 from pot
-*** SUMMARY ***
-Total pot $2 | Rake $0.05 
-Board [3h Qd Td 7s 8c]
-Seat 1: yyyAA (small blind) folded on the Flop
-Seat 2: SONAG777 (big blind) showed [2s 2d] and won ($1.95) with a pair of Deuces
-Seat 3: medinaceli2 folded before Flop (didn't bet)
-Seat 4: riterman folded before Flop (didn't bet)
-Seat 5: aklsduy28 folded before Flop (didn't bet)
-Seat 6: surething (button) mucked [5h Ac]
-
-
-
-PokerStars Game #39691976905:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:58:28 ET
-Table 'Triton IV' 6-max Seat #1 is the button
-Seat 1: yyyAA ($8 in chips) 
-Seat 2: SONAG777 ($12.55 in chips) 
-Seat 3: medinaceli2 ($47.70 in chips) 
-Seat 4: riterman ($11.70 in chips) 
-Seat 5: aklsduy28 ($19.15 in chips) 
-Seat 6: surething ($11.55 in chips) 
-SONAG777: posts small blind $0.10
-medinaceli2: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [8c 8d]
-riterman: folds 
-aklsduy28: folds 
-surething: raises $0.25 to $0.50
-yyyAA: folds 
-SONAG777: folds 
-medinaceli2: calls $0.25
-*** FLOP *** [Ks Td Qh]
-medinaceli2: checks 
-surething: bets $0.25
-medinaceli2: calls $0.25
-*** TURN *** [Ks Td Qh] [7s]
-medinaceli2: checks 
-surething: bets $0.50
-medinaceli2: calls $0.50
-*** RIVER *** [Ks Td Qh 7s] [Kc]
-medinaceli2: checks 
-surething: checks 
-*** SHOW DOWN ***
-medinaceli2: shows [Ah 5s] (a pair of Kings)
-surething: shows [8c 8d] (two pair, Kings and Eights)
-surething collected $2.50 from pot
-*** SUMMARY ***
-Total pot $2.60 | Rake $0.10 
-Board [Ks Td Qh 7s Kc]
-Seat 1: yyyAA (button) folded before Flop (didn't bet)
-Seat 2: SONAG777 (small blind) folded before Flop
-Seat 3: medinaceli2 (big blind) showed [Ah 5s] and lost with a pair of Kings
-Seat 4: riterman folded before Flop (didn't bet)
-Seat 5: aklsduy28 folded before Flop (didn't bet)
-Seat 6: surething showed [8c 8d] and won ($2.50) with two pair, Kings and Eights
-
-
-
-PokerStars Game #39691999120:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:59:04 ET
-Table 'Triton IV' 6-max Seat #2 is the button
-Seat 1: yyyAA ($8 in chips) 
-Seat 2: SONAG777 ($12.45 in chips) 
-Seat 3: medinaceli2 ($46.45 in chips) 
-Seat 4: riterman ($11.70 in chips) 
-Seat 5: aklsduy28 ($19.15 in chips) 
-Seat 6: surething ($12.80 in chips) 
-medinaceli2: posts small blind $0.10
-riterman: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [3c 4d]
-aklsduy28: folds 
-surething: folds 
-yyyAA: calls $0.25
-SONAG777: folds 
-medinaceli2: folds 
-riterman: checks 
-*** FLOP *** [2c Tc 9h]
-riterman: checks 
-yyyAA: checks 
-*** TURN *** [2c Tc 9h] [5c]
-riterman: checks 
-yyyAA: bets $0.50
-riterman: folds 
-Uncalled bet ($0.50) returned to yyyAA
-yyyAA collected $0.60 from pot
-*** SUMMARY ***
-Total pot $0.60 | Rake $0 
-Board [2c Tc 9h 5c]
-Seat 1: yyyAA collected ($0.60)
-Seat 2: SONAG777 (button) folded before Flop (didn't bet)
-Seat 3: medinaceli2 (small blind) folded before Flop
-Seat 4: riterman (big blind) folded on the Turn
-Seat 5: aklsduy28 folded before Flop (didn't bet)
-Seat 6: surething folded before Flop (didn't bet)
-
-
-
-PokerStars Game #39692013863:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:59:28 ET
-Table 'Triton IV' 6-max Seat #3 is the button
-Seat 1: yyyAA ($8.35 in chips) 
-Seat 2: SONAG777 ($12.45 in chips) 
-Seat 3: medinaceli2 ($46.35 in chips) 
-Seat 6: surething ($12.80 in chips) 
-riterman: is sitting out 
-aklsduy28: is sitting out 
-surething: posts small blind $0.10
-yyyAA: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [8c 8h]
-SONAG777: folds 
-medinaceli2: folds 
-surething: raises $0.25 to $0.50
-yyyAA: folds 
-Uncalled bet ($0.25) returned to surething
-surething collected $0.50 from pot
-surething: doesn't show hand 
-*** SUMMARY ***
-Total pot $0.50 | Rake $0 
-Seat 1: yyyAA (big blind) folded before Flop
-Seat 2: SONAG777 folded before Flop (didn't bet)
-Seat 3: medinaceli2 (button) folded before Flop (didn't bet)
-Seat 6: surething (small blind) collected ($0.50)
-
-
-
-PokerStars Game #39692023622:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:59:44 ET
-Table 'Triton IV' 6-max Seat #6 is the button
-Seat 1: yyyAA ($8.10 in chips) 
-Seat 2: SONAG777 ($12.45 in chips) 
-Seat 3: medinaceli2 ($46.35 in chips) 
-Seat 6: surething ($13.05 in chips) 
-yyyAA: posts small blind $0.10
-SONAG777: posts big blind $0.25
-aklsduy28 leaves the table
-riterman: sits out 
-*** HOLE CARDS ***
-Dealt to surething [5c 3d]
-medinaceli2: raises $0.25 to $0.50
-surething: folds 
-yyyAA: folds 
-SONAG777: calls $0.25
-*** FLOP *** [Qs Qh 8h]
-SONAG777: checks 
-medinaceli2: bets $0.25
-SONAG777: folds 
-Uncalled bet ($0.25) returned to medinaceli2
-medinaceli2 collected $1.05 from pot
-medinaceli2: doesn't show hand 
-*** SUMMARY ***
-Total pot $1.10 | Rake $0.05 
-Board [Qs Qh 8h]
-Seat 1: yyyAA (small blind) folded before Flop
-Seat 2: SONAG777 (big blind) folded on the Flop
-Seat 3: medinaceli2 collected ($1.05)
-Seat 6: surething (button) folded before Flop (didn't bet)
-
-
-
-PokerStars Game #39692039868:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 13:00:11 ET
-Table 'Triton IV' 6-max Seat #1 is the button
-Seat 1: yyyAA ($8 in chips) 
-Seat 2: SONAG777 ($11.95 in chips) 
-Seat 3: medinaceli2 ($46.90 in chips) 
-Seat 6: surething ($13.05 in chips) 
-SONAG777: posts small blind $0.10
-medinaceli2: posts big blind $0.25
-riterman: sits out 
-*** HOLE CARDS ***
-Dealt to surething [9h Td]
-surething: folds 
-yyyAA: folds 
-SONAG777: raises $0.25 to $0.50
-medinaceli2: folds 
-Uncalled bet ($0.25) returned to SONAG777
-SONAG777 collected $0.50 from pot
-SONAG777: doesn't show hand 
-*** SUMMARY ***
-Total pot $0.50 | Rake $0 
-Seat 1: yyyAA (button) folded before Flop (didn't bet)
-Seat 2: SONAG777 (small blind) collected ($0.50)
-Seat 3: medinaceli2 (big blind) folded before Flop
-Seat 6: surething folded before Flop (didn't bet)
-
-
-
-PokerStars Game #39692048321:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 13:00:24 ET
-Table 'Triton IV' 6-max Seat #2 is the button
-Seat 1: yyyAA ($8 in chips) 
-Seat 2: SONAG777 ($12.20 in chips) 
-Seat 3: medinaceli2 ($46.65 in chips) 
-Seat 4: riterman ($11.45 in chips) 
-Seat 6: surething ($13.05 in chips) 
-medinaceli2: posts small blind $0.10
-riterman: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [9s Tc]
-surething: folds 
-yyyAA: folds 
-SONAG777: calls $0.25
-medinaceli2: calls $0.15
-riterman: checks 
-*** FLOP *** [Ac 7d 8d]
-medinaceli2: bets $0.25
-riterman: folds 
-SONAG777: raises $0.25 to $0.50
-medinaceli2: calls $0.25
-*** TURN *** [Ac 7d 8d] [Jc]
-medinaceli2: checks 
-SONAG777: bets $0.50
-medinaceli2: calls $0.50
-*** RIVER *** [Ac 7d 8d Jc] [Ad]
-medinaceli2: checks 
-SONAG777: checks 
-*** SHOW DOWN ***
-medinaceli2: shows [2d 6d] (a flush, Ace high)
-SONAG777: mucks hand 
-medinaceli2 collected $2.65 from pot
-*** SUMMARY ***
-Total pot $2.75 | Rake $0.10 
-Board [Ac 7d 8d Jc Ad]
-Seat 1: yyyAA folded before Flop (didn't bet)
-Seat 2: SONAG777 (button) mucked [7c 8s]
-Seat 3: medinaceli2 (small blind) showed [2d 6d] and won ($2.65) with a flush, Ace high
-Seat 4: riterman (big blind) folded on the Flop
-Seat 6: surething folded before Flop (didn't bet)
-
-
-
-PokerStars Game #39692083720:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 13:01:18 ET
-Table 'Triton IV' 6-max Seat #3 is the button
-Seat 1: yyyAA ($8 in chips) 
-Seat 2: SONAG777 ($10.95 in chips) 
-Seat 3: medinaceli2 ($48.05 in chips) 
-Seat 4: riterman ($11.20 in chips) 
-Seat 6: surething ($13.05 in chips) 
-riterman: posts small blind $0.10
-surething: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [2h 6c]
-yyyAA: folds 
-SONAG777: calls $0.25
-medinaceli2: folds 
-GavinRich joins the table at seat #5 
-riterman: folds 
-surething: checks 
-*** FLOP *** [6h Ah Qs]
-surething: checks 
-SONAG777: checks 
-*** TURN *** [6h Ah Qs] [8s]
-surething: bets $0.50
-SONAG777: calls $0.50
-*** RIVER *** [6h Ah Qs 8s] [4c]
-surething: checks 
-SONAG777: checks 
-*** SHOW DOWN ***
-surething: shows [2h 6c] (a pair of Sixes)
-SONAG777: shows [8h Td] (a pair of Eights)
-SONAG777 collected $1.55 from pot
-*** SUMMARY ***
-Total pot $1.60 | Rake $0.05 
-Board [6h Ah Qs 8s 4c]
-Seat 1: yyyAA folded before Flop (didn't bet)
-Seat 2: SONAG777 showed [8h Td] and won ($1.55) with a pair of Eights
-Seat 3: medinaceli2 (button) folded before Flop (didn't bet)
-Seat 4: riterman (small blind) folded before Flop
-Seat 6: surething (big blind) showed [2h 6c] and lost with a pair of Sixes
-
-
-
-PokerStars Game #39692108865:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 13:01:54 ET
-Table 'Triton IV' 6-max Seat #4 is the button
-Seat 1: yyyAA ($8 in chips) 
-Seat 2: SONAG777 ($11.75 in chips) 
-Seat 3: medinaceli2 ($48.05 in chips) 
-Seat 4: riterman ($11.10 in chips) 
-Seat 6: surething ($12.30 in chips) 
-GavinRich will be allowed to play after the button
-surething: posts small blind $0.10
-yyyAA: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [Jc 2h]
-SONAG777: folds 
-medinaceli2: folds 
-riterman has timed out
-riterman: folds 
-surething: folds 
-Uncalled bet ($0.15) returned to yyyAA
-yyyAA collected $0.20 from pot
-*** SUMMARY ***
-Total pot $0.20 | Rake $0 
-Seat 1: yyyAA (big blind) collected ($0.20)
-Seat 2: SONAG777 folded before Flop (didn't bet)
-Seat 3: medinaceli2 folded before Flop (didn't bet)
-Seat 4: riterman (button) folded before Flop (didn't bet)
-Seat 6: surething (small blind) folded before Flop
-
-
-
-PokerStars Game #39692128751:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 13:02:21 ET
-Table 'Triton IV' 6-max Seat #6 is the button
-Seat 1: yyyAA ($8.10 in chips) 
-Seat 2: SONAG777 ($11.75 in chips) 
-Seat 3: medinaceli2 ($48.05 in chips) 
-Seat 4: riterman ($11.10 in chips) 
-Seat 5: GavinRich ($4.85 in chips) 
-Seat 6: surething ($12.20 in chips) 
-yyyAA: posts small blind $0.10
-SONAG777: posts big blind $0.25
-GavinRich: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [7c 5s]
-medinaceli2: raises $0.25 to $0.50
-riterman: folds 
-GavinRich: calls $0.25
-surething: folds 
-yyyAA: calls $0.40
-SONAG777: calls $0.25
-*** FLOP *** [7h 4h 6d]
-yyyAA: checks 
-SONAG777: checks 
-medinaceli2: checks 
-GavinRich: checks 
-*** TURN *** [7h 4h 6d] [5h]
-yyyAA: bets $0.50
-SONAG777: folds 
-medinaceli2: folds 
-GavinRich: calls $0.50
-*** RIVER *** [7h 4h 6d 5h] [3h]
-yyyAA: bets $0.50
-GavinRich: raises $0.50 to $1
-yyyAA: calls $0.50
-*** SHOW DOWN ***
-GavinRich: shows [Ts 8d] (a straight, Four to Eight)
-yyyAA: shows [Ah 5c] (a flush, Ace high)
-yyyAA collected $4.80 from pot
-*** SUMMARY ***
-Total pot $5 | Rake $0.20 
-Board [7h 4h 6d 5h 3h]
-Seat 1: yyyAA (small blind) showed [Ah 5c] and won ($4.80) with a flush, Ace high
-Seat 2: SONAG777 (big blind) folded on the Turn
-Seat 3: medinaceli2 folded on the Turn
-Seat 4: riterman folded before Flop (didn't bet)
-Seat 5: GavinRich showed [Ts 8d] and lost with a straight, Four to Eight
-Seat 6: surething (button) folded before Flop (didn't bet)
-
-
-
-PokerStars Game #39692163067:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 13:03:05 ET
-Table 'Triton IV' 6-max Seat #1 is the button
-Seat 1: yyyAA ($10.90 in chips) 
-Seat 2: SONAG777 ($11.25 in chips) 
-Seat 3: medinaceli2 ($47.55 in chips) 
-Seat 4: riterman ($11.10 in chips) 
-Seat 5: GavinRich ($2.85 in chips) 
-Seat 6: surething ($12.20 in chips) 
-SONAG777: posts small blind $0.10
-medinaceli2: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [2h Qh]
-riterman: folds 
-GavinRich: calls $0.25
-surething: folds 
-yyyAA: raises $0.25 to $0.50
-SONAG777: folds 
-medinaceli2: calls $0.25
-GavinRich: calls $0.25
-*** FLOP *** [9s Kc 3d]
-medinaceli2: checks 
-GavinRich: checks 
-yyyAA: bets $0.25
-medinaceli2: calls $0.25
-GavinRich: folds 
-*** TURN *** [9s Kc 3d] [Js]
-medinaceli2: checks 
-yyyAA: bets $0.50
-medinaceli2: calls $0.50
-*** RIVER *** [9s Kc 3d Js] [8s]
-medinaceli2: checks 
-yyyAA: bets $0.50
-medinaceli2: folds 
-Uncalled bet ($0.50) returned to yyyAA
-yyyAA collected $2.95 from pot
-*** SUMMARY ***
-Total pot $3.10 | Rake $0.15 
-Board [9s Kc 3d Js 8s]
-Seat 1: yyyAA (button) collected ($2.95)
-Seat 2: SONAG777 (small blind) folded before Flop
-Seat 3: medinaceli2 (big blind) folded on the River
-Seat 4: riterman folded before Flop (didn't bet)
-Seat 5: GavinRich folded on the Flop
-Seat 6: surething folded before Flop (didn't bet)
-
-
-
-PokerStars Game #39692229360:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 13:04:31 ET
-Table 'Triton IV' 6-max Seat #2 is the button
-Seat 1: yyyAA ($12.60 in chips) 
-Seat 2: SONAG777 ($11.15 in chips) 
-Seat 3: medinaceli2 ($46.30 in chips) 
-Seat 4: riterman ($11.10 in chips) 
-Seat 5: GavinRich ($2.35 in chips) 
-Seat 6: surething ($12.20 in chips) 
-medinaceli2: posts small blind $0.10
-riterman: posts big blind $0.25
-*** HOLE CARDS ***
-Dealt to surething [3c As]
-GavinRich: calls $0.25
-surething: folds 
-yyyAA: folds 
-SONAG777: folds 
-medinaceli2: calls $0.15
-riterman: checks 
-*** FLOP *** [Qd 9c 2h]
-medinaceli2: bets $0.25
-riterman: folds 
-GavinRich: calls $0.25
-*** TURN *** [Qd 9c 2h] [3h]
-medinaceli2: checks 
-GavinRich: checks 
-*** RIVER *** [Qd 9c 2h 3h] [Tc]
-medinaceli2: checks 
-GavinRich: bets $0.50
-medinaceli2: folds 
-Uncalled bet ($0.50) returned to GavinRich
-GavinRich collected $1.20 from pot
-*** SUMMARY ***
-Total pot $1.25 | Rake $0.05 
-Board [Qd 9c 2h 3h Tc]
-Seat 1: yyyAA folded before Flop (didn't bet)
-Seat 2: SONAG777 (button) folded before Flop (didn't bet)
-Seat 3: medinaceli2 (small blind) folded on the River
-Seat 4: riterman (big blind) folded on the Flop
-Seat 5: GavinRich collected ($1.20)
-Seat 6: surething folded before Flop (didn't bet)
-
-
-

From d637c2a89c92bf0ba0c2bf252533add227f6e453 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sun, 14 Feb 2010 23:26:47 +0000
Subject: [PATCH 248/320] improve steal calc

---
 pyfpdb/DerivedStats.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py
index 23f1f99c..166034a5 100644
--- a/pyfpdb/DerivedStats.py
+++ b/pyfpdb/DerivedStats.py
@@ -212,6 +212,7 @@ class DerivedStats():
             map = positions[-seats:] # Copy required positions from array ending in -2
 
         for i, player in enumerate(players):
+            #print "player %s in posn %s" % (player, str(map[i]))
             self.handsplayers[player]['position'] = map[i]
 
     def assembleHudCache(self, hand):
@@ -308,6 +309,8 @@ class DerivedStats():
                 if act in ('bets', 'raises'):
                     self.handsplayers[pname]['stealAttempted'] = True
                     steal_attempt = True
+                if act == 'calls':
+                    break
             
             if posn not in steal_positions and act != 'folds':
                 break

From 6026d5bcb38eb75dc6845ad04e022d1a8a8b83a3 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sun, 14 Feb 2010 23:27:34 +0000
Subject: [PATCH 249/320] PokerStarsToFpdb.py

---
 pyfpdb/PokerStarsToFpdb.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
index 21246b12..8ea594aa 100755
--- a/pyfpdb/PokerStarsToFpdb.py
+++ b/pyfpdb/PokerStarsToFpdb.py
@@ -101,9 +101,10 @@ class PokerStars(HandHistoryConverter):
             self.re_PostBoth         = re.compile(r"^%(PLYR)s: posts small \& big blinds %(CUR)s(?P<SBBB>[.0-9]+)" %  subst, re.MULTILINE)
             self.re_HeroCards        = re.compile(r"^Dealt to %(PLYR)s(?: \[(?P<OLDCARDS>.+?)\])?( \[(?P<NEWCARDS>.+?)\])" % subst, re.MULTILINE)
             self.re_Action           = re.compile(r"""
-                        ^%(PLYR)s:(?P<ATYPE>\sbets|\schecks|\sraises|\scalls|\sfolds|\sdiscards|\sstands\spat)\s?
+                        ^%(PLYR)s:(?P<ATYPE>\sbets|\schecks|\sraises|\scalls|\sfolds|\sdiscards|\sstands\spat)
                         (\s(%(CUR)s)?(?P<BET>[.\d]+))?(\sto\s%(CUR)s(?P<BETTO>[.\d]+))?  # the number discarded goes in <BET>
-                        (\scards?(\s\[(?P<DISCARDED>.+?)\])?)?$"""
+                        \s*(and\sis\sall.in)?
+                        (\scards?(\s\[(?P<DISCARDED>.+?)\])?)?\s*$"""
                          %  subst, re.MULTILINE|re.VERBOSE)
             self.re_ShowdownAction   = re.compile(r"^%s: shows \[(?P<CARDS>.*)\]" %  player_re, re.MULTILINE)
             self.re_CollectPot       = re.compile(r"Seat (?P<SEAT>[0-9]+): %(PLYR)s (\(button\) |\(small blind\) |\(big blind\) |\(button\) \(small blind\) )?(collected|showed \[.*\] and won) \(%(CUR)s(?P<POT>[.\d]+)\)(, mucked| with.*|)" %  subst, re.MULTILINE)

From 0ea95363fa299f447f4a17fddaad9c7a97a50186 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sun, 14 Feb 2010 23:29:20 +0000
Subject: [PATCH 250/320] only use M.Nk format for hand numbers > 10000

---
 pyfpdb/Stats.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/Stats.py b/pyfpdb/Stats.py
index ab92c99f..47d8b9f1 100755
--- a/pyfpdb/Stats.py
+++ b/pyfpdb/Stats.py
@@ -248,7 +248,7 @@ def n(stat_dict, player):
         # If sample is large enough, use X.Yk notation instead
         _n = stat_dict[player]['n']
         fmt = '%d' % _n
-        if _n >= 1000:
+        if _n >= 10000:
             k = _n / 1000
             c = _n % 1000
             _c = float(c) / 100.0

From c0e0c3e596b10445498fd6fe5951b249ef7e0b38 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Mon, 15 Feb 2010 23:26:23 +0800
Subject: [PATCH 251/320] Add comment to Bulk import

Too lazy to stash
---
 pyfpdb/GuiBulkImport.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pyfpdb/GuiBulkImport.py b/pyfpdb/GuiBulkImport.py
index 84828493..0391bc37 100755
--- a/pyfpdb/GuiBulkImport.py
+++ b/pyfpdb/GuiBulkImport.py
@@ -106,6 +106,9 @@ class GuiBulkImport():
                 print 'GuiBulkImport.load done: Stored: %d \tDuplicates: %d \tPartial: %d \tErrors: %d in %s seconds - %.0f/sec'\
                      % (stored, dups, partial, errs, ttime, (stored+0.0) / ttime)
                 self.importer.clearFileList()
+                # This file should really be 'logging'
+                #log.info('GuiBulkImport.load done: Stored: %d \tDuplicates: %d \tPartial: %d \tErrors: %d in %s seconds - %.0f/sec'\
+                #     % (stored, dups, partial, errs, ttime, (stored+0.0) / ttime))
                 if self.n_hands_in_db == 0 and stored > 0:
                     self.cb_dropindexes.set_sensitive(True)
                     self.cb_dropindexes.set_active(0)

From fcd0ba3dd12a1c75be38e8e04b5f2e6d26b2c2c1 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Tue, 16 Feb 2010 00:34:18 +0800
Subject: [PATCH 252/320] PokerStarsToFpdb: allow a second small blind to be
 posted

If a player sits out a sb in a cash game they can post it after the button

There is still an accounting error in the way we calculate the returned bet.
---
 pyfpdb/PokerStarsToFpdb.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
index 8ea594aa..39066b8e 100755
--- a/pyfpdb/PokerStarsToFpdb.py
+++ b/pyfpdb/PokerStarsToFpdb.py
@@ -288,8 +288,13 @@ class PokerStars(HandHistoryConverter):
         
     def readBlinds(self, hand):
         try:
-            m = self.re_PostSB.search(hand.handText)
-            hand.addBlind(m.group('PNAME'), 'small blind', m.group('SB'))
+            count = 0
+            for a in self.re_PostSB.finditer(hand.handText):
+                if count == 0:
+                    hand.addBlind(a.group('PNAME'), 'small blind', a.group('SB'))
+                    count = 1
+                else:
+                    hand.addAnte(a.group('PNAME'), a.group('SB'))
         except: # no small blind
             hand.addBlind(None, None, None)
         for a in self.re_PostBB.finditer(hand.handText):

From 44d994303cf0ceb67238553b2f287856a734d770 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Tue, 16 Feb 2010 00:42:13 +0800
Subject: [PATCH 253/320] Add comment regarding accounting error

---
 pyfpdb/Hand.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 9bec209b..73dd7600 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -1441,6 +1441,10 @@ class Pot(object):
 
         # Return any uncalled bet.
         committed = sorted([ (v,k) for (k,v) in self.committed.items()])
+        #ERROR below. lastbet is correct in most cases, but wrong when 
+        #             additional money is committed to the pot in cash games
+        #             due to an additional sb being posted. (Speculate that
+        #             posting sb+bb is also potentially wrong)
         lastbet = committed[-1][0] - committed[-2][0]
         if lastbet > 0: # uncalled
             returnto = committed[-1][1]

From feeb70594acb69bbaaeb96f9b844224977a0b822 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Mon, 15 Feb 2010 22:54:02 +0000
Subject: [PATCH 254/320] re-fix steal stats

---
 pyfpdb/DerivedStats.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py
index 166034a5..21c6cddf 100644
--- a/pyfpdb/DerivedStats.py
+++ b/pyfpdb/DerivedStats.py
@@ -285,9 +285,9 @@ class DerivedStats():
         Fold to steal - folding blind after steal attemp wo any other callers or raisers
         """
         steal_attempt = False
-        steal_positions = (1, 0, 'S')
+        steal_positions = ('1', '0', 'S')
         if hand.gametype['base'] == 'stud':
-            steal_positions = (2, 1, 0)
+            steal_positions = ('2', '1', '0')
         for action in hand.actions[hand.actionStreets[1]]:
             pname, act = action[0], action[1]
             posn = self.handsplayers[pname]['position']

From 4993b6619e8a3197455ef487966eeb7076397b04 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Mon, 15 Feb 2010 22:57:59 +0000
Subject: [PATCH 255/320] improve position set routine to cover folding to BB
 and missing SB

---
 pyfpdb/DerivedStats.py | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py
index 21c6cddf..e9a3af45 100644
--- a/pyfpdb/DerivedStats.py
+++ b/pyfpdb/DerivedStats.py
@@ -195,25 +195,39 @@ class DerivedStats():
         #
         #This function is going to get it wrong when there in situations where there
         # is no small blind. I can live with that.
-        positions = [7, 6, 5, 4, 3, 2, 1, 0, 'S', 'B']
         actions = hand.actions[hand.holeStreets[0]]
+        # Note:  pfbao list may not include big blind if all others folded
         players = self.pfbao(actions)
-        seats = len(players)
-        map = []
+
         if hand.gametype['base'] == 'stud':
+            positions = [7, 6, 5, 4, 3, 2, 1, 0, 'S', 'B']
+            seats = len(players)
+            map = []
             # Could posibly change this to be either -2 or -1 depending if they complete or bring-in
             # First player to act is -1, last player is 0 for 6 players it should look like:
             # ['S', 4, 3, 2, 1, 0]
             map = positions[-seats-1:-1] # Copy required positions from postions array anding in -1
             map = map[-1:] + map[0:-1] # and move the -1 to the start of that array
-        else:
-            # For 6 players is should look like:
-            # [3, 2, 1, 0, 'S', 'B']
-            map = positions[-seats:] # Copy required positions from array ending in -2
 
-        for i, player in enumerate(players):
-            #print "player %s in posn %s" % (player, str(map[i]))
-            self.handsplayers[player]['position'] = map[i]
+            for i, player in enumerate(players):
+                #print "player %s in posn %s" % (player, str(map[i]))
+                self.handsplayers[player]['position'] = map[i]
+        else:
+            # set blinds first, then others from pfbao list, avoids problem if bb
+            # is missing from pfbao list or if there is no small blind
+            bb = [x[0] for x in hand.actions[hand.actionStreets[0]] if x[2] == 'big blind']
+            sb = [x[0] for x in hand.actions[hand.actionStreets[0]] if x[2] == 'small blind']
+            # if there are > 1 sb or bb only the first is used!
+            if bb:
+                self.handsplayers[bb[0]]['position'] = 'B'
+                if bb[0] in players:  players.remove(bb[0])
+            if sb:
+                self.handsplayers[sb[0]]['position'] = 'S'
+                if sb[0] in players:  players.remove(sb[0])
+
+            #print "bb =", bb, "sb =", sb, "players =", players
+            for i,player in enumerate(reversed(players)):
+                self.handsplayers[player]['position'] = str(i)
 
     def assembleHudCache(self, hand):
         # No real work to be done - HandsPlayers data already contains the correct info

From 78dc7ab468b7da1270ab5051ae9674655f60211e Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Mon, 15 Feb 2010 23:37:34 +0000
Subject: [PATCH 256/320] improve sawshowdown stat

---
 pyfpdb/DerivedStats.py | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py
index e9a3af45..d7ded83b 100644
--- a/pyfpdb/DerivedStats.py
+++ b/pyfpdb/DerivedStats.py
@@ -254,6 +254,7 @@ class DerivedStats():
         # The number of unique players in the list per street gives the value for playersAtStreetXXX
 
         # FIXME?? - This isn't couting people that are all in - at least showdown needs to reflect this
+        #     ... new code below hopefully fixes this
 
         self.hands['playersAtStreet1']  = 0
         self.hands['playersAtStreet2']  = 0
@@ -261,23 +262,31 @@ class DerivedStats():
         self.hands['playersAtStreet4']  = 0
         self.hands['playersAtShowdown'] = 0
 
-        alliners = set()
-        for (i, street) in enumerate(hand.actionStreets[2:]):
-            actors = set()
-            for action in hand.actions[street]:
-                if len(action) > 2 and action[-1]: # allin
-                    alliners.add(action[0])
-                actors.add(action[0])
-            if len(actors)==0 and len(alliners)<2:
-                alliners = set()
-            self.hands['playersAtStreet%d' % (i+1)] = len(set.union(alliners, actors))
-
-        actions = hand.actions[hand.actionStreets[-1]]
-        pas = set.union(self.pfba(actions) - self.pfba(actions, l=('folds',)),  alliners)
-        self.hands['playersAtShowdown'] = len(pas)
+#        alliners = set()
+#        for (i, street) in enumerate(hand.actionStreets[2:]):
+#            actors = set()
+#            for action in hand.actions[street]:
+#                if len(action) > 2 and action[-1]: # allin
+#                    alliners.add(action[0])
+#                actors.add(action[0])
+#            if len(actors)==0 and len(alliners)<2:
+#                alliners = set()
+#            self.hands['playersAtStreet%d' % (i+1)] = len(set.union(alliners, actors))
+#
+#        actions = hand.actions[hand.actionStreets[-1]]
+#        print "p_actions:", self.pfba(actions), "p_folds:", self.pfba(actions, l=('folds',)), "alliners:", alliners
+#        pas = set.union(self.pfba(actions) - self.pfba(actions, l=('folds',)),  alliners)
+        
+        p_in = set(x[1] for x in hand.players)
+        for (i, street) in enumerate(hand.actionStreets):
+            actions = hand.actions[street]
+            p_in = p_in - self.pfba(actions, l=('folds',))
+            self.hands['playersAtStreet%d' % (i-1)] = len(p_in)
+        
+        self.hands['playersAtShowdown'] = len(p_in)
 
         if self.hands['playersAtShowdown'] > 1:
-            for player in pas:
+            for player in p_in:
                 self.handsplayers[player]['sawShowdown'] = True
 
     def streetXRaises(self, hand):

From 797f04aaab715c820dee94892c07176dfd113a87 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Tue, 16 Feb 2010 23:13:12 +0000
Subject: [PATCH 257/320] fix problem with position stats in sqlite

---
 pyfpdb/GuiPlayerStats.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/GuiPlayerStats.py b/pyfpdb/GuiPlayerStats.py
index cb94859d..f7789164 100644
--- a/pyfpdb/GuiPlayerStats.py
+++ b/pyfpdb/GuiPlayerStats.py
@@ -520,7 +520,7 @@ class GuiPlayerStats (threading.Thread):
             blindtest = str(tuple(nolims))
             blindtest = blindtest.replace("L", "")
             blindtest = blindtest.replace(",)",")")
-            bbtest = bbtest + blindtest + ' ) )'
+            bbtest = bbtest + blindtest + ' ) ) )'
         else:
             bbtest = bbtest + '(-1) ) )'
         if type == 'ring':
@@ -539,7 +539,7 @@ class GuiPlayerStats (threading.Thread):
             query = query.replace("<orderbyhgameTypeId>", "")
             groupLevels = "show" not in str(limits)
             if groupLevels:
-                query = query.replace("<hgameTypeId>", "-1")
+                query = query.replace("<hgameTypeId>", "p.name")
             else:
                 query = query.replace("<hgameTypeId>", "h.gameTypeId")
 

From 773ba71499321b52aeb831934d676145d273d8c0 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Wed, 17 Feb 2010 19:57:26 +0800
Subject: [PATCH 258/320] Change blind semantics slightly to improve
 accounting.

This should improve the case where a second small blind is added.

The player committing the second sb still has a 1xsb accouting error
---
 pyfpdb/Hand.py             | 6 ++++++
 pyfpdb/PokerStarsToFpdb.py | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 73dd7600..bc9278a6 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -344,6 +344,11 @@ For sites (currently only Carbon Poker) which record "all in" as a special actio
                 self.bets['BLINDSANTES'][player].append(Decimal(self.sb))
                 self.pot.addCommonMoney(Decimal(self.sb))
 
+            if blindtype == 'secondsb':
+                amount = Decimal(0)
+                self.bets['BLINDSANTES'][player].append(Decimal(self.sb))
+                self.pot.addCommonMoney(Decimal(self.sb))
+
             self.bets['PREFLOP'][player].append(Decimal(amount))
             self.pot.addMoney(player, Decimal(amount))
             self.lastBet['PREFLOP'] = Decimal(amount)
@@ -1441,6 +1446,7 @@ class Pot(object):
 
         # Return any uncalled bet.
         committed = sorted([ (v,k) for (k,v) in self.committed.items()])
+        print "DEBUG: committed: %s" % committed
         #ERROR below. lastbet is correct in most cases, but wrong when 
         #             additional money is committed to the pot in cash games
         #             due to an additional sb being posted. (Speculate that
diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
index 39066b8e..87574e9d 100755
--- a/pyfpdb/PokerStarsToFpdb.py
+++ b/pyfpdb/PokerStarsToFpdb.py
@@ -294,7 +294,7 @@ class PokerStars(HandHistoryConverter):
                     hand.addBlind(a.group('PNAME'), 'small blind', a.group('SB'))
                     count = 1
                 else:
-                    hand.addAnte(a.group('PNAME'), a.group('SB'))
+                    hand.addBlind(a.group('PNAME'), 'secondsb', a.group('SB'))
         except: # no small blind
             hand.addBlind(None, None, None)
         for a in self.re_PostBB.finditer(hand.handText):

From 074a4e751eb203001984dc499b0b1fbc52619a58 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Wed, 17 Feb 2010 19:25:04 +0000
Subject: [PATCH 259/320] make sure filter releases any db locks it has

---
 pyfpdb/Filters.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pyfpdb/Filters.py b/pyfpdb/Filters.py
index 27e5a49d..c8e8e219 100644
--- a/pyfpdb/Filters.py
+++ b/pyfpdb/Filters.py
@@ -211,6 +211,9 @@ class Filters(threading.Thread):
             self.Button2.connect("clicked", self.callback['button2'], "clicked")
             self.Button2.set_sensitive(True)
 
+        # make sure any locks on db are released:
+        self.db.rollback()
+
     def get_vbox(self):
         """returns the vbox of this thread"""
         return self.mainVBox

From 55b6e1ee928b0ef76b3987fe41578935b4e8e638 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Wed, 17 Feb 2010 21:18:38 +0000
Subject: [PATCH 260/320] change button text

---
 pyfpdb/GuiPlayerStats.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/GuiPlayerStats.py b/pyfpdb/GuiPlayerStats.py
index f7789164..047c1ff1 100644
--- a/pyfpdb/GuiPlayerStats.py
+++ b/pyfpdb/GuiPlayerStats.py
@@ -81,7 +81,7 @@ class GuiPlayerStats (threading.Thread):
         self.filters = Filters.Filters(self.db, self.conf, self.sql, display = filters_display)
         self.filters.registerButton1Name("_Filters")
         self.filters.registerButton1Callback(self.showDetailFilter)
-        self.filters.registerButton2Name("_Refresh")
+        self.filters.registerButton2Name("_Refresh Stats")
         self.filters.registerButton2Callback(self.refreshStats)
 
         # ToDo: store in config

From c31a2f6cefd2c8e8ba01686f435305c281f0b559 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Wed, 17 Feb 2010 21:44:05 +0000
Subject: [PATCH 261/320] undo earlier 're-fix' that broke things

---
 pyfpdb/DerivedStats.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py
index d7ded83b..699ad068 100644
--- a/pyfpdb/DerivedStats.py
+++ b/pyfpdb/DerivedStats.py
@@ -227,7 +227,7 @@ class DerivedStats():
 
             #print "bb =", bb, "sb =", sb, "players =", players
             for i,player in enumerate(reversed(players)):
-                self.handsplayers[player]['position'] = str(i)
+                self.handsplayers[player]['position'] = i
 
     def assembleHudCache(self, hand):
         # No real work to be done - HandsPlayers data already contains the correct info
@@ -305,12 +305,13 @@ class DerivedStats():
         """Fills stealAttempt(Chance|ed, fold(Bb|Sb)ToSteal(Chance|)
 
         Steal attempt - open raise on positions 1 0 S - i.e. MP3, CO, BU, SB
+                        (note: I don't think PT2 counts SB steals in HU hands, maybe we shouldn't?)
         Fold to steal - folding blind after steal attemp wo any other callers or raisers
         """
         steal_attempt = False
-        steal_positions = ('1', '0', 'S')
+        steal_positions = (1, 0, 'S')
         if hand.gametype['base'] == 'stud':
-            steal_positions = ('2', '1', '0')
+            steal_positions = (2, 1, '0')
         for action in hand.actions[hand.actionStreets[1]]:
             pname, act = action[0], action[1]
             posn = self.handsplayers[pname]['position']

From 0cafb75c59af0a6380b32907fb9ede41bc34d66f Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Wed, 17 Feb 2010 23:29:50 +0000
Subject: [PATCH 262/320] finish previous undo

---
 pyfpdb/DerivedStats.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py
index 699ad068..dddbec8b 100644
--- a/pyfpdb/DerivedStats.py
+++ b/pyfpdb/DerivedStats.py
@@ -311,7 +311,7 @@ class DerivedStats():
         steal_attempt = False
         steal_positions = (1, 0, 'S')
         if hand.gametype['base'] == 'stud':
-            steal_positions = (2, 1, '0')
+            steal_positions = (2, 1, 0)
         for action in hand.actions[hand.actionStreets[1]]:
             pname, act = action[0], action[1]
             posn = self.handsplayers[pname]['position']

From a27bc45f6dbc2bb954f98c991ae86a7458ef7bbf Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Thu, 18 Feb 2010 16:17:08 +0100
Subject: [PATCH 263/320] fix for dead blinds and antes in the player stat
 calculation

Posted dead blinds messed up the rake and profit calculation
in the player stats.
This fix should also work for antes
The fix has been done for omaha and holdem game types (without antes)
I don't have draw or stud hands to check this
---
 pyfpdb/DerivedStats.py     |  2 +-
 pyfpdb/Hand.py             | 36 ++++++++++++++++++++----------------
 pyfpdb/PokerStarsToFpdb.py | 18 ++++++++----------
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py
index 166034a5..32c7c874 100644
--- a/pyfpdb/DerivedStats.py
+++ b/pyfpdb/DerivedStats.py
@@ -162,7 +162,7 @@ class DerivedStats():
                 self.handsplayers[player]['wonAtSD'] = 1.0
 
         for player in hand.pot.committed:
-            self.handsplayers[player]['totalProfit'] = int(self.handsplayers[player]['winnings'] - (100*hand.pot.committed[player]))
+            self.handsplayers[player]['totalProfit'] = int(self.handsplayers[player]['winnings'] - (100*hand.pot.committed[player])- (100*hand.pot.common[player]))
 
         self.calcCBets(hand)
 
diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 73dd7600..c5e2dea7 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -321,8 +321,10 @@ For sites (currently only Carbon Poker) which record "all in" as a special actio
             self.stacks[player] -= Decimal(ante)
             act = (player, 'posts', "ante", ante, self.stacks[player]==0)
             self.actions['BLINDSANTES'].append(act)
-            self.pot.addMoney(player, Decimal(ante))
-
+#            self.pot.addMoney(player, Decimal(ante))
+            self.pot.addCommonMoney(player, Decimal(ante))
+#I think the antes should be common money, don't have enough hand history to check
+        
     def addBlind(self, player, blindtype, amount):
         # if player is None, it's a missing small blind.
         # The situation we need to cover are:
@@ -340,9 +342,12 @@ For sites (currently only Carbon Poker) which record "all in" as a special actio
             self.actions['BLINDSANTES'].append(act)
 
             if blindtype == 'both':
-                amount = self.bb
-                self.bets['BLINDSANTES'][player].append(Decimal(self.sb))
-                self.pot.addCommonMoney(Decimal(self.sb))
+                # work with the real ammount. limit games are listed as $1, $2, where
+                # the SB 0.50 and the BB is $1, after the turn the minimum bet amount is $2....
+                amount = Decimal(amount)/3 
+                self.bets['BLINDSANTES'][player].append(amount)
+                self.pot.addCommonMoney(player, amount)
+                amount += amount
 
             self.bets['PREFLOP'][player].append(Decimal(amount))
             self.pot.addMoney(player, Decimal(amount))
@@ -504,10 +509,7 @@ Card ranks will be uppercased
             self.totalcollected = 0;
             #self.collected looks like [[p1,amount][px,amount]]
             for entry in self.collected:
-                self.totalcollected += Decimal(entry[1])
-
-
-
+                self.totalcollected += Decimal(entry[1]) 
 
     def getGameTypeAsString(self):
         """\
@@ -986,11 +988,12 @@ class DrawHand(Hand):
                 self.lastBet['DEAL'] = Decimal(amount)
             elif blindtype == 'both':
                 # extra small blind is 'dead'
-                self.lastBet['DEAL'] = Decimal(self.bb)
+                amount = Decimal(amount)/3
+                amount += amount
+                self.lastBet['DEAL'] = Decimal(amount)
         self.posted = self.posted + [[player,blindtype]]
         #print "DEBUG: self.posted: %s" %(self.posted)
 
-
     def addShownCards(self, cards, player, shown=True, mucked=False, dealt=False):
         if player == self.hero: # we have hero's cards just update shown/mucked
             if shown:  self.shown.add(player)
@@ -1405,7 +1408,7 @@ class Pot(object):
         self.contenders   = set()
         self.committed    = {}
         self.streettotals = {}
-        self.common       = Decimal(0)
+        self.common       = {}
         self.total        = None
         self.returned     = {}
         self.sym          = u'$' # this is the default currency symbol
@@ -1415,13 +1418,14 @@ class Pot(object):
 
     def addPlayer(self,player):
         self.committed[player] = Decimal(0)
+        self.common[player] = Decimal(0)
 
     def addFold(self, player):
         # addFold must be called when a player folds
         self.contenders.discard(player)
 
-    def addCommonMoney(self, amount):
-        self.common += amount
+    def addCommonMoney(self, player, amount):
+        self.common[player] += amount
 
     def addMoney(self, player, amount):
         # addMoney must be called for any actions that put money in the pot, in the order they occur
@@ -1429,7 +1433,7 @@ class Pot(object):
         self.committed[player] += amount
 
     def markTotal(self, street):
-        self.streettotals[street] = sum(self.committed.values()) + self.common
+        self.streettotals[street] = sum(self.committed.values()) + sum(self.common.values())
 
     def getTotalAtStreet(self, street):
         if street in self.streettotals:
@@ -1437,7 +1441,7 @@ class Pot(object):
         return 0
 
     def end(self):
-        self.total = sum(self.committed.values()) + self.common
+        self.total = sum(self.committed.values()) + sum(self.common.values())
 
         # Return any uncalled bet.
         committed = sorted([ (v,k) for (k,v) in self.committed.items()])
diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
index 39066b8e..6874c708 100644
--- a/pyfpdb/PokerStarsToFpdb.py
+++ b/pyfpdb/PokerStarsToFpdb.py
@@ -287,16 +287,14 @@ class PokerStars(HandHistoryConverter):
             hand.addBringIn(m.group('PNAME'),  m.group('BRINGIN'))
         
     def readBlinds(self, hand):
-        try:
-            count = 0
-            for a in self.re_PostSB.finditer(hand.handText):
-                if count == 0:
-                    hand.addBlind(a.group('PNAME'), 'small blind', a.group('SB'))
-                    count = 1
-                else:
-                    hand.addAnte(a.group('PNAME'), a.group('SB'))
-        except: # no small blind
-            hand.addBlind(None, None, None)
+        liveBlind = True
+        for a in self.re_PostSB.finditer(hand.handText):
+            if liveBlind:
+                hand.addBlind(a.group('PNAME'), 'small blind', a.group('SB'))
+                liveBlind = False
+            else:
+                # Post dead blinds as ante
+                hand.addAnte(a.group('PNAME'), a.group('SB'))
         for a in self.re_PostBB.finditer(hand.handText):
             hand.addBlind(a.group('PNAME'), 'big blind', a.group('BB'))
         for a in self.re_PostBoth.finditer(hand.handText):

From 35a604dcc6094fd4cedb6a53e0100ef29d09b244 Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Thu, 18 Feb 2010 16:39:51 +0100
Subject: [PATCH 264/320] Add support for posting dead small blind

---
 pyfpdb/FulltiltToFpdb.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index af55fd41..4ee12fa4 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -128,6 +128,7 @@ class Fulltilt(HandHistoryConverter):
             player_re = "(?P<PNAME>" + "|".join(map(re.escape, players)) + ")"
             logging.debug("player_re: " + player_re)
             self.re_PostSB           = re.compile(r"^%s posts the small blind of \$?(?P<SB>[.0-9]+)" %  player_re, re.MULTILINE)
+            self.re_PostDead         = re.compile(r"^%s posts a dead small blind of \$?(?P<SB>[.0-9]+)" %  player_re, re.MULTILINE)
             self.re_PostBB           = re.compile(r"^%s posts (the big blind of )?\$?(?P<BB>[.0-9]+)" % player_re, re.MULTILINE)
             self.re_Antes            = re.compile(r"^%s antes \$?(?P<ANTE>[.0-9]+)" % player_re, re.MULTILINE)
             self.re_BringIn          = re.compile(r"^%s brings in for \$?(?P<BRINGIN>[.0-9]+)" % player_re, re.MULTILINE)
@@ -298,6 +299,8 @@ class Fulltilt(HandHistoryConverter):
             hand.addBlind(m.group('PNAME'), 'small blind', m.group('SB'))
         except: # no small blind
             hand.addBlind(None, None, None)
+        for a in self.re_PostDead.finditer(hand.handText):
+            hand.addAnte(a.group('PNAME'), a.group('SB'))
         for a in self.re_PostBB.finditer(hand.handText):
             hand.addBlind(a.group('PNAME'), 'big blind', a.group('BB'))
         for a in self.re_PostBoth.finditer(hand.handText):

From 97ec91c165c79329406b8748911493ba043cf04a Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Thu, 18 Feb 2010 16:00:12 -0500
Subject: [PATCH 265/320] Revert fix removing the creation of folders for
 converted HHs.

---
 pyfpdb/HandHistoryConverter.py | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index 4bf7564d..41d5b39a 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -92,7 +92,23 @@ follow :  whether to tail -f the input"""
             self.out_fh = sys.stdout
         else:
             # TODO: out_path should be sanity checked.
-            self.out_fh = sys.stdout
+            out_dir = os.path.dirname(self.out_path) 
+            if not os.path.isdir(out_dir) and out_dir != '': 
+                try: 
+                    os.makedirs(out_dir) 
+                except: # we get a WindowsError here in Windows.. pretty sure something else for Linux :D 
+                    log.error("Unable to create output directory %s for HHC!" % out_dir) 
+                    print "*** ERROR: UNABLE TO CREATE OUTPUT DIRECTORY", out_dir 
+                    # TODO: pop up a box to allow person to choose output directory? 
+                    # TODO: shouldn't that be done when we startup, actually? 
+                else: 
+                    log.info("Created directory '%s'" % out_dir) 
+            try: 
+                self.out_fh = codecs.open(self.out_path, 'w', 'utf8') 
+            except: 
+                log.error("out_path %s couldn't be opened" % (self.out_path)) 
+            else: 
+                log.debug("out_path %s opened as %s" % (self.out_path, self.out_fh)) 
         self.follow = follow
         self.compiledPlayers   = set()
         self.maxseats  = 10

From 6272c057b93fadf675159414e31d4db7ea0739b4 Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Thu, 18 Feb 2010 22:12:01 +0100
Subject: [PATCH 266/320] Pokerstar Big and Small blind for limit games now
 derived form lookup table. This also needs to be done for PokerStars, don't
 know for the other sites....

---
 pyfpdb/Hand.py             | 11 +++++------
 pyfpdb/PokerStarsToFpdb.py | 30 ++++++++++++++++++++----------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 262ac4ad..b740a341 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -344,15 +344,14 @@ For sites (currently only Carbon Poker) which record "all in" as a special actio
             if blindtype == 'both':
                 # work with the real ammount. limit games are listed as $1, $2, where
                 # the SB 0.50 and the BB is $1, after the turn the minimum bet amount is $2....
-                amount = Decimal(amount)/3 
-                self.bets['BLINDSANTES'][player].append(amount)
-                self.pot.addCommonMoney(player, amount)
-                amount += amount
+                amount = self.bb 
+                self.bets['BLINDSANTES'][player].append(Decimal(self.sb))
+                self.pot.addCommonMoney(player, Decimal(self.sb))
 
             if blindtype == 'secondsb':
                 amount = Decimal(0)
                 self.bets['BLINDSANTES'][player].append(Decimal(self.sb))
-                self.pot.addCommonMoney(Decimal(self.sb))
+                self.pot.addCommonMoney(player, Decimal(self.sb))
 
             self.bets['PREFLOP'][player].append(Decimal(amount))
             self.pot.addMoney(player, Decimal(amount))
@@ -1450,7 +1449,7 @@ class Pot(object):
 
         # Return any uncalled bet.
         committed = sorted([ (v,k) for (k,v) in self.committed.items()])
-        print "DEBUG: committed: %s" % committed
+        #print "DEBUG: committed: %s" % committed
         #ERROR below. lastbet is correct in most cases, but wrong when 
         #             additional money is committed to the pot in cash games
         #             due to an additional sb being posted. (Speculate that
diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
index 87574e9d..8c222e12 100644
--- a/pyfpdb/PokerStarsToFpdb.py
+++ b/pyfpdb/PokerStarsToFpdb.py
@@ -140,6 +140,14 @@ class PokerStars(HandHistoryConverter):
 
         mg = m.groupdict()
         # translations from captured groups to fpdb info strings
+        Lim_Blinds = {  '0.04': ('0.01', '0.02'),    '0.10': ('0.02', '0.05'),     '0.20': ('0.05', '0.10'),
+                        '0.50': ('0.10', '0.25'),    '1.00': ('0.25', '0.50'),     '2.00': ('0.50', '1.00'), 
+                        '4.00': ('1.00', '2.00'),    '6.00': ('1.00', '3.00'),    '10.00': ('2.00', '5.00'),
+                       '20.00': ('5.00', '10.00'),  '30.00': ('10.00', '15.00'),  '60.00': ('15.00', '30.00'),
+                      '100.00': ('25.00', '50.00'),'200.00': ('50.00', '100.00'),'400.00': ('100.00', '200.00'),
+                     '1000.00': ('250.00', '500.00')}
+
+
         limits = { 'No Limit':'nl', 'Pot Limit':'pl', 'Limit':'fl' }
         games = {                          # base, category
                               "Hold'em" : ('hold','holdem'), 
@@ -173,6 +181,10 @@ class PokerStars(HandHistoryConverter):
         else:
             info['type'] = 'tour'
 
+        if info['limitType'] == 'fl' and info['bb'] != None:
+            info['sb'] = Lim_Blinds[mg['BB']][0] 
+            info['bb'] = Lim_Blinds[mg['BB']][1]
+
         # NB: SB, BB must be interpreted as blinds or bets depending on limit type.
         return info
 
@@ -287,16 +299,14 @@ class PokerStars(HandHistoryConverter):
             hand.addBringIn(m.group('PNAME'),  m.group('BRINGIN'))
         
     def readBlinds(self, hand):
-        try:
-            count = 0
-            for a in self.re_PostSB.finditer(hand.handText):
-                if count == 0:
-                    hand.addBlind(a.group('PNAME'), 'small blind', a.group('SB'))
-                    count = 1
-                else:
-                    hand.addBlind(a.group('PNAME'), 'secondsb', a.group('SB'))
-        except: # no small blind
-            hand.addBlind(None, None, None)
+        liveBlind = True
+        for a in self.re_PostSB.finditer(hand.handText):
+            if liveBlind:
+                hand.addBlind(a.group('PNAME'), 'small blind', a.group('SB'))
+                liveBlind = False
+            else:
+                # Post dead blinds as ante
+                hand.addBlind(a.group('PNAME'), 'secondsb', a.group('SB'))
         for a in self.re_PostBB.finditer(hand.handText):
             hand.addBlind(a.group('PNAME'), 'big blind', a.group('BB'))
         for a in self.re_PostBoth.finditer(hand.handText):

From aceb94d26055cf05bd7fdbbda74eb9bb712d5489 Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Thu, 18 Feb 2010 22:24:25 +0100
Subject: [PATCH 267/320] Oops... Lookup is only for ring games....

---
 pyfpdb/PokerStarsToFpdb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
index 8c222e12..946d5ea2 100644
--- a/pyfpdb/PokerStarsToFpdb.py
+++ b/pyfpdb/PokerStarsToFpdb.py
@@ -181,7 +181,7 @@ class PokerStars(HandHistoryConverter):
         else:
             info['type'] = 'tour'
 
-        if info['limitType'] == 'fl' and info['bb'] != None:
+        if info['limitType'] == 'fl' and info['bb'] != None and info['type'] == 'ring':
             info['sb'] = Lim_Blinds[mg['BB']][0] 
             info['bb'] = Lim_Blinds[mg['BB']][1]
 

From af6dbc8d5fffda420f27ea9a37a58f2dcbfb95c6 Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Thu, 18 Feb 2010 22:32:53 +0100
Subject: [PATCH 268/320] Copied same dead blind procedure from Pokerstars to
 Full Tilt

---
 pyfpdb/FulltiltToFpdb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index 4ee12fa4..2a3050ab 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -300,7 +300,7 @@ class Fulltilt(HandHistoryConverter):
         except: # no small blind
             hand.addBlind(None, None, None)
         for a in self.re_PostDead.finditer(hand.handText):
-            hand.addAnte(a.group('PNAME'), a.group('SB'))
+            hand.addBlind(a.group('PNAME'), 'secondsb', a.group('SB'))
         for a in self.re_PostBB.finditer(hand.handText):
             hand.addBlind(a.group('PNAME'), 'big blind', a.group('BB'))
         for a in self.re_PostBoth.finditer(hand.handText):

From c33575911d12e6e9af5e383103eeac2ba68ff1af Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Fri, 19 Feb 2010 17:50:45 -0500
Subject: [PATCH 269/320] Don't make folders or files for Stars format HHs.

---
 pyfpdb/HandHistoryConverter.py | 48 +++++++++++++++++++---------------
 pyfpdb/fpdb.py                 | 35 +++++++++++++------------
 2 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index 41d5b39a..0edaaed0 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -69,6 +69,7 @@ out_path  (default '-' = sys.stdout)
 follow :  whether to tail -f the input"""
 
         self.config = config
+        self.import_parameters = self.config.get_import_parameters()
         #log = Configuration.get_logger("logging.conf", "parser", log_dir=self.config.dir_log)
         log.info("HandHistory init - %s subclass, in_path '%s'; out_path '%s'" % (self.sitename, in_path, out_path) )
 
@@ -87,28 +88,8 @@ follow :  whether to tail -f the input"""
 
         if in_path == '-':
             self.in_fh = sys.stdin
+        self.out_fh = get_out_fh(out_path, self.import_parameters)
 
-        if out_path == '-':
-            self.out_fh = sys.stdout
-        else:
-            # TODO: out_path should be sanity checked.
-            out_dir = os.path.dirname(self.out_path) 
-            if not os.path.isdir(out_dir) and out_dir != '': 
-                try: 
-                    os.makedirs(out_dir) 
-                except: # we get a WindowsError here in Windows.. pretty sure something else for Linux :D 
-                    log.error("Unable to create output directory %s for HHC!" % out_dir) 
-                    print "*** ERROR: UNABLE TO CREATE OUTPUT DIRECTORY", out_dir 
-                    # TODO: pop up a box to allow person to choose output directory? 
-                    # TODO: shouldn't that be done when we startup, actually? 
-                else: 
-                    log.info("Created directory '%s'" % out_dir) 
-            try: 
-                self.out_fh = codecs.open(self.out_path, 'w', 'utf8') 
-            except: 
-                log.error("out_path %s couldn't be opened" % (self.out_path)) 
-            else: 
-                log.debug("out_path %s opened as %s" % (self.out_path, self.out_fh)) 
         self.follow = follow
         self.compiledPlayers   = set()
         self.maxseats  = 10
@@ -531,3 +512,28 @@ def getSiteHhc(config, sitename):
     hhcName = config.supported_sites[sitename].converter
     hhcModule = __import__(hhcName)
     return getattr(hhcModule, hhcName[:-6])
+
+def get_out_fh(out_path, parameters):
+    if out_path == '-':
+        return(sys.stdout)
+    elif parameters['saveStarsHH']:
+        # TODO: out_path should be sanity checked.
+        out_dir = os.path.dirname(self.out_path) 
+        if not os.path.isdir(out_dir) and out_dir != '': 
+            try: 
+                os.makedirs(out_dir) 
+            except: # we get a WindowsError here in Windows.. pretty sure something else for Linux :D 
+                log.error("Unable to create output directory %s for HHC!" % out_dir) 
+                print "*** ERROR: UNABLE TO CREATE OUTPUT DIRECTORY", out_dir 
+                # TODO: pop up a box to allow person to choose output directory? 
+                # TODO: shouldn't that be done when we startup, actually? 
+            else: 
+                log.info("Created directory '%s'" % out_dir) 
+        try: 
+            return(codecs.open(self.out_path, 'w', 'utf8')) 
+        except: 
+            log.error("out_path %s couldn't be opened" % (self.out_path)) 
+        else: 
+            log.debug("out_path %s opened as %s" % (self.out_path, self.out_fh))
+    else:
+         return(sys.stdout)
\ No newline at end of file
diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py
index 55b19a3b..0abffcd0 100755
--- a/pyfpdb/fpdb.py
+++ b/pyfpdb/fpdb.py
@@ -997,23 +997,24 @@ This program is licensed under the AGPL3, see docs"""+os.sep+"agpl-3.0.txt")
         return response
 
     def validate_config(self):
-        hhbase    = self.config.get_import_parameters().get("hhArchiveBase")
-        hhbase    = os.path.expanduser(hhbase)
-        #hhdir     = os.path.join(hhbase,site)
-        hhdir       = hhbase
-        if not os.path.isdir(hhdir):
-            diapath = gtk.MessageDialog(parent=None, flags=0, type=gtk.MESSAGE_WARNING, buttons=(gtk.BUTTONS_YES_NO), message_format="Setup hh dir")
-            diastring = "WARNING: Unable to find output hh directory %s\n\n Press YES to create this directory, or NO to select a new one." % hhdir
-            diapath.format_secondary_text(diastring)
-            response = diapath.run()
-            diapath.destroy()
-            if response == gtk.RESPONSE_YES:
-                try:
-                    os.makedirs(hhdir)
-                except:
-                    self.warning_box("WARNING: Unable to create hand output directory. Importing is not likely to work until this is fixed.")
-            elif response == gtk.RESPONSE_NO:
-               self.select_hhArchiveBase()
+        if self.config.get_import_parameters().get('saveStarsHH'):
+            hhbase    = self.config.get_import_parameters().get("hhArchiveBase")
+            hhbase    = os.path.expanduser(hhbase)
+            #hhdir     = os.path.join(hhbase,site)
+            hhdir       = hhbase
+            if not os.path.isdir(hhdir):
+                diapath = gtk.MessageDialog(parent=None, flags=0, type=gtk.MESSAGE_WARNING, buttons=(gtk.BUTTONS_YES_NO), message_format="Setup hh dir")
+                diastring = "WARNING: Unable to find output hh directory %s\n\n Press YES to create this directory, or NO to select a new one." % hhdir
+                diapath.format_secondary_text(diastring)
+                response = diapath.run()
+                diapath.destroy()
+                if response == gtk.RESPONSE_YES:
+                    try:
+                        os.makedirs(hhdir)
+                    except:
+                        self.warning_box("WARNING: Unable to create hand output directory. Importing is not likely to work until this is fixed.")
+                elif response == gtk.RESPONSE_NO:
+                    self.select_hhArchiveBase()
 
     def select_hhArchiveBase(self, widget=None):
         fc = gtk.FileChooserDialog(title="Select HH Output Directory", parent=None, action=gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER, buttons=(gtk.STOCK_OPEN,gtk.RESPONSE_OK), backend=None)

From a9ec972ba595022535377aeff3015dcb8df049cd Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Fri, 19 Feb 2010 20:14:34 -0500
Subject: [PATCH 270/320] Clean some pylint errors and obsolete TODOs.

---
 pyfpdb/HandHistoryConverter.py | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index 0edaaed0..2053eba9 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -443,8 +443,8 @@ or None if we fail to get the info """
     def guessMaxSeats(self, hand):
         """Return a guess at maxseats when not specified in HH."""
         # if some other code prior to this has already set it, return it
-        if maxseats > 1 and maxseats < 11:
-            return maxseats
+        if self.maxseats > 1 and self.maxseats < 11:
+            return self.maxseats
         mo = self.maxOccSeat(hand)
 
         if mo == 10: return 10 #that was easy
@@ -517,23 +517,18 @@ def get_out_fh(out_path, parameters):
     if out_path == '-':
         return(sys.stdout)
     elif parameters['saveStarsHH']:
-        # TODO: out_path should be sanity checked.
-        out_dir = os.path.dirname(self.out_path) 
+        out_dir = os.path.dirname(out_path) 
         if not os.path.isdir(out_dir) and out_dir != '': 
             try: 
                 os.makedirs(out_dir) 
             except: # we get a WindowsError here in Windows.. pretty sure something else for Linux :D 
                 log.error("Unable to create output directory %s for HHC!" % out_dir) 
                 print "*** ERROR: UNABLE TO CREATE OUTPUT DIRECTORY", out_dir 
-                # TODO: pop up a box to allow person to choose output directory? 
-                # TODO: shouldn't that be done when we startup, actually? 
             else: 
                 log.info("Created directory '%s'" % out_dir) 
         try: 
-            return(codecs.open(self.out_path, 'w', 'utf8')) 
+            return(codecs.open(out_path, 'w', 'utf8')) 
         except: 
-            log.error("out_path %s couldn't be opened" % (self.out_path)) 
-        else: 
-            log.debug("out_path %s opened as %s" % (self.out_path, self.out_fh))
+            log.error("out_path %s couldn't be opened" % (out_path)) 
     else:
-         return(sys.stdout)
\ No newline at end of file
+        return(sys.stdout)

From ebf2205859ef4a0ea55cad0ab1cbaeca04c8e2c0 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sat, 20 Feb 2010 10:27:58 +0000
Subject: [PATCH 271/320] display popup if error parsing config file

---
 pyfpdb/Configuration.py | 13 ++++++++++---
 pyfpdb/fpdb.py          |  6 ++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py
index f7694e90..3d506735 100755
--- a/pyfpdb/Configuration.py
+++ b/pyfpdb/Configuration.py
@@ -481,12 +481,19 @@ class Config:
         print "\nReading configuration file %s\n" % file
         try:
             doc = xml.dom.minidom.parse(file)
+            self.file_error = None
         except:
             log.error("Error parsing %s.  See error log file." % (file))
             traceback.print_exc(file=sys.stderr)
-            print "press enter to continue"
-            sys.stdin.readline()
-            sys.exit()
+            self.file_error = sys.exc_info()[1]
+            # we could add a parameter to decide whether to return or read a line and exit?
+            return
+            #print "press enter to continue"
+            #sys.stdin.readline()
+            #sys.exit()
+#ExpatError: not well-formed (invalid token): line 511, column 4
+#sys.exc_info = (<class 'xml.parsers.expat.ExpatError'>, ExpatError('not well-formed (invalid token): line 511,
+# column 4',), <traceback object at 0x024503A0>)
 
         self.doc = doc
         self.supported_sites = {}
diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py
index 55b19a3b..29f5ff6a 100755
--- a/pyfpdb/fpdb.py
+++ b/pyfpdb/fpdb.py
@@ -688,6 +688,12 @@ class fpdb:
     def load_profile(self):
         """Loads profile from the provided path name."""
         self.config = Configuration.Config(file=options.config, dbname=options.dbname)
+        if self.config.file_error:
+            self.warning_box( "There is an error in your config file\n" + self.config.file
+                              + "\n\nError is:  " + str(self.config.file_error)
+                            , diatitle="CONFIG FILE ERROR" )
+            exit()
+
         log = Configuration.get_logger("logging.conf", "fpdb", log_dir=self.config.dir_log)
         print "Logfile is " + os.path.join(self.config.dir_log, self.config.log_file) + "\n"
         if self.config.example_copy:

From ae59fa715b6bd56cfd65a52c7f281e46630ce410 Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Sat, 20 Feb 2010 11:24:07 -0500
Subject: [PATCH 272/320] Correctly pass dbname to config. Clean some pylint
 complaints.

---
 pyfpdb/HUD_main.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pyfpdb/HUD_main.py b/pyfpdb/HUD_main.py
index 2ea223f4..92f888d8 100755
--- a/pyfpdb/HUD_main.py
+++ b/pyfpdb/HUD_main.py
@@ -61,7 +61,7 @@ import Hud
 
 
 # get config and set up logger
-c = Configuration.Config(file=options.config)
+c = Configuration.Config(file=options.config, dbname=options.dbname)
 log = Configuration.get_logger("logging.conf", "hud", log_dir=c.dir_log, log_file='HUD-log.txt')
 
 
@@ -78,14 +78,14 @@ class HUD_main(object):
 
         try:
             if not options.errorsToConsole:
-                 fileName = os.path.join(self.config.dir_log, 'HUD-errors.txt')
-                 print "Note: error output is being diverted to:\n"+fileName \
-                       + "\nAny major error will be reported there _only_.\n" 
-                 log.info("Note: error output is being diverted to:"+fileName)
-                 log.info("Any major error will be reported there _only_.")
-                 errorFile = open(fileName, 'w', 0)
-                 sys.stderr = errorFile
-                 sys.stderr.write("HUD_main: starting ...\n")
+                fileName = os.path.join(self.config.dir_log, 'HUD-errors.txt')
+                print "Note: error output is being diverted to:\n"+fileName \
+                      + "\nAny major error will be reported there _only_.\n" 
+                log.info("Note: error output is being diverted to:"+fileName)
+                log.info("Any major error will be reported there _only_.")
+                errorFile = open(fileName, 'w', 0)
+                sys.stderr = errorFile
+                sys.stderr.write("HUD_main: starting ...\n")
 
             self.hud_dict = {}
             self.hud_params = self.config.get_hud_ui_parameters()
@@ -237,7 +237,7 @@ class HUD_main(object):
             try:
                 (table_name, max, poker_game, type, site_id, site_name, num_seats, tour_number, tab_number) = \
                                 self.db_connection.get_table_info(new_hand_id)
-            except Exception, err:
+            except Exception:
                 log.error("db error: skipping %s" % new_hand_id)
                 continue
             t1 = time.time()

From 21396e101ef4eadb1e90cf9dc759d231deacaaba Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Sat, 20 Feb 2010 11:55:52 -0500
Subject: [PATCH 273/320] Create saveStarsHH option in import.

---
 pyfpdb/Configuration.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py
index f7694e90..9112072e 100755
--- a/pyfpdb/Configuration.py
+++ b/pyfpdb/Configuration.py
@@ -414,6 +414,7 @@ class Import:
         self.hhArchiveBase = node.getAttribute("hhArchiveBase")
         self.saveActions = string_to_bool(node.getAttribute("saveActions"), default=True)
         self.fastStoreHudCache = string_to_bool(node.getAttribute("fastStoreHudCache"), default=False)
+        self.saveStarsHH = string_to_bool(node.getAttribute("saveStarsHH"), default=False)
 
     def __str__(self):
         return "    interval = %s\n    callFpdbHud = %s\n    hhArchiveBase = %s\n    saveActions = %s\n    fastStoreHudCache = %s\n" \
@@ -808,8 +809,12 @@ class Config:
         try:    imp['saveActions']     = self.imp.saveActions
         except:  imp['saveActions']     = True
 
+        try:    imp['saveStarsHH'] = self.imp.saveStarsHH
+        except:  imp['saveStarsHH'] = False
+
         try:    imp['fastStoreHudCache'] = self.imp.fastStoreHudCache
         except:  imp['fastStoreHudCache'] = True
+
         return imp
 
     def get_default_paths(self, site = None):

From 141b88ecfd9f045d2c108ba684e5032e868e932b Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sat, 20 Feb 2010 17:49:03 +0000
Subject: [PATCH 274/320] stop hudcache updating again when importing duplicate
 hands

---
 pyfpdb/Hand.py        | 3 +++
 pyfpdb/fpdb_import.py | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 73dd7600..e54354e8 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -125,6 +125,7 @@ class Hand(object):
         # currency symbol for this hand
         self.sym = self.SYMBOL[self.gametype['currency']] # save typing! delete this attr when done
         self.pot.setSym(self.sym)
+        self.is_duplicate = False  # i.e. don't update hudcache if true
 
     def __str__(self):
         vars = ( ("BB", self.bb),
@@ -236,6 +237,7 @@ db: a connected Database object"""
             # TourneysPlayers
         else:
             log.info("Hand.insert(): hid #: %s is a duplicate" % hh['siteHandNo'])
+            self.is_duplicate = True  # i.e. don't update hudcache
             raise FpdbHandDuplicate(hh['siteHandNo'])
 
     def updateHudCache(self, db):
@@ -669,6 +671,7 @@ class HoldemOmahaHand(Hand):
             if self.maxseats is None:
                 self.maxseats = hhc.guessMaxSeats(self)
             hhc.readOther(self)
+            #print "\nHand:\n"+str(self)
         elif builtFrom == "DB":
             if handid is not None:
                 self.select(handid) # Will need a handId
diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index 95ffd525..689858e0 100755
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -456,7 +456,7 @@ class Importer:
                 # FIXME: Need to test for bulk import that isn't rebuilding the cache
                 if self.callHud:
                     for hand in handlist:
-                        if hand is not None:
+                        if hand is not None and not hand.is_duplicate:
                             hand.updateHudCache(self.database)
                 self.database.commit()
 

From 09801cd00e4ea3e8eb6cfd89ecbce105e04d622e Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sat, 20 Feb 2010 18:59:49 +0000
Subject: [PATCH 275/320] first go at db maintenance window, turned off for now

---
 pyfpdb/Configuration.py | 31 ++++++++------
 pyfpdb/Database.py      | 92 +++++++++++++++++++++--------------------
 pyfpdb/fpdb.py          | 38 +++++++++++++----
 3 files changed, 97 insertions(+), 64 deletions(-)

diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py
index 3d506735..07c96a04 100755
--- a/pyfpdb/Configuration.py
+++ b/pyfpdb/Configuration.py
@@ -695,18 +695,8 @@ class Config:
         try:    db['db-server'] = self.supported_databases[name].db_server
         except: pass
 
-        if self.supported_databases[name].db_server== DATABASE_TYPE_MYSQL:
-            db['db-backend'] = 2
-        elif self.supported_databases[name].db_server== DATABASE_TYPE_POSTGRESQL:
-            db['db-backend'] = 3
-        elif self.supported_databases[name].db_server== DATABASE_TYPE_SQLITE:
-            db['db-backend'] = 4
-            # sqlcoder: this assignment fixes unicode problems for me with sqlite (windows, cp1252)
-            #           feel free to remove or improve this if you understand the problems
-            #           better than me (not hard!)
-            Charset.not_needed1, Charset.not_needed2, Charset.not_needed3 = True, True, True
-        else:
-            raise ValueError('Unsupported database backend: %s' % self.supported_databases[name].db_server)
+        db['db-backend'] = self.get_backend(self.supported_databases[name].db_server)
+
         return db
 
     def set_db_parameters(self, db_name = 'fpdb', db_ip = None, db_user = None,
@@ -725,6 +715,23 @@ class Config:
             if db_server is not None: self.supported_databases[db_name].dp_server = db_server
             if db_type   is not None: self.supported_databases[db_name].dp_type   = db_type
         return
+    
+    def get_backend(self, name):
+        """Returns the number of the currently used backend"""
+        if name == DATABASE_TYPE_MYSQL:
+            ret = 2
+        elif name == DATABASE_TYPE_POSTGRESQL:
+            ret = 3
+        elif name == DATABASE_TYPE_SQLITE:
+            ret = 4
+            # sqlcoder: this assignment fixes unicode problems for me with sqlite (windows, cp1252)
+            #           feel free to remove or improve this if you understand the problems
+            #           better than me (not hard!)
+            Charset.not_needed1, Charset.not_needed2, Charset.not_needed3 = True, True, True
+        else:
+            raise ValueError('Unsupported database backend: %s' % self.supported_databases[name].db_server)
+
+        return ret
 
     def getDefaultSite(self):
         "Returns first enabled site or None"
diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index 0303aad2..debaee59 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -226,7 +226,7 @@ class Database:
     # create index indexname on tablename (col);
 
 
-    def __init__(self, c, sql = None): 
+    def __init__(self, c, sql = None, autoconnect = True): 
         #log = Configuration.get_logger("logging.conf", "db", log_dir=c.dir_log)
         log.debug("Creating Database instance, sql = %s" % sql)
         self.config = c
@@ -247,41 +247,42 @@ class Database:
         else:
             self.sql = sql
 
-        # connect to db
-        self.do_connect(c)
-        
-        if self.backend == self.PGSQL:
-            from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT, ISOLATION_LEVEL_READ_COMMITTED, ISOLATION_LEVEL_SERIALIZABLE
-            #ISOLATION_LEVEL_AUTOCOMMIT     = 0
-            #ISOLATION_LEVEL_READ_COMMITTED = 1 
-            #ISOLATION_LEVEL_SERIALIZABLE   = 2
+        if autoconnect:
+            # connect to db
+            self.do_connect(c)
+            
+            if self.backend == self.PGSQL:
+                from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT, ISOLATION_LEVEL_READ_COMMITTED, ISOLATION_LEVEL_SERIALIZABLE
+                #ISOLATION_LEVEL_AUTOCOMMIT     = 0
+                #ISOLATION_LEVEL_READ_COMMITTED = 1 
+                #ISOLATION_LEVEL_SERIALIZABLE   = 2
 
 
-        if self.backend == self.SQLITE and self.database == ':memory:' and self.wrongDbVersion:
-            log.info("sqlite/:memory: - creating")
-            self.recreate_tables()
-            self.wrongDbVersion = False
+            if self.backend == self.SQLITE and self.database == ':memory:' and self.wrongDbVersion:
+                log.info("sqlite/:memory: - creating")
+                self.recreate_tables()
+                self.wrongDbVersion = False
 
-        self.pcache      = None     # PlayerId cache
-        self.cachemiss   = 0        # Delete me later - using to count player cache misses
-        self.cachehit    = 0        # Delete me later - using to count player cache hits
+            self.pcache      = None     # PlayerId cache
+            self.cachemiss   = 0        # Delete me later - using to count player cache misses
+            self.cachehit    = 0        # Delete me later - using to count player cache hits
 
-        # config while trying out new hudcache mechanism
-        self.use_date_in_hudcache = True
+            # config while trying out new hudcache mechanism
+            self.use_date_in_hudcache = True
 
-        #self.hud_hero_style = 'T'  # Duplicate set of vars just for hero - not used yet.
-        #self.hud_hero_hands = 2000 # Idea is that you might want all-time stats for others
-        #self.hud_hero_days  = 30   # but last T days or last H hands for yourself
+            #self.hud_hero_style = 'T'  # Duplicate set of vars just for hero - not used yet.
+            #self.hud_hero_hands = 2000 # Idea is that you might want all-time stats for others
+            #self.hud_hero_days  = 30   # but last T days or last H hands for yourself
 
-        # vars for hand ids or dates fetched according to above config:
-        self.hand_1day_ago = 0             # max hand id more than 24 hrs earlier than now
-        self.date_ndays_ago = 'd000000'    # date N days ago ('d' + YYMMDD)
-        self.h_date_ndays_ago = 'd000000'  # date N days ago ('d' + YYMMDD) for hero
-        self.date_nhands_ago = {}          # dates N hands ago per player - not used yet
+            # vars for hand ids or dates fetched according to above config:
+            self.hand_1day_ago = 0             # max hand id more than 24 hrs earlier than now
+            self.date_ndays_ago = 'd000000'    # date N days ago ('d' + YYMMDD)
+            self.h_date_ndays_ago = 'd000000'  # date N days ago ('d' + YYMMDD) for hero
+            self.date_nhands_ago = {}          # dates N hands ago per player - not used yet
 
-        self.saveActions = False if self.import_options['saveActions'] == False else True
+            self.saveActions = False if self.import_options['saveActions'] == False else True
 
-        self.connection.rollback()  # make sure any locks taken so far are released
+            self.connection.rollback()  # make sure any locks taken so far are released
     #end def __init__
 
     # could be used by hud to change hud style
@@ -313,7 +314,7 @@ class Database:
         self.__connected = True
 
     def connect(self, backend=None, host=None, database=None,
-                user=None, password=None):
+                user=None, password=None, create=False):
         """Connects a database with the given parameters"""
         if backend is None:
             raise FpdbError('Database backend not defined')
@@ -384,32 +385,35 @@ class Database:
             #    log.warning("SQLite won't work well without 'sqlalchemy' installed.")
 
             if database != ":memory:":
-                if not os.path.isdir(self.config.dir_database):
+                if not os.path.isdir(self.config.dir_database) and create:
                     print "Creating directory: '%s'" % (self.config.dir_database)
                     log.info("Creating directory: '%s'" % (self.config.dir_database))
                     os.mkdir(self.config.dir_database)
                 database = os.path.join(self.config.dir_database, database)
             self.db_path = database
             log.info("Connecting to SQLite: %(database)s" % {'database':self.db_path})
-            self.connection = sqlite3.connect(self.db_path, detect_types=sqlite3.PARSE_DECLTYPES )
-            sqlite3.register_converter("bool", lambda x: bool(int(x)))
-            sqlite3.register_adapter(bool, lambda x: "1" if x else "0")
-            self.connection.create_function("floor", 1, math.floor)
-            tmp = sqlitemath()
-            self.connection.create_function("mod", 2, tmp.mod)
-            if use_numpy:
-                self.connection.create_aggregate("variance", 1, VARIANCE)
+            if os.path.exists(database) or create:
+                self.connection = sqlite3.connect(self.db_path, detect_types=sqlite3.PARSE_DECLTYPES )
+                sqlite3.register_converter("bool", lambda x: bool(int(x)))
+                sqlite3.register_adapter(bool, lambda x: "1" if x else "0")
+                self.connection.create_function("floor", 1, math.floor)
+                tmp = sqlitemath()
+                self.connection.create_function("mod", 2, tmp.mod)
+                if use_numpy:
+                    self.connection.create_aggregate("variance", 1, VARIANCE)
+                else:
+                    log.warning("Some database functions will not work without NumPy support")
+                self.cursor = self.connection.cursor()
+                self.cursor.execute('PRAGMA temp_store=2')  # use memory for temp tables/indexes
+                self.cursor.execute('PRAGMA synchronous=0') # don't wait for file writes to finish
             else:
-                log.warning("Some database functions will not work without NumPy support")
-            self.cursor = self.connection.cursor()
-            self.cursor.execute('PRAGMA temp_store=2')  # use memory for temp tables/indexes
-            self.cursor.execute('PRAGMA synchronous=0') # don't wait for file writes to finish
+                raise FpdbError("sqlite database "+database+" does not exist")
         else:
-            raise FpdbError("unrecognised database backend:"+backend)
+            raise FpdbError("unrecognised database backend:"+str(backend))
 
         self.cursor = self.connection.cursor()
         self.cursor.execute(self.sql.query['set tx level'])
-        self.check_version(database=database, create=True)
+        self.check_version(database=database, create=create)
 
 
     def check_version(self, database, create):
diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py
index 29f5ff6a..7e81d1e6 100755
--- a/pyfpdb/fpdb.py
+++ b/pyfpdb/fpdb.py
@@ -97,6 +97,7 @@ except:
 
 import GuiPrefs
 import GuiLogView
+import GuiDatabase
 import GuiBulkImport
 import GuiPlayerStats
 import GuiPositionalStats
@@ -288,10 +289,31 @@ class fpdb:
 
         dia.destroy()
 
-    def dia_create_del_database(self, widget, data=None):
-        self.warning_box("Unimplemented: Create/Delete Database")
-        self.obtain_global_lock()
-        self.release_global_lock()
+    def dia_maintain_dbs(self, widget, data=None):
+        self.warning_box("Unimplemented: Maintain Databases")
+        return
+        if len(self.tab_names) == 1:
+            if self.obtain_global_lock():  # returns true if successful
+                # only main tab has been opened, open dialog
+                dia = gtk.Dialog("Maintain Databases",
+                                 self.window,
+                                 gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
+                                 (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT,
+                                  gtk.STOCK_SAVE, gtk.RESPONSE_ACCEPT))
+                dia.set_default_size(700, 320)
+
+                prefs = GuiDatabase.GuiDatabase(self.config, self.window, dia)
+                response = dia.run()
+                if response == gtk.RESPONSE_ACCEPT:
+                    # save updated config
+                    self.config.save()
+
+                self.release_global_lock()
+
+            dia.destroy()
+        else:
+            self.warning_box("Cannot open Database Maintenance window because "
+                             + "other windows have been opened. Re-start fpdb to use this option.")
 
     def dia_create_del_user(self, widget, data=None):
         self.warning_box("Unimplemented: Create/Delete user")
@@ -620,7 +642,7 @@ class fpdb:
                   <menuitem action="tableviewer"/>
                 </menu>
                 <menu action="database">
-                  <menuitem action="createdb"/>
+                  <menuitem action="maintaindbs"/>
                   <menuitem action="createuser"/>
                   <menuitem action="createtabs"/>
                   <menuitem action="rebuildhudcache"/>
@@ -663,7 +685,7 @@ class fpdb:
                                  ('sessionreplay', None, '_Session Replayer (todo)', None, 'Session Replayer (todo)', self.not_implemented),
                                  ('tableviewer', None, 'Poker_table Viewer (mostly obselete)', None, 'Poker_table Viewer (mostly obselete)', self.tab_table_viewer),
                                  ('database', None, '_Database'),
-                                 ('createdb', None, 'Create or Delete _Database (todo)', None, 'Create or Delete Database', self.dia_create_del_database),
+                                 ('maintaindbs', None, '_Maintain Databases (todo)', None, 'Maintain Databases', self.dia_maintain_dbs),
                                  ('createuser', None, 'Create or Delete _User (todo)', None, 'Create or Delete User', self.dia_create_del_user),
                                  ('createtabs', None, 'Create or Recreate _Tables', None, 'Create or Recreate Tables ', self.dia_recreate_tables),
                                  ('rebuildhudcache', None, 'Rebuild HUD Cache', None, 'Rebuild HUD Cache', self.dia_recreate_hudcache),
@@ -685,7 +707,7 @@ class fpdb:
         window.add_accel_group(accel_group)
         return menubar
 
-    def load_profile(self):
+    def load_profile(self, create_db = False):
         """Loads profile from the provided path name."""
         self.config = Configuration.Config(file=options.config, dbname=options.dbname)
         if self.config.file_error:
@@ -911,7 +933,7 @@ This program is licensed under the AGPL3, see docs"""+os.sep+"agpl-3.0.txt")
         self.tab_main_help(None, None)
 
         self.window.show()
-        self.load_profile()
+        self.load_profile(create_db = True)
 
         if not options.errorsToConsole:
             fileName = os.path.join(self.config.dir_log, 'fpdb-errors.txt')

From da124770af5ccdb44794422f16290f72350bcc8a Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Mon, 22 Feb 2010 11:45:52 -0500
Subject: [PATCH 276/320] Add souce code locations for 3rd party libs + minor
 update.

---
 docs/readme.txt | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/docs/readme.txt b/docs/readme.txt
index 03e071d3..e3dbac23 100644
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -1,5 +1,5 @@
 README.txt
-updated 26 March 2009, REB
+updated 22 February 2010, REB
 
 fpdb - Free Poker Database
 
@@ -29,7 +29,7 @@ fpdb supports:
         Omaha (incl Hi/low)
         7 Card Stud (incl Hi/low)
         Razz
-        Draw support is under development
+        Triple Draw and Badugi
         Mixed Games -- HUD under development
 
     Operating Systems:
@@ -38,23 +38,38 @@ fpdb supports:
         Mac OS/X --  no support for HUD
 
     Databases:
+        SQLite configured by default
         MySQL
         PostgreSQL
-        SQLite under development
 
 Downloads:
     Releases: http://sourceforge.net/project/showfiles.php?group_id=226872
     Development code via git: http://www.assembla.com/spaces/free_poker_tools/trac_git_tool
 
 Developers:
-    At least 7 people have contributed code or patches. Others are welcome.
+    At least 10 people have contributed code or patches. Others are welcome.
 
+Source Code:
+    If you received fpdb as the Windows compressed exe, then you did not
+receive souce code for fpdb or the included libraries. If you wish, you can
+obtain the source code here:
+
+    fpdb:       see Downloads, above.
+    python:     http://python.org/
+    gtk:        http://www.gtk.org/download.html
+    pygtk:      http://www.pygtk.org/downloads.html
+    psycopg2:   http://initd.org/pub/software/psycopg/
+    mysqldb:    http://sourceforge.net/projects/mysql-python/files/
+    sqlalchemy: http://www.sqlalchemy.org/download.html
+    numpy:      http://www.scipy.org/Download
+    matplotlib: http://sourceforge.net/projects/matplotlib/files/
+    
 License
 =======
 Trademarks of third parties have been used under Fair Use or similar laws.
 
 Copyright 2008 Steffen Jobbagy-Felso
-Copyright 2009 Ray E. Barker
+Copyright 2009,2010 Ray E. Barker
 Permission is granted to copy, distribute and/or modify this
 document under the terms of the GNU Free Documentation License,
 Version 1.2 as published by the Free Software Foundation; with

From 9dac1f1b8409966d7bdc6c968e85ef808c685473 Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Tue, 23 Feb 2010 18:55:09 +0100
Subject: [PATCH 277/320] When all players are selected in player stats The
 site filter settings were bypassed.

This fix only selects all players from selected sites
---
 pyfpdb/GuiPlayerStats.py | 24 ++++++++++++++++++++----
 pyfpdb/SQL.py            |  3 +++
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/pyfpdb/GuiPlayerStats.py b/pyfpdb/GuiPlayerStats.py
index 047c1ff1..39c6c727 100644
--- a/pyfpdb/GuiPlayerStats.py
+++ b/pyfpdb/GuiPlayerStats.py
@@ -81,7 +81,7 @@ class GuiPlayerStats (threading.Thread):
         self.filters = Filters.Filters(self.db, self.conf, self.sql, display = filters_display)
         self.filters.registerButton1Name("_Filters")
         self.filters.registerButton1Callback(self.showDetailFilter)
-        self.filters.registerButton2Name("_Refresh Stats")
+        self.filters.registerButton2Name("_Refresh")
         self.filters.registerButton2Callback(self.refreshStats)
 
         # ToDo: store in config
@@ -481,7 +481,23 @@ class GuiPlayerStats (threading.Thread):
                 else:
                     gametest = "and gt.category IS NULL"
         query = query.replace("<game_test>", gametest)
-
+        
+        sitetest = ""
+        q = []
+        for m in self.filters.display.items():
+            if m[0] == 'Sites' and m[1]:
+                for n in sitenos:
+                        q.append(n)
+                if len(q) > 0:
+                    sitetest = str(tuple(q))
+                    sitetest = sitetest.replace("L", "")
+                    sitetest = sitetest.replace(",)",")")
+                    sitetest = sitetest.replace("u'","'")
+                    sitetest = "and gt.siteId in %s" % sitetest
+                else:
+                    sitetest = "and gt.siteId IS NULL"
+        query = query.replace("<site_test>", sitetest)
+        
         if seats:
             query = query.replace('<seats_test>', 'between ' + str(seats['from']) + ' and ' + str(seats['to']))
             if 'show' in seats and seats['show']:
@@ -520,7 +536,7 @@ class GuiPlayerStats (threading.Thread):
             blindtest = str(tuple(nolims))
             blindtest = blindtest.replace("L", "")
             blindtest = blindtest.replace(",)",")")
-            bbtest = bbtest + blindtest + ' ) ) )'
+            bbtest = bbtest + blindtest + ' ) )'
         else:
             bbtest = bbtest + '(-1) ) )'
         if type == 'ring':
@@ -539,7 +555,7 @@ class GuiPlayerStats (threading.Thread):
             query = query.replace("<orderbyhgameTypeId>", "")
             groupLevels = "show" not in str(limits)
             if groupLevels:
-                query = query.replace("<hgameTypeId>", "p.name")
+                query = query.replace("<hgameTypeId>", "-1")
             else:
                 query = query.replace("<hgameTypeId>", "h.gameTypeId")
 
diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py
index 6db24fb4..570edb34 100644
--- a/pyfpdb/SQL.py
+++ b/pyfpdb/SQL.py
@@ -1915,6 +1915,7 @@ class Sql:
                            inner join Players p     on  (p.Id = hp.playerId)
                       where hp.playerId in <player_test>
                       <game_test>
+                      <site_test>
                       /*and   hp.tourneysPlayersId IS NULL*/
                       and   h.seats <seats_test>
                       <flagtest>
@@ -1999,6 +2000,7 @@ class Sql:
                            inner join Players p     on  (p.Id = hp.playerId)
                       where hp.playerId in <player_test>
                       <game_test>
+                      <site_test>
                       /*and   hp.tourneysPlayersId IS NULL*/
                       and   h.seats <seats_test>
                       <flagtest>
@@ -2085,6 +2087,7 @@ class Sql:
                            inner join Players p     on  (p.Id = hp.playerId)
                       where hp.playerId in <player_test>
                       <game_test>
+                      <site_test>
                       /*and   hp.tourneysPlayersId IS NULL*/
                       and   h.seats <seats_test>
                       <flagtest>

From 03880bbc63f7635821b5ff5ac75796d83ef6a94a Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Wed, 24 Feb 2010 10:28:12 -0500
Subject: [PATCH 278/320] Trivial refactor of get_stats_from_hand for
 readability.

---
 pyfpdb/Database.py | 43 ++++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index 0303aad2..76addf59 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -643,6 +643,29 @@ class Database:
                            , hero_id = -1
                            , num_seats = 6
                            ):
+
+        (hud_style, h_hud_style, query, subs) = self.prep_aggregation(hand, hud_params, hero_id, num_seats)
+
+        c = self.connection.cursor()
+
+#       now get the stats
+        stat_dict = {}
+        c.execute(self.sql.query[query], subs)
+        colnames = [desc[0] for desc in c.description]
+        for row in c.fetchall():
+            playerid = row[0]
+            if (playerid == hero_id and h_hud_style != 'S') or (playerid != hero_id and hud_style != 'S'):
+                t_dict = {}
+                for name, val in zip(colnames, row):
+                    t_dict[name.lower()] = val
+#                    print t_dict
+                stat_dict[t_dict['player_id']] = t_dict
+
+        return stat_dict
+
+    def prep_aggregation(self, hand, hud_params, hero_id, num_seats):
+#    This sorts through the all the info having to do with aggregation
+#    and returns what get_stats needs. 
         hud_style   = hud_params['hud_style']
         agg_bb_mult = hud_params['agg_bb_mult']
         seats_style = hud_params['seats_style']
@@ -652,8 +675,6 @@ class Database:
         h_seats_style = hud_params['h_seats_style']
         h_seats_cust_nums = hud_params['h_seats_cust_nums']
 
-        stat_dict = {}
-
         if seats_style == 'A':
             seats_min, seats_max = 0, 10
         elif seats_style == 'C':
@@ -715,23 +736,7 @@ class Database:
         subs = (hand
                ,hero_id, stylekey, agg_bb_mult, agg_bb_mult, seats_min, seats_max  # hero params
                ,hero_id, h_stylekey, h_agg_bb_mult, h_agg_bb_mult, h_seats_min, h_seats_max)    # villain params
-
-        #print "get stats: hud style =", hud_style, "query =", query, "subs =", subs
-        c = self.connection.cursor()
-
-#       now get the stats
-        c.execute(self.sql.query[query], subs)
-        colnames = [desc[0] for desc in c.description]
-        for row in c.fetchall():
-            playerid = row[0]
-            if (playerid == hero_id and h_hud_style != 'S') or (playerid != hero_id and hud_style != 'S'):
-                t_dict = {}
-                for name, val in zip(colnames, row):
-                    t_dict[name.lower()] = val
-#                    print t_dict
-                stat_dict[t_dict['player_id']] = t_dict
-
-        return stat_dict
+        return (hud_style, h_hud_style, query, subs)
 
     # uses query on handsplayers instead of hudcache to get stats on just this session
     def get_stats_from_hand_session(self, hand, stat_dict, hero_id

From 6ac76d2d9be0021bbd1a00ecd10d4895f81effe5 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Wed, 24 Feb 2010 21:25:19 +0000
Subject: [PATCH 279/320] remove earlier bracket change that screwed stats up -
 it seemed necessary then but I can't figure out why now

---
 pyfpdb/GuiPlayerStats.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/GuiPlayerStats.py b/pyfpdb/GuiPlayerStats.py
index 047c1ff1..3c3f46e3 100644
--- a/pyfpdb/GuiPlayerStats.py
+++ b/pyfpdb/GuiPlayerStats.py
@@ -520,7 +520,7 @@ class GuiPlayerStats (threading.Thread):
             blindtest = str(tuple(nolims))
             blindtest = blindtest.replace("L", "")
             blindtest = blindtest.replace(",)",")")
-            bbtest = bbtest + blindtest + ' ) ) )'
+            bbtest = bbtest + blindtest + ' ) )'
         else:
             bbtest = bbtest + '(-1) ) )'
         if type == 'ring':

From 04e8f117d5ebd47a29307328002d5f1bc49449ef Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Wed, 24 Feb 2010 17:06:36 -0500
Subject: [PATCH 280/320] Revert "Trivial refactor of get_stats_from_hand for
 readability."

This reverts commit 03880bbc63f7635821b5ff5ac75796d83ef6a94a.
---
 pyfpdb/Database.py | 43 +++++++++++++++++++------------------------
 1 file changed, 19 insertions(+), 24 deletions(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index 76addf59..0303aad2 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -643,29 +643,6 @@ class Database:
                            , hero_id = -1
                            , num_seats = 6
                            ):
-
-        (hud_style, h_hud_style, query, subs) = self.prep_aggregation(hand, hud_params, hero_id, num_seats)
-
-        c = self.connection.cursor()
-
-#       now get the stats
-        stat_dict = {}
-        c.execute(self.sql.query[query], subs)
-        colnames = [desc[0] for desc in c.description]
-        for row in c.fetchall():
-            playerid = row[0]
-            if (playerid == hero_id and h_hud_style != 'S') or (playerid != hero_id and hud_style != 'S'):
-                t_dict = {}
-                for name, val in zip(colnames, row):
-                    t_dict[name.lower()] = val
-#                    print t_dict
-                stat_dict[t_dict['player_id']] = t_dict
-
-        return stat_dict
-
-    def prep_aggregation(self, hand, hud_params, hero_id, num_seats):
-#    This sorts through the all the info having to do with aggregation
-#    and returns what get_stats needs. 
         hud_style   = hud_params['hud_style']
         agg_bb_mult = hud_params['agg_bb_mult']
         seats_style = hud_params['seats_style']
@@ -675,6 +652,8 @@ class Database:
         h_seats_style = hud_params['h_seats_style']
         h_seats_cust_nums = hud_params['h_seats_cust_nums']
 
+        stat_dict = {}
+
         if seats_style == 'A':
             seats_min, seats_max = 0, 10
         elif seats_style == 'C':
@@ -736,7 +715,23 @@ class Database:
         subs = (hand
                ,hero_id, stylekey, agg_bb_mult, agg_bb_mult, seats_min, seats_max  # hero params
                ,hero_id, h_stylekey, h_agg_bb_mult, h_agg_bb_mult, h_seats_min, h_seats_max)    # villain params
-        return (hud_style, h_hud_style, query, subs)
+
+        #print "get stats: hud style =", hud_style, "query =", query, "subs =", subs
+        c = self.connection.cursor()
+
+#       now get the stats
+        c.execute(self.sql.query[query], subs)
+        colnames = [desc[0] for desc in c.description]
+        for row in c.fetchall():
+            playerid = row[0]
+            if (playerid == hero_id and h_hud_style != 'S') or (playerid != hero_id and hud_style != 'S'):
+                t_dict = {}
+                for name, val in zip(colnames, row):
+                    t_dict[name.lower()] = val
+#                    print t_dict
+                stat_dict[t_dict['player_id']] = t_dict
+
+        return stat_dict
 
     # uses query on handsplayers instead of hudcache to get stats on just this session
     def get_stats_from_hand_session(self, hand, stat_dict, hero_id

From a26dfa09f25ac1c5f6369afb246345ea66dd6ddd Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Wed, 24 Feb 2010 22:21:13 +0000
Subject: [PATCH 281/320] automation: prompt for gtk dir location and copy
 files and dirs - resulting dir should be ready for distribution (once zipped
 up)

---
 pyfpdb/py2exe_setup.py | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/py2exe_setup.py b/pyfpdb/py2exe_setup.py
index 9975317f..cf9560af 100644
--- a/pyfpdb/py2exe_setup.py
+++ b/pyfpdb/py2exe_setup.py
@@ -73,6 +73,7 @@ from distutils.core import setup
 import py2exe
 import glob
 import matplotlib
+import shutil
 from datetime import date
 
 
@@ -111,7 +112,7 @@ def test_and_remove(top):
 # remove build and dist dirs if they exist
 test_and_remove('dist')
 test_and_remove('build')
-test_and_remove('gfx')
+#test_and_remove('gfx')
 
 
 today = date.today().strftime('%Y%m%d')
@@ -174,3 +175,36 @@ dest = dest.replace('\\', '\\\\')
 os.rename( 'pyfpdb', dest )
 
 
+print "Enter directory name for GTK 2.14 (e.g. c:\code\gtk_2.14.7-20090119)\n: ",     # the comma means no newline
+gtk_dir = sys.stdin.readline().rstrip()
+
+
+print "\ncopying files and dirs from ", gtk_dir, "to", dest.replace('\\\\', '\\'), "..."
+src = os.path.join(gtk_dir, 'bin', 'libgdk-win32-2.0-0.dll')
+src = src.replace('\\', '\\\\')
+shutil.copy( src, dest )
+
+src = os.path.join(gtk_dir, 'bin', 'libgobject-2.0-0.dll')
+src = src.replace('\\', '\\\\')
+shutil.copy( src, dest )
+
+
+src_dir = os.path.join(gtk_dir, 'etc')
+src_dir = src_dir.replace('\\', '\\\\')
+dest_dir = os.path.join(dest, 'etc')
+dest_dir = dest_dir.replace('\\', '\\\\')
+shutil.copytree( src_dir, dest_dir )
+
+src_dir = os.path.join(gtk_dir, 'lib')
+src_dir = src_dir.replace('\\', '\\\\')
+dest_dir = os.path.join(dest, 'lib')
+dest_dir = dest_dir.replace('\\', '\\\\')
+shutil.copytree( src_dir, dest_dir )
+
+src_dir = os.path.join(gtk_dir, 'share')
+src_dir = src_dir.replace('\\', '\\\\')
+dest_dir = os.path.join(dest, 'share')
+dest_dir = dest_dir.replace('\\', '\\\\')
+shutil.copytree( src_dir, dest_dir )
+
+

From 134a13bf298678c4f59bebbd4e443e7f240475d7 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Thu, 25 Feb 2010 20:43:15 +0000
Subject: [PATCH 282/320] create indexes on hudcache in sqlite

---
 pyfpdb/Database.py | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index debaee59..d0fe733b 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -142,14 +142,18 @@ class Database:
                 , {'tab':'TourneyTypes',    'col':'siteId',            'drop':0}
                 ]
               , [ # indexes for sqlite (list index 4)
-                #  {'tab':'Players',         'col':'name',              'drop':0}  unique indexes not dropped
-                #  {'tab':'Hands',           'col':'siteHandNo',        'drop':0}  unique indexes not dropped
                   {'tab':'Hands',           'col':'gametypeId',        'drop':0}
                 , {'tab':'HandsPlayers',    'col':'handId',            'drop':0} 
                 , {'tab':'HandsPlayers',    'col':'playerId',          'drop':0}
                 , {'tab':'HandsPlayers',    'col':'tourneyTypeId',     'drop':0}
                 , {'tab':'HandsPlayers',    'col':'tourneysPlayersId', 'drop':0}
-                #, {'tab':'Tourneys',        'col':'siteTourneyNo',     'drop':0}  unique indexes not dropped
+                , {'tab':'HudCache',        'col':'gametypeId',        'drop':1}
+                , {'tab':'HudCache',        'col':'playerId',          'drop':0}
+                , {'tab':'HudCache',        'col':'tourneyTypeId',     'drop':0}
+                , {'tab':'Players',         'col':'siteId',            'drop':1}
+                , {'tab':'Tourneys',        'col':'tourneyTypeId',     'drop':1}
+                , {'tab':'TourneysPlayers', 'col':'playerId',          'drop':0}
+                , {'tab':'TourneyTypes',    'col':'siteId',            'drop':0}
                 ]
               ]
 
@@ -725,6 +729,8 @@ class Database:
 
 #       now get the stats
         c.execute(self.sql.query[query], subs)
+        #for row in c.fetchall():   # needs "explain query plan" in sql statement
+        #    print "query plan: ", row
         colnames = [desc[0] for desc in c.description]
         for row in c.fetchall():
             playerid = row[0]
@@ -2100,6 +2106,7 @@ class HandToWrite:
 
 if __name__=="__main__":
     c = Configuration.Config()
+    sql = SQL.Sql(db_server = 'sqlite')
 
     db_connection = Database(c) # mysql fpdb holdem
 #    db_connection = Database(c, 'fpdb-p', 'test') # mysql fpdb holdem
@@ -2117,12 +2124,25 @@ if __name__=="__main__":
     if hero:
         print "nutOmatic is id_player = %d" % hero
     
+    # example of displaying query plan in sqlite:
+    if db_connection.backend == 4:
+        print
+        c = db_connection.get_cursor()
+        c.execute('explain query plan '+sql.query['get_table_name'], (h, ))
+        for row in c.fetchall():
+            print "query plan: ", row
+        print
+    
+    t0 = time()
     stat_dict = db_connection.get_stats_from_hand(h, "ring")
+    t1 = time()
     for p in stat_dict.keys():
         print p, "  ", stat_dict[p]
         
     print "cards =", db_connection.get_cards(u'1')
     db_connection.close_connection
+    
+    print "get_stats took:  %4.3f seconds" % (t1-t0)
 
     print "press enter to continue"
     sys.stdin.readline()

From 70bb9d687dfe441274f717d18aa4be61c8935864 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Thu, 25 Feb 2010 20:57:28 +0000
Subject: [PATCH 283/320] add commented out 'explain query plan' to go with
 previous commit

---
 pyfpdb/SQL.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py
index 6db24fb4..51863698 100644
--- a/pyfpdb/SQL.py
+++ b/pyfpdb/SQL.py
@@ -1346,6 +1346,7 @@ class Sql:
 
 #    same as above except stats are aggregated for all blind/limit levels
         self.query['get_stats_from_hand_aggregated'] = """
+                /* explain query plan */
                 SELECT hc.playerId                         AS player_id,
                        max(case when hc.gametypeId = h.gametypeId
                                 then hp.seatNo

From 5c0e4cb0c2b623effbd8d91d6191d69ca9f8ab8d Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Thu, 25 Feb 2010 20:28:41 -0500
Subject: [PATCH 284/320] Use correct dirs for database and log.

---
 pyfpdb/Configuration.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py
index d87014e6..d0f81a1b 100755
--- a/pyfpdb/Configuration.py
+++ b/pyfpdb/Configuration.py
@@ -470,7 +470,8 @@ class Config:
 
         self.file = file
         self.dir_self = get_exec_path()
-        self.dir_config = os.path.dirname(self.file)
+#        self.dir_config = os.path.dirname(self.file)
+        self.dir_config = get_default_config_path()
         self.dir_log = os.path.join(self.dir_config, 'log')
         self.dir_database = os.path.join(self.dir_config, 'database')
         self.log_file = os.path.join(self.dir_log, 'fpdb-log.txt')

From aca5682daf4fe6a4402ef47592c77a01b3c7ae28 Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Thu, 25 Feb 2010 21:32:49 -0500
Subject: [PATCH 285/320] Get rid of erroneous error message.

---
 pyfpdb/XTables.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pyfpdb/XTables.py b/pyfpdb/XTables.py
index a14debc1..28737002 100644
--- a/pyfpdb/XTables.py
+++ b/pyfpdb/XTables.py
@@ -89,7 +89,6 @@ class Table(Table_Window):
 #                    break
 
         if window_number is None:
-            print "Window %s not found. Skipping." % search_string
             return None
 
 #        my_geo = self.window.get_geometry()

From daeee37b6b04017a7dff151b8b63f7102affc7cd Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sat, 27 Feb 2010 13:56:19 +0000
Subject: [PATCH 286/320] default dbname option is overriding 'default=true'
 selection in config file

---
 pyfpdb/Options.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/Options.py b/pyfpdb/Options.py
index 6570dbe4..bda28259 100644
--- a/pyfpdb/Options.py
+++ b/pyfpdb/Options.py
@@ -27,7 +27,7 @@ def fpdb_options():
                       action="store_true",
                       help="If passed error output will go to the console rather than .")
     parser.add_option("-d", "--databaseName",
-                      dest="dbname", default="fpdb",
+                      dest="dbname",
                       help="Overrides the default database name")
     parser.add_option("-c", "--configFile",
                       dest="config", default=None,

From 4ed82b1f183d192ed6544ff890cbb9d600305afb Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sat, 27 Feb 2010 15:47:24 +0000
Subject: [PATCH 287/320] comment out DEBUG print

---
 pyfpdb/Hand.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 56a11063..e9626522 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -1449,7 +1449,7 @@ class Pot(object):
 
         # Return any uncalled bet.
         committed = sorted([ (v,k) for (k,v) in self.committed.items()])
-        print "DEBUG: committed: %s" % committed
+        #print "DEBUG: committed: %s" % committed
         #ERROR below. lastbet is correct in most cases, but wrong when 
         #             additional money is committed to the pot in cash games
         #             due to an additional sb being posted. (Speculate that

From 6a6d1b1b2c8ffd6e2352db726b9322ba2974cfed Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sat, 27 Feb 2010 18:41:30 +0000
Subject: [PATCH 288/320] fix 3bet stat (was being set to false if someone else
 4bet)

---
 pyfpdb/Database.py     | 4 ----
 pyfpdb/DerivedStats.py | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index d0fe733b..f51ce5f5 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -917,7 +917,6 @@ class Database:
                         print "warning: constraint %s_%s_fkey not dropped: %s, continuing ..." \
                               % (fk['fktab'],fk['fkcol'], str(sys.exc_value).rstrip('\n'))
                 else:
-                    print "Only MySQL and Postgres supported so far"
                     return -1
         
         for idx in self.indexes[self.backend]:
@@ -952,7 +951,6 @@ class Database:
                         print "warning: index %s_%s_idx not dropped %s, continuing ..." \
                               % (idx['tab'],idx['col'], str(sys.exc_value).rstrip('\n'))
                 else:
-                    print "Error: Only MySQL and Postgres supported so far"
                     return -1
 
         if self.backend == self.PGSQL:
@@ -1007,7 +1005,6 @@ class Database:
                     except:
                         print "   create fk failed: " + str(sys.exc_info())
                 else:
-                    print "Only MySQL and Postgres supported so far"
                     return -1
         
         for idx in self.indexes[self.backend]:
@@ -1029,7 +1026,6 @@ class Database:
                     except:
                         print "   create index failed: " + str(sys.exc_info())
                 else:
-                    print "Only MySQL and Postgres supported so far"
                     return -1
 
         if self.backend == self.PGSQL:
diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py
index dddbec8b..b13e7463 100644
--- a/pyfpdb/DerivedStats.py
+++ b/pyfpdb/DerivedStats.py
@@ -345,9 +345,9 @@ class DerivedStats():
         for action in hand.actions[hand.actionStreets[1]]:
             # FIXME: fill other(3|4)BStreet0 - i have no idea what does it mean
             pname, aggr = action[0], action[1] in ('raises', 'bets')
-            self.handsplayers[pname]['street0_3BChance'] = bet_level == 2
+            self.handsplayers[pname]['street0_3BChance'] = self.handsplayers[pname]['street0_3BChance'] or bet_level == 2
             self.handsplayers[pname]['street0_4BChance'] = bet_level == 3
-            self.handsplayers[pname]['street0_3BDone'] =  aggr and (self.handsplayers[pname]['street0_3BChance'])
+            self.handsplayers[pname]['street0_3BDone'] =  self.handsplayers[pname]['street0_3BDone'] or (aggr and self.handsplayers[pname]['street0_3BChance'])
             self.handsplayers[pname]['street0_4BDone'] =  aggr and (self.handsplayers[pname]['street0_4BChance'])
             if aggr:
                 bet_level += 1

From 8e8444d8f20433fefe8aea0a518bcdc55ba7f036 Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Sat, 27 Feb 2010 16:59:00 -0500
Subject: [PATCH 289/320] Comment out intermediate print.

---
 pyfpdb/XTables.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/XTables.py b/pyfpdb/XTables.py
index 28737002..29a9b1d9 100644
--- a/pyfpdb/XTables.py
+++ b/pyfpdb/XTables.py
@@ -68,7 +68,7 @@ class Table(Table_Window):
         window_number = None
         for listing in os.popen('xwininfo -root -tree').readlines():
             if re.search(search_string, listing):
-                print listing
+#                print listing
                 mo = re.match('\s+([\dxabcdef]+) (.+):\s\(\"([a-zA-Z.]+)\".+  (\d+)x(\d+)\+\d+\+\d+  \+(\d+)\+(\d+)', listing)
                 self.number = int( mo.group(1), 0)
                 self.width  = int( mo.group(4) )

From 14a7784124f2632c52ff18f23572fcfacb37ff16 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sun, 28 Feb 2010 08:53:44 +0000
Subject: [PATCH 290/320] oops, forgot to add this in earlier commit

---
 pyfpdb/GuiDatabase.py | 298 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 298 insertions(+)
 create mode 100755 pyfpdb/GuiDatabase.py

diff --git a/pyfpdb/GuiDatabase.py b/pyfpdb/GuiDatabase.py
new file mode 100755
index 00000000..86c125c9
--- /dev/null
+++ b/pyfpdb/GuiDatabase.py
@@ -0,0 +1,298 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+#Copyright 2008 Carl Gherardi
+#This program is free software: you can redistribute it and/or modify
+#it under the terms of the GNU Affero General Public License as published by
+#the Free Software Foundation, version 3 of the License.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU Affero General Public License
+#along with this program. If not, see <http://www.gnu.org/licenses/>.
+#In the "official" distribution you can find the license in
+#agpl-3.0.txt in the docs folder of the package.
+
+
+import os
+import sys
+import traceback
+import Queue
+
+import pygtk
+pygtk.require('2.0')
+import gtk
+import gobject
+import pango
+
+import logging
+# logging has been set up in fpdb.py or HUD_main.py, use their settings:
+log = logging.getLogger("maintdbs")
+
+
+import Exceptions
+import Database
+
+
+class GuiDatabase:
+
+    COL_DBMS = 0
+    COL_NAME = 1
+    COL_DESC = 2
+    COL_USER = 3
+    COL_PASS = 4
+    COL_HOST = 5
+    COL_ICON = 6
+
+    def __init__(self, config, mainwin, dia):
+        self.config = config
+        self.main_window = mainwin
+        self.dia = dia
+
+        try:
+            #self.dia.set_modal(True)
+            self.vbox = self.dia.vbox
+            #gtk.Widget.set_size_request(self.vbox, 700, 400);
+
+            # list of databases in self.config.supported_databases:
+            self.liststore = gtk.ListStore(str, str, str, str
+                                          ,str, str, str, str)  #object, gtk.gdk.Pixbuf)
+            #                              dbms, name, comment, user, pass, ip, status(, icon?)
+            # this is how to add a filter:
+            #
+            # # Creation of the filter, from the model
+            # filter = self.liststore.filter_new()
+            # filter.set_visible_column(1)
+            #
+            # # The TreeView gets the filter as model
+            # self.listview = gtk.TreeView(filter)
+            self.listview = gtk.TreeView(model=self.liststore)
+            self.listview.set_grid_lines(gtk.TREE_VIEW_GRID_LINES_NONE)
+            self.listcols = []
+
+            scrolledwindow = gtk.ScrolledWindow()
+            scrolledwindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+            scrolledwindow.add(self.listview)
+            self.vbox.pack_start(scrolledwindow, expand=True, fill=True, padding=0)
+
+            refreshbutton = gtk.Button("Refresh")
+            refreshbutton.connect("clicked", self.refresh, None)
+            self.vbox.pack_start(refreshbutton, False, False, 3)
+            refreshbutton.show()
+
+            col = self.addTextColumn("Type", 0, False)
+            col = self.addTextColumn("Name", 1, False)
+            col = self.addTextColumn("Description", 2, True)
+            col = self.addTextColumn("Username", 3, True)
+            col = self.addTextColumn("Password", 4, True)
+            col = self.addTextColumn("Host", 5, True)
+            col = self.addTextObjColumn("", 6)
+
+            self.loadDbs()
+
+            self.dia.connect('response', self.dialog_response_cb)
+        except:
+            err = traceback.extract_tb(sys.exc_info()[2])[-1]
+            print 'guidbmaint: '+ err[2] + "(" + str(err[1]) + "): " + str(sys.exc_info()[1])
+
+    def dialog_response_cb(self, dialog, response_id):
+        # this is called whether close button is pressed or window is closed
+        dialog.destroy()
+
+
+    def get_dialog(self):
+        return self.dia
+
+    def addTextColumn(self, title, n, editable=False):
+        col = gtk.TreeViewColumn(title)
+        self.listview.append_column(col)
+
+        cRender = gtk.CellRendererText()
+        cRender.set_property("wrap-mode", pango.WRAP_WORD_CHAR)
+        cRender.set_property('editable', editable)
+        cRender.connect('edited', self.edited_cb, (self.liststore,n))
+
+        col.pack_start(cRender, True)
+        col.add_attribute(cRender, 'text', n)
+        col.set_max_width(1000)
+        col.set_spacing(0)  # no effect
+        self.listcols.append(col)
+        col.set_clickable(True)
+        col.connect("clicked", self.sortCols, n)
+
+        return(col)
+
+    def edited_cb(self, cell, path, new_text, user_data):
+        liststore, col = user_data
+        valid = True
+        name = self.liststore[path][self.COL_NAME]
+
+        # Validate new value (only for dbms so far, but dbms now not updateable so no validation at all!)
+        #if col == self.COL_DBMS:
+        #    if new_text not in Configuration.DATABASE_TYPES:
+        #        valid = False
+
+        if valid:
+            self.liststore[path][col] = new_text
+
+            self.config.set_db_parameters( db_server = self.liststore[path][self.COL_DBMS]
+                                         , db_name = name
+                                         , db_ip = self.liststore[path][self.COL_HOST]
+                                         , db_user = self.liststore[path][self.COL_USER]
+                                         , db_pass = self.liststore[path][self.COL_PASS] )
+
+        return
+
+    def check_new_name(self, path, new_text):
+        name_ok = True
+        for i,db in enumerate(self.liststore):
+            if i != path and new_text == db[self.COL_NAME]:
+                name_ok = False
+        #TODO: popup an error message telling user names must be unique
+        return name_ok
+
+    def addTextObjColumn(self, title, n):
+        col = gtk.TreeViewColumn(title)
+        self.listview.append_column(col)
+
+        cRenderT = gtk.CellRendererText()
+        cRenderT.set_property("wrap-mode", pango.WRAP_WORD_CHAR)
+        col.pack_start(cRenderT, False)
+        col.add_attribute(cRenderT, 'text', n)
+
+        cRenderP = gtk.CellRendererPixbuf()
+        col.pack_start(cRenderP, False)
+        col.add_attribute(cRenderP, 'stock-id', n+1)
+
+        col.set_max_width(1000)
+        col.set_spacing(0)  # no effect
+        self.listcols.append(col)
+        #col.set_clickable(True)
+        #col.connect("clicked", self.sortCols, p)
+        return(col)
+
+    def loadDbs(self):
+
+        self.liststore.clear()
+        self.listcols = []
+        self.dbs = []   # list of tuples:  (dbms, name, comment, user, passwd, host, status, icon)
+
+        try:
+            # want to fill: dbms, name, comment, user, passwd, host, status(, icon?)
+            for name in self.config.supported_databases: #db_ip/db_user/db_pass/db_server
+                dbms = self.config.supported_databases[name].db_server  # mysql/postgresql/sqlite
+                dbms_num = self.config.get_backend(dbms)              #   2  /    3     /  4
+                comment = ""
+                if dbms == 'sqlite':
+                    user = ""
+                    passwd = ""
+                else:
+                    user = self.config.supported_databases[name].db_user
+                    passwd = self.config.supported_databases[name].db_pass
+                host = self.config.supported_databases[name].db_ip
+                status = ""
+                icon = None
+                err_msg = ""
+                
+                db = Database.Database(self.config, sql = None, autoconnect = False)
+                # try to connect to db, set status and err_msg if it fails
+                try:
+                    # is creating empty db for sqlite ... mod db.py further?
+                    # add noDbTables flag to db.py?
+                    db.connect(backend=dbms_num, host=host, database=name, user=user, password=passwd, create=False)
+                    if db.connected:
+                        status = 'ok'
+                        icon = gtk.STOCK_APPLY
+                        if db.wrongDbVersion:
+                            status = 'old'
+                            icon = gtk.STOCK_INFO
+                except Exceptions.FpdbMySQLAccessDenied:
+                    err_msg = "MySQL Server reports: Access denied. Are your permissions set correctly?"
+                    status = "failed"
+                    icon = gtk.STOCK_CANCEL
+                except Exceptions.FpdbMySQLNoDatabase:
+                    err_msg = "MySQL client reports: 2002 or 2003 error. Unable to connect - " \
+                              + "Please check that the MySQL service has been started"
+                    status = "failed"
+                    icon = gtk.STOCK_CANCEL
+                except Exceptions.FpdbPostgresqlAccessDenied:
+                    err_msg = "Postgres Server reports: Access denied. Are your permissions set correctly?"
+                    status = "failed"
+                except Exceptions.FpdbPostgresqlNoDatabase:
+                    err_msg = "Postgres client reports: Unable to connect - " \
+                              + "Please check that the Postgres service has been started"
+                    status = "failed"
+                    icon = gtk.STOCK_CANCEL
+                except:
+                    err = traceback.extract_tb(sys.exc_info()[2])[-1]
+                    log.info( 'db connection to '+str(dbms_num)+','+host+','+name+','+user+','+passwd+' failed: '
+                              + err[2] + "(" + str(err[1]) + "): " + str(sys.exc_info()[1]) )
+                    status = "failed"
+                    icon = gtk.STOCK_CANCEL
+
+                b = gtk.Button(name)
+                b.show()
+                iter = self.liststore.append( (dbms, name, comment, user, passwd, host, status, icon) )
+
+            self.listview.show()
+            scrolledwindow.show()
+            self.vbox.show()
+            self.dia.set_focus(self.listview)
+
+            self.vbox.show_all()
+            self.dia.show()
+        except:
+            err = traceback.extract_tb(sys.exc_info()[2])[-1]
+            print 'loaddbs error: '+str(dbms_num)+','+host+','+name+','+user+','+passwd+' failed: ' \
+                      + err[2] + "(" + str(err[1]) + "): " + str(sys.exc_info()[1])
+
+    def sortCols(self, col, n):
+        try:
+            if not col.get_sort_indicator() or col.get_sort_order() == gtk.SORT_ASCENDING:
+                col.set_sort_order(gtk.SORT_DESCENDING)
+            else:
+                col.set_sort_order(gtk.SORT_ASCENDING)
+            self.liststore.set_sort_column_id(n, col.get_sort_order())
+            #self.liststore.set_sort_func(n, self.sortnums, (n,grid))
+            for i in xrange(len(self.listcols)):
+                self.listcols[i].set_sort_indicator(False)
+            self.listcols[n].set_sort_indicator(True)
+            # use this   listcols[col].set_sort_indicator(True)
+            # to turn indicator off for other cols
+        except:
+            err = traceback.extract_tb(sys.exc_info()[2])
+            print "***sortCols error: " + str(sys.exc_info()[1])
+            print "\n".join( [e[0]+':'+str(e[1])+" "+e[2] for e in err] )
+
+    def refresh(self, widget, data):
+        self.loadDbs()
+
+
+
+if __name__=="__main__":
+
+    config = Configuration.Config()
+
+    win = gtk.Window(gtk.WINDOW_TOPLEVEL)
+    win.set_title("Test Log Viewer")
+    win.set_border_width(1)
+    win.set_default_size(600, 500)
+    win.set_resizable(True)
+
+    dia = gtk.Dialog("Log Viewer",
+                     win,
+                     gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
+                     (gtk.STOCK_CLOSE, gtk.RESPONSE_OK))
+    dia.set_default_size(500, 500)
+    log = GuiLogView(config, win, dia.vbox)
+    response = dia.run()
+    if response == gtk.RESPONSE_ACCEPT:
+        pass
+    dia.destroy()
+
+
+
+

From 6daf2382415a666d470aa75a0ab938c7f1a1158d Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Sun, 28 Feb 2010 22:20:09 -0500
Subject: [PATCH 291/320] Add readme.txt to the exe.

---
 pyfpdb/py2exe_setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/py2exe_setup.py b/pyfpdb/py2exe_setup.py
index cf9560af..0db53a40 100644
--- a/pyfpdb/py2exe_setup.py
+++ b/pyfpdb/py2exe_setup.py
@@ -152,7 +152,7 @@ setup(
               },
 
     # files in 2nd value in tuple are moved to dir named in 1st value
-    data_files = [('', ['HUD_config.xml.example', 'Cards01.png', 'logging.conf'])
+    data_files = [('', ['HUD_config.xml.example', 'Cards01.png', 'logging.conf', '../docs/readme.txt'])
                  ,(dist_dir, [r'..\run_fpdb.bat'])
                  ,( dist_dir + r'\gfx', glob.glob(r'..\gfx\*.*') )
                  # line below has problem with fonts subdir ('not a regular file')

From 444ec73f1dc02c9579c2983f16fb8157127a437a Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Mon, 1 Mar 2010 19:26:45 -0500
Subject: [PATCH 292/320] Update for changes to Tables.Table() call.

---
 pyfpdb/Tables_Demo.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/Tables_Demo.py b/pyfpdb/Tables_Demo.py
index 397579e7..92bb1a3c 100755
--- a/pyfpdb/Tables_Demo.py
+++ b/pyfpdb/Tables_Demo.py
@@ -32,12 +32,16 @@ import gtk
 import gobject
 
 #    fpdb/free poker tools modules
+import Configuration
+from HandHistoryConverter import getTableTitleRe
+
 #    get the correct module for the current os
 if os.name == 'posix':
     import XTables as Tables
 elif os.name == 'nt':
     import WinTables as Tables
 
+config = Configuration.Config()
 #   Main function used for testing
 if __name__=="__main__":
 #    c = Configuration.Config()
@@ -82,11 +86,16 @@ if __name__=="__main__":
         (tour_no, tab_no) = table_name.split(",", 1)
         tour_no = tour_no.rstrip()
         tab_no = tab_no.rstrip()
-        table = Tables.Table(None, tournament = tour_no, table_number = tab_no)
+        type = "tour"
+        table_kwargs = dict(tournament = tour_no, table_number = tab_no)
     else:   # not a tournament
         print "cash game"
         table_name = table_name.rstrip()
-        table = Tables.Table(None, table_name = table_name)
+        type = "cash"
+        table_kwargs = dict(table_name = table_name)
+
+    search_string = getTableTitleRe(config, "Full Tilt Poker", type, **table_kwargs)
+    table = Tables.Table(search_string, **table_kwargs)
     table.gdk_handle = gtk.gdk.window_foreign_new(table.number)
 
     print "table =", table

From 6a176090407b5fc5542b795441a224b4c52fa5ee Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Tue, 2 Mar 2010 15:51:40 +0800
Subject: [PATCH 293/320] FullTilt: Playernames can be 2 chars long

Found a hand history where the playername was 'OG'. The parser assumed player names were a minimum of 3 characters.
---
 pyfpdb/FulltiltToFpdb.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index 2a3050ab..10ecb8dd 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -65,8 +65,8 @@ class Fulltilt(HandHistoryConverter):
                                          (\s\((?P<TURBO>Turbo)\))?)|(?P<UNREADABLE_INFO>.+))
                                     ''', re.VERBOSE)
     re_Button       = re.compile('^The button is in seat #(?P<BUTTON>\d+)', re.MULTILINE)
-    re_PlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.{3,15}) \(\$(?P<CASH>[,.0-9]+)\)$', re.MULTILINE)
-    re_TourneyPlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.{3,15}) \(\$?(?P<CASH>[,.0-9]+)\)(, is sitting out)?$', re.MULTILINE)
+    re_PlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.{2,15}) \(\$(?P<CASH>[,.0-9]+)\)$', re.MULTILINE)
+    re_TourneyPlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.{2,15}) \(\$?(?P<CASH>[,.0-9]+)\)(, is sitting out)?$', re.MULTILINE)
     re_Board        = re.compile(r"\[(?P<CARDS>.+)\]")
 
     #static regex for tourney purpose

From 4c37877c7fea98e3911cb25280be9f041d22b94c Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Tue, 2 Mar 2010 21:44:07 +0100
Subject: [PATCH 294/320] Uncalled bet needs to be subtracted from the
 collectees.

the self.collectees is used in the derived stats.
The uncalled part of the bet was added to the players profit.
---
 pyfpdb/PartyPokerToFpdb.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyfpdb/PartyPokerToFpdb.py b/pyfpdb/PartyPokerToFpdb.py
index 5fdeae0c..c4f73813 100755
--- a/pyfpdb/PartyPokerToFpdb.py
+++ b/pyfpdb/PartyPokerToFpdb.py
@@ -260,6 +260,7 @@ class PartyPoker(HandHistoryConverter):
                 for i,v in enumerate(self.collected):
                     if v[0] in self.pot.returned:
                         self.collected[i][1] = Decimal(v[1]) - self.pot.returned[v[0]]
+                        self.collectees[v[0]] -= self.pot.returned[v[0]]
                 return origTotalPot()
             return totalPot
         instancemethod = type(hand.totalPot)

From 1e11109e1fd5749a86e26668333e443ce27d119e Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Tue, 2 Mar 2010 21:55:32 +0100
Subject: [PATCH 295/320] Support for new Hand History format for Party Poker

Don't have enough 'old' HH to test
---
 pyfpdb/PartyPokerToFpdb.py | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/pyfpdb/PartyPokerToFpdb.py b/pyfpdb/PartyPokerToFpdb.py
index c4f73813..21344415 100755
--- a/pyfpdb/PartyPokerToFpdb.py
+++ b/pyfpdb/PartyPokerToFpdb.py
@@ -105,13 +105,20 @@ class PartyPoker(HandHistoryConverter):
 
     def guessMaxSeats(self, hand):
         """Return a guess at max_seats when not specified in HH."""
-        mo = self.maxOccSeat(hand)
-
-        if mo == 10: return mo
-        if mo == 2: return 2
-        if mo <= 6: return 6
-        # there are 9-max tables for cash and 10-max for tournaments
-        return 9 if hand.gametype['type']=='ring' else 10
+        # Total number of players : 4/6 
+        re_seats = re.compile("""Total\s+number\s+of\s+players\s+\:\s+\d+.{1}(?P<SEATS>\d+)""" , re.VERBOSE)
+        try:            
+            m = re_seats.search(hand.handText)
+            mo = m.groupdict()
+            mo = _mo['SEATS']
+            return mo
+        except:
+            mo = self.maxOccSeat(hand)
+            if mo == 10: return mo
+            if mo == 2: return 2
+            if mo <= 6: return 6
+            # there are 9-max tables for cash and 10-max for tournaments
+            return 9 if hand.gametype['type']=='ring' else 10
 
     def compilePlayerRegexs(self,  hand):
         players = set([player[1] for player in hand.players])

From 4272ee36a266d0b10f9b6667fe89a251ad29ad0b Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Wed, 3 Mar 2010 00:42:13 -0500
Subject: [PATCH 296/320] Change for new HH format. Still work to do here.

---
 pyfpdb/PartyPokerToFpdb.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pyfpdb/PartyPokerToFpdb.py b/pyfpdb/PartyPokerToFpdb.py
index 21344415..356b3984 100755
--- a/pyfpdb/PartyPokerToFpdb.py
+++ b/pyfpdb/PartyPokerToFpdb.py
@@ -83,8 +83,9 @@ class PartyPoker(HandHistoryConverter):
             (\(No\sDP\)\s)?
             \((?P<PLAY>Real|Play)\s+Money\)\s+ # FIXME: check if play money is correct
             Seat\s+(?P<BUTTON>\d+)\sis\sthe\sbutton
+            \s+Total\s+number\s+of\s+players\s+\:\s+(?P<PLYRS>\d+)/?(?P<MAX>\d+)?
             """,
-          re.VERBOSE|re.MULTILINE)
+          re.VERBOSE|re.MULTILINE|re.DOTALL)
 
     re_CountedSeats = re.compile("^Total\s+number\s+of\s+players\s*:\s*(?P<COUNTED_SEATS>\d+)", re.MULTILINE)
     re_SplitHands   = re.compile('\x00+')
@@ -105,8 +106,6 @@ class PartyPoker(HandHistoryConverter):
 
     def guessMaxSeats(self, hand):
         """Return a guess at max_seats when not specified in HH."""
-        # Total number of players : 4/6 
-        re_seats = re.compile("""Total\s+number\s+of\s+players\s+\:\s+\d+.{1}(?P<SEATS>\d+)""" , re.VERBOSE)
         try:            
             m = re_seats.search(hand.handText)
             mo = m.groupdict()
@@ -321,6 +320,9 @@ class PartyPoker(HandHistoryConverter):
             if key == 'PLAY' and info['PLAY'] != 'Real':
                 # if realy party doesn's save play money hh
                 hand.gametype['currency'] = 'play'
+            if key == 'MAX':
+                hand.maxseats = int(info[key])
+
 
     def readButton(self, hand):
         m = self.re_Button.search(hand.handText)

From 17b02c1cd9cc5939e96f9ee2dcdec586c2f48e05 Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Wed, 3 Mar 2010 12:57:30 -0500
Subject: [PATCH 297/320] Fix for missing TTYPE in HandInfo.

---
 pyfpdb/PartyPokerToFpdb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/PartyPokerToFpdb.py b/pyfpdb/PartyPokerToFpdb.py
index 356b3984..759ed33d 100755
--- a/pyfpdb/PartyPokerToFpdb.py
+++ b/pyfpdb/PartyPokerToFpdb.py
@@ -77,7 +77,7 @@ class PartyPoker(HandHistoryConverter):
           re.VERBOSE)
 
     re_HandInfo     = re.compile("""
-            ^Table\s+(?P<TTYPE>[$a-zA-Z0-9 ]+)\s+
+            ^Table\s+(?P<TTYPE>[$a-zA-Z0-9 ]+)?\s+
             (?: \#|\(|)(?P<TABLE>\d+)\)?\s+
             (?:[a-zA-Z0-9 ]+\s+\#(?P<MTTTABLE>\d+).+)?
             (\(No\sDP\)\s)?

From 2452293c1ebb3c9fe9cad0be2bc067341d519a27 Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Wed, 3 Mar 2010 13:05:06 -0500
Subject: [PATCH 298/320] Fix problem with old (pre 2010) HHs.

---
 pyfpdb/PartyPokerToFpdb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/PartyPokerToFpdb.py b/pyfpdb/PartyPokerToFpdb.py
index 759ed33d..46c8776b 100755
--- a/pyfpdb/PartyPokerToFpdb.py
+++ b/pyfpdb/PartyPokerToFpdb.py
@@ -320,7 +320,7 @@ class PartyPoker(HandHistoryConverter):
             if key == 'PLAY' and info['PLAY'] != 'Real':
                 # if realy party doesn's save play money hh
                 hand.gametype['currency'] = 'play'
-            if key == 'MAX':
+            if key == 'MAX' and info[key] is not None:
                 hand.maxseats = int(info[key])
 
 

From a3cab472b1cb069c925f8587c549fd81cafef2b0 Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Wed, 3 Mar 2010 15:08:00 -0500
Subject: [PATCH 299/320] Clean up guessMaxSeats.

---
 pyfpdb/PartyPokerToFpdb.py | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/pyfpdb/PartyPokerToFpdb.py b/pyfpdb/PartyPokerToFpdb.py
index 46c8776b..f83c8672 100755
--- a/pyfpdb/PartyPokerToFpdb.py
+++ b/pyfpdb/PartyPokerToFpdb.py
@@ -106,18 +106,12 @@ class PartyPoker(HandHistoryConverter):
 
     def guessMaxSeats(self, hand):
         """Return a guess at max_seats when not specified in HH."""
-        try:            
-            m = re_seats.search(hand.handText)
-            mo = m.groupdict()
-            mo = _mo['SEATS']
-            return mo
-        except:
-            mo = self.maxOccSeat(hand)
-            if mo == 10: return mo
-            if mo == 2: return 2
-            if mo <= 6: return 6
-            # there are 9-max tables for cash and 10-max for tournaments
-            return 9 if hand.gametype['type']=='ring' else 10
+        mo = self.maxOccSeat(hand)
+        if mo == 10: return mo
+        if mo == 2: return 2
+        if mo <= 6: return 6
+        # there are 9-max tables for cash and 10-max for tournaments
+        return 9 if hand.gametype['type']=='ring' else 10
 
     def compilePlayerRegexs(self,  hand):
         players = set([player[1] for player in hand.players])

From 0e707c19f81a56a420dddd1ec19971ddde1ca23f Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 4 Mar 2010 17:50:51 +0800
Subject: [PATCH 300/320] PlayerStats: Fix sorting in # Hands col

Patch from Almer Visser.

Using %d causes Gtk to order as a string rather than a number.

Convert to %1.0f and issue disappears.
---
 pyfpdb/GuiPlayerStats.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/GuiPlayerStats.py b/pyfpdb/GuiPlayerStats.py
index 39c6c727..b856a5e2 100644
--- a/pyfpdb/GuiPlayerStats.py
+++ b/pyfpdb/GuiPlayerStats.py
@@ -92,7 +92,7 @@ class GuiPlayerStats (threading.Thread):
                        , ["hand",       False, "Hand",     0.0, "%s", "str"]   # true not allowed for this line
                        , ["plposition", False, "Posn",     1.0, "%s", "str"]   # true not allowed for this line (set in code)
                        , ["pname",      False, "Name",     0.0, "%s", "str"]   # true not allowed for this line (set in code)
-                       , ["n",          True,  "Hds",      1.0, "%d", "str"]
+                       , ["n",          True,  "Hds",      1.0, "%1.0f", "str"]
                        , ["avgseats",   False,  "Seats",    1.0, "%3.1f", "str"]
                        , ["vpip",       True,  "VPIP",     1.0, "%3.1f", "str"]
                        , ["pfr",        True,  "PFR",      1.0, "%3.1f", "str"]

From 519494878eb6843b53523b065639d7b2f19ba6ab Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Thu, 4 Mar 2010 11:50:03 -0500
Subject: [PATCH 301/320] Don't try to find out blinds for stud games.

---
 pyfpdb/PokerStarsToFpdb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
index 946d5ea2..bf0e8427 100644
--- a/pyfpdb/PokerStarsToFpdb.py
+++ b/pyfpdb/PokerStarsToFpdb.py
@@ -181,7 +181,7 @@ class PokerStars(HandHistoryConverter):
         else:
             info['type'] = 'tour'
 
-        if info['limitType'] == 'fl' and info['bb'] != None and info['type'] == 'ring':
+        if info['limitType'] == 'fl' and info['bb'] is not None and info['type'] == 'ring' and info['base'] != 'stud':
             info['sb'] = Lim_Blinds[mg['BB']][0] 
             info['bb'] = Lim_Blinds[mg['BB']][1]
 

From a698b2e16de7a477834449ae6be696c1aed0a535 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 4 Mar 2010 17:50:51 +0800
Subject: [PATCH 302/320] PlayerStats: Fix sorting in # Hands col

Patch from Almer Visser.

Using %d causes Gtk to order as a string rather than a number.

Convert to %1.0f and issue disappears.
---
 pyfpdb/GuiPlayerStats.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/GuiPlayerStats.py b/pyfpdb/GuiPlayerStats.py
index 39c6c727..b856a5e2 100644
--- a/pyfpdb/GuiPlayerStats.py
+++ b/pyfpdb/GuiPlayerStats.py
@@ -92,7 +92,7 @@ class GuiPlayerStats (threading.Thread):
                        , ["hand",       False, "Hand",     0.0, "%s", "str"]   # true not allowed for this line
                        , ["plposition", False, "Posn",     1.0, "%s", "str"]   # true not allowed for this line (set in code)
                        , ["pname",      False, "Name",     0.0, "%s", "str"]   # true not allowed for this line (set in code)
-                       , ["n",          True,  "Hds",      1.0, "%d", "str"]
+                       , ["n",          True,  "Hds",      1.0, "%1.0f", "str"]
                        , ["avgseats",   False,  "Seats",    1.0, "%3.1f", "str"]
                        , ["vpip",       True,  "VPIP",     1.0, "%3.1f", "str"]
                        , ["pfr",        True,  "PFR",      1.0, "%3.1f", "str"]

From 14d2861cdd634a22fcd71af5e9f07b4717b433f7 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Fri, 5 Mar 2010 11:55:00 +0800
Subject: [PATCH 303/320] Re-enable 'variance' for sqlite.

---
 pyfpdb/SQL.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py
index 116f21f5..fc2bc317 100644
--- a/pyfpdb/SQL.py
+++ b/pyfpdb/SQL.py
@@ -2079,8 +2079,7 @@ class Sql:
                             ,100.0*avg((hp.totalProfit+hp.rake)/(gt.bigBlind+0.0))                  AS bb100xr
                             ,avg((hp.totalProfit+hp.rake)/100.0)                                    AS profhndxr
                             ,avg(h.seats+0.0)                                                       AS avgseats
-                            /*,variance(hp.totalProfit/100.0)                                         AS variance*/
-                            ,0.0                                                                    AS variance
+                            ,variance(hp.totalProfit/100.0)                                         AS variance
                       from HandsPlayers hp
                            inner join Hands h       on  (h.id = hp.handId)
                            inner join Gametypes gt  on  (gt.Id = h.gameTypeId)

From 685dd68cd14696ffb58d24bd5975ea7121e444de Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Fri, 5 Mar 2010 12:06:00 +0800
Subject: [PATCH 304/320] Update version in makefile

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 3d8ec313..078a3bd0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # Variable definitions
-VERSION = 0.12
+VERSION = 0.20
 DATE = $(shell date +%Y%m%d)
 
 all:

From 014ddedc013dcb449596c2475b5744f664013291 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@some.where>
Date: Sun, 7 Mar 2010 10:30:56 +0000
Subject: [PATCH 305/320] create db automatically if using sqlite

---
 pyfpdb/Database.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index f51ce5f5..8939d4b3 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -382,6 +382,7 @@ class Database:
                     print msg
                     raise FpdbError(msg)
         elif backend == Database.SQLITE:
+            create = True
             import sqlite3
             if use_pool:
                 sqlite3 = pool.manage(sqlite3, pool_size=1)

From 2e83e91ba53802c2a59a93c162d159df51778212 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Mon, 8 Mar 2010 22:31:07 +0000
Subject: [PATCH 306/320] add having clause to sqlite version of guistats query

---
 pyfpdb/SQL.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py
index 51863698..b6eb8ee0 100644
--- a/pyfpdb/SQL.py
+++ b/pyfpdb/SQL.py
@@ -2099,6 +2099,7 @@ class Sql:
                               ,plposition
                               ,upper(gt.limitType)
                               ,s.name
+                      having 1 = 1 <havingclause>
                       order by hp.playerId
                               ,gt.base
                               ,gt.category

From 04acf25416e4f87e680eb38dce9efeba2fe8974d Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Mon, 8 Mar 2010 22:32:09 +0000
Subject: [PATCH 307/320] don't display headings for bottom table when it can't
 be calculated

---
 pyfpdb/GuiPlayerStats.py | 41 +++++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/pyfpdb/GuiPlayerStats.py b/pyfpdb/GuiPlayerStats.py
index 3c3f46e3..a4bbdef1 100644
--- a/pyfpdb/GuiPlayerStats.py
+++ b/pyfpdb/GuiPlayerStats.py
@@ -208,6 +208,7 @@ class GuiPlayerStats (threading.Thread):
 
     def createStatsTable(self, vbox, playerids, sitenos, limits, type, seats, groups, dates, games):
         starttime = time()
+        show_detail = True
 
         # Scrolled window for summary table
         swin = gtk.ScrolledWindow(hadjustment=None, vadjustment=None)
@@ -224,25 +225,30 @@ class GuiPlayerStats (threading.Thread):
         self.addGrid(swin, 'playerDetailedStats', flags, playerids
                     ,sitenos, limits, type, seats, groups, dates, games)
 
-        # Separator
-        vbox2 = gtk.VBox(False, 0)
-        heading = gtk.Label(self.filterText['handhead'])
-        heading.show()
-        vbox2.pack_start(heading, expand=False, padding=3)
+        if 'allplayers' in groups and groups['allplayers']:
+            # can't currently do this combination so skip detailed table
+            show_detail = False
 
-        # Scrolled window for detailed table (display by hand)
-        swin = gtk.ScrolledWindow(hadjustment=None, vadjustment=None)
-        swin.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
-        swin.show()
-        vbox2.pack_start(swin, expand=True, padding=3)
-        vbox.pack2(vbox2)
-        vbox2.show()
+        if show_detail: 
+            # Separator
+            vbox2 = gtk.VBox(False, 0)
+            heading = gtk.Label(self.filterText['handhead'])
+            heading.show()
+            vbox2.pack_start(heading, expand=False, padding=3)
 
-        # Detailed table
-        flags[0] = True
-        flags[2] = 1
-        self.addGrid(swin, 'playerDetailedStats', flags, playerids
-                    ,sitenos, limits, type, seats, groups, dates, games)
+            # Scrolled window for detailed table (display by hand)
+            swin = gtk.ScrolledWindow(hadjustment=None, vadjustment=None)
+            swin.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+            swin.show()
+            vbox2.pack_start(swin, expand=True, padding=3)
+            vbox.pack2(vbox2)
+            vbox2.show()
+
+            # Detailed table
+            flags[0] = True
+            flags[2] = 1
+            self.addGrid(swin, 'playerDetailedStats', flags, playerids
+                        ,sitenos, limits, type, seats, groups, dates, games)
 
         self.db.rollback()
         print "Stats page displayed in %4.2f seconds" % (time() - starttime)
@@ -421,6 +427,7 @@ class GuiPlayerStats (threading.Thread):
                 else:
                     treerow.append(' ')
             iter = self.liststore[grid].append(treerow)
+            #print treerow
             sqlrow += 1
             row += 1
         vbox.show_all()

From 6117eb64c8f30883bb0ca6d192b539157a497429 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Mon, 8 Mar 2010 22:47:44 +0000
Subject: [PATCH 308/320] remember separator position when refresh is clicked

---
 pyfpdb/GuiPlayerStats.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/GuiPlayerStats.py b/pyfpdb/GuiPlayerStats.py
index a4bbdef1..30bef936 100644
--- a/pyfpdb/GuiPlayerStats.py
+++ b/pyfpdb/GuiPlayerStats.py
@@ -142,7 +142,7 @@ class GuiPlayerStats (threading.Thread):
         self.stats_frame = gtk.Frame()
         self.stats_frame.show()
 
-        self.stats_vbox = gtk.VBox(False, 0)
+        self.stats_vbox = gtk.VPaned()
         self.stats_vbox.show()
         self.stats_frame.add(self.stats_vbox)
         # self.fillStatsFrame(self.stats_vbox)
@@ -155,12 +155,15 @@ class GuiPlayerStats (threading.Thread):
 
         # make sure Hand column is not displayed
         [x for x in self.columns if x[0] == 'hand'][0][1] = False
+        self.last_pos = -1
+
 
     def get_vbox(self):
         """returns the vbox of this thread"""
         return self.main_hbox
 
     def refreshStats(self, widget, data):
+        self.last_pos = self.stats_vbox.get_position()
         try: self.stats_vbox.destroy()
         except AttributeError: pass
         self.liststore = []
@@ -170,6 +173,8 @@ class GuiPlayerStats (threading.Thread):
         self.stats_vbox.show()
         self.stats_frame.add(self.stats_vbox)
         self.fillStatsFrame(self.stats_vbox)
+        if self.last_pos > 0:
+            self.stats_vbox.set_position(self.last_pos)
 
     def fillStatsFrame(self, vbox):
         sites = self.filters.getSites()

From a10f7c144ea8aa302cc73437b5126f3dce7220ef Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Tue, 9 Mar 2010 22:36:03 +0000
Subject: [PATCH 309/320] allow log viewer to view all 4 log/error files

---
 pyfpdb/GuiLogView.py | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/pyfpdb/GuiLogView.py b/pyfpdb/GuiLogView.py
index 9dcb9588..755e1762 100755
--- a/pyfpdb/GuiLogView.py
+++ b/pyfpdb/GuiLogView.py
@@ -33,6 +33,11 @@ log = logging.getLogger("logview")
 
 MAX_LINES = 100000         # max lines to display in window
 EST_CHARS_PER_LINE = 150   # used to guesstimate number of lines in log file
+LOGFILES = [ [ 'Fpdb Errors', 'fpdb-errors.txt', False ]  # label, filename, start value
+           , [ 'Fpdb Log',    'fpdb-log.txt',    True ]
+           , [ 'HUD Errors',  'HUD-errors.txt',  False ]
+           , [ 'HUD Log',     'HUD-log.txt',     False ]
+           ]
 
 class GuiLogView:
 
@@ -41,7 +46,7 @@ class GuiLogView:
         self.main_window = mainwin
         self.closeq = closeq
 
-        self.logfile = self.config.log_file    # name of logfile
+        self.logfile = os.path.join(self.config.dir_log, LOGFILES[1][1])
         self.dia = gtk.Dialog(title="Log Messages"
                              ,parent=None
                              ,flags=gtk.DIALOG_DESTROY_WITH_PARENT
@@ -69,10 +74,19 @@ class GuiLogView:
         scrolledwindow.add(self.listview)
         self.vbox.pack_start(scrolledwindow, expand=True, fill=True, padding=0)
 
+        hb = gtk.HBox(False, 0)
+        grp = None
+        for logf in LOGFILES:
+            rb = gtk.RadioButton(group=grp, label=logf[0], use_underline=True)
+            if grp is None: grp = rb
+            rb.set_active(logf[2])
+            rb.connect('clicked', self.__set_logfile, logf[0])
+            hb.pack_start(rb, False, False, 3)
         refreshbutton = gtk.Button("Refresh")
         refreshbutton.connect("clicked", self.refresh, None)
-        self.vbox.pack_start(refreshbutton, False, False, 3)
+        hb.pack_start(refreshbutton, False, False, 3)
         refreshbutton.show()
+        self.vbox.pack_start(hb, False, False, 0)
 
         self.listview.show()
         scrolledwindow.show()
@@ -90,6 +104,14 @@ class GuiLogView:
 
         self.dia.connect('response', self.dialog_response_cb)
 
+    def __set_logfile(self, w, file):
+        #print "w is", w, "file is", file, "active is", w.get_active()
+        if w.get_active():
+            for logf in LOGFILES:
+                if logf[0] == file:
+                    self.logfile = os.path.join(self.config.dir_log, logf[1])
+            self.refresh(w, file)  # params are not used
+
     def dialog_response_cb(self, dialog, response_id):
         # this is called whether close button is pressed or window is closed
         self.closeq.put(self.__class__)
@@ -131,11 +153,14 @@ class GuiLogView:
 
             l = 0
             for line in open(self.logfile):
-                # eg line:
+                # example line in logfile format:
                 # 2009-12-02 15:23:21,716 - config       DEBUG    config logger initialised
                 l = l + 1
-                if l > startline and len(line) > 49:
-                    iter = self.liststore.append( (line[0:23], line[26:32], line[39:46], line[48:].strip(), True) )
+                if l > startline:
+                    if len(line) > 49 and line[23:26] == ' - ' and line[34:39] == '     ':
+                        iter = self.liststore.append( (line[0:23], line[26:32], line[39:46], line[48:].strip(), True) )
+                    else:
+                        iter = self.liststore.append( ('', '', '', line.strip(), True) )
 
     def sortCols(self, col, n):
         try:

From fb6af1fe75b694995001770eefdaf51412e06d50 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Tue, 30 Mar 2010 13:04:39 +0800
Subject: [PATCH 310/320] Fix for PT-Stud exported Stars HH's

Exports files as 'RAZZ LIMIT' instead of 'Razz Limit'
---
 pyfpdb/PokerStarsToFpdb.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
index bf0e8427..801f17d6 100644
--- a/pyfpdb/PokerStarsToFpdb.py
+++ b/pyfpdb/PokerStarsToFpdb.py
@@ -50,8 +50,8 @@ class PokerStars(HandHistoryConverter):
           (?P<BUYIN>([%(LS)s\+\d\.]+\s?(?P<TOUR_ISO>%(LEGAL_ISO)s)?)|Freeroll)\s+)?                          
           # close paren of tournament info
           (?P<MIXED>HORSE|8\-Game|HOSE)?\s?\(?
-          (?P<GAME>Hold\'em|Razz|7\sCard\sStud|7\sCard\sStud\sHi/Lo|Omaha|Omaha\sHi/Lo|Badugi|Triple\sDraw\s2\-7\sLowball|5\sCard\sDraw)\s
-          (?P<LIMIT>No\sLimit|Limit|Pot\sLimit)\)?,?\s
+          (?P<GAME>Hold\'em|Razz|RAZZ|7\sCard\sStud|7\sCard\sStud\sHi/Lo|Omaha|Omaha\sHi/Lo|Badugi|Triple\sDraw\s2\-7\sLowball|5\sCard\sDraw)\s
+          (?P<LIMIT>No\sLimit|Limit|LIMIT|Pot\sLimit)\)?,?\s
           (-\sLevel\s(?P<LEVEL>[IVXLC]+)\s)?
           \(?                            # open paren of the stakes
           (?P<CURRENCY>%(LS)s|)?
@@ -148,12 +148,13 @@ class PokerStars(HandHistoryConverter):
                      '1000.00': ('250.00', '500.00')}
 
 
-        limits = { 'No Limit':'nl', 'Pot Limit':'pl', 'Limit':'fl' }
+        limits = { 'No Limit':'nl', 'Pot Limit':'pl', 'Limit':'fl', 'LIMIT':'fl' }
         games = {                          # base, category
                               "Hold'em" : ('hold','holdem'), 
                                 'Omaha' : ('hold','omahahi'),
                           'Omaha Hi/Lo' : ('hold','omahahilo'),
                                  'Razz' : ('stud','razz'), 
+                                 'RAZZ' : ('stud','razz'), 
                           '7 Card Stud' : ('stud','studhi'),
                     '7 Card Stud Hi/Lo' : ('stud','studhilo'),
                                'Badugi' : ('draw','badugi'),

From 81c731b42ed54de9a665adfbcedfd979a39d085a Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 15 Apr 2010 14:51:20 +0800
Subject: [PATCH 311/320] Fix for CBet stat

Patch from bbtgaf@googlemail.com aka gimick

DerivedStats.betStreet() was only functioning if the player was the first person to act on a street.

If the player was checked to the function would exit as False before ever finding the player
---
 pyfpdb/DerivedStats.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py
index 327b8de2..ae581ee1 100644
--- a/pyfpdb/DerivedStats.py
+++ b/pyfpdb/DerivedStats.py
@@ -505,9 +505,13 @@ class DerivedStats():
         """Returns true if player bet/raised the street as their first action"""
         betOrRaise = False
         for act in self.hand.actions[street]:
-            if act[0] == player and act[1] in ('bets', 'raises'):
-                betOrRaise = True
-            else:
+            if act[0] == player:
+                if act[1] in ('bets', 'raises'):
+                    betOrRaise = True
+                else:
+                    # player found but did not bet or raise as their first action
                 break
+            #else:
+                # haven't found player's first action yet
         return betOrRaise
 

From b14bed4e9b5a8cd9e0cb408d4e83d9d2caac2a4c Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 15 Apr 2010 15:48:57 +0800
Subject: [PATCH 312/320] Fix last patch - add pass

---
 pyfpdb/DerivedStats.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py
index ae581ee1..4e55cdfc 100644
--- a/pyfpdb/DerivedStats.py
+++ b/pyfpdb/DerivedStats.py
@@ -510,6 +510,7 @@ class DerivedStats():
                     betOrRaise = True
                 else:
                     # player found but did not bet or raise as their first action
+                    pass
                 break
             #else:
                 # haven't found player's first action yet

From 6ba7621f2a4a8eb934f02908c8afeef6d6533a88 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Fri, 23 Apr 2010 00:28:30 +0800
Subject: [PATCH 313/320] Fix 'errors' stat in importer

Instead of:
GuiBulkImport done: Stored: 32  Duplicates: 0   Partial: 0  Errors: 32 in 0.530081987381 seconds - 0/sec

We have:
GuiBulkImport done: Stored: 0   Duplicates: 0   Partial: 0  Errors: 32 in 0.530081987381 seconds - 0/sec
---
 pyfpdb/fpdb_import.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index 689858e0..56c59b77 100755
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -468,6 +468,7 @@ class Importer:
                 errors = getattr(hhc, 'numErrors')
                 stored = getattr(hhc, 'numHands')
                 stored -= duplicates
+                stored -= errors
             else:
                 # conversion didn't work
                 # TODO: appropriate response?

From 3dd5f92a3c115f9761e6c51ae78bcb32dcd6d00b Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Fri, 23 Apr 2010 00:33:24 +0800
Subject: [PATCH 314/320] Add logging for two areas, fix RAZZ v Razz issue

Add ERROR conditions for determineGameType failing, and raise a FpdbParseError in each case
---
 pyfpdb/PokerStarsToFpdb.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
index 801f17d6..24cf3bb7 100644
--- a/pyfpdb/PokerStarsToFpdb.py
+++ b/pyfpdb/PokerStarsToFpdb.py
@@ -135,8 +135,10 @@ class PokerStars(HandHistoryConverter):
         info = {}
         m = self.re_GameInfo.search(handText)
         if not m:
-            print "DEBUG: determineGameType(): did not match"
-            return None
+            tmp = handText[0:100]
+            log.error("determineGameType: Unable to recognise gametype from: '%s'" % tmp)
+            log.error("determineGameType: Raising FpdbParseError")
+            raise FpdbParseError
 
         mg = m.groupdict()
         # translations from captured groups to fpdb info strings
@@ -154,7 +156,7 @@ class PokerStars(HandHistoryConverter):
                                 'Omaha' : ('hold','omahahi'),
                           'Omaha Hi/Lo' : ('hold','omahahilo'),
                                  'Razz' : ('stud','razz'), 
-                                 'RAZZ' : ('stud','razz'), 
+                                 'RAZZ' : ('stud','razz'),
                           '7 Card Stud' : ('stud','studhi'),
                     '7 Card Stud Hi/Lo' : ('stud','studhilo'),
                                'Badugi' : ('draw','badugi'),
@@ -183,8 +185,13 @@ class PokerStars(HandHistoryConverter):
             info['type'] = 'tour'
 
         if info['limitType'] == 'fl' and info['bb'] is not None and info['type'] == 'ring' and info['base'] != 'stud':
-            info['sb'] = Lim_Blinds[mg['BB']][0] 
-            info['bb'] = Lim_Blinds[mg['BB']][1]
+            try:
+                info['sb'] = Lim_Blinds[mg['BB']][0]
+                info['bb'] = Lim_Blinds[mg['BB']][1]
+            except KeyError:
+                log.error("determineGameType: Lim_Blinds has no lookup for '%s'" % mg['BB'])
+                log.error("determineGameType: Raising FpdbParseError")
+                raise FpdbParseError
 
         # NB: SB, BB must be interpreted as blinds or bets depending on limit type.
         return info

From 5aadf643be07b1fc12887181a0128265508e91d9 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Fri, 23 Apr 2010 00:36:12 +0800
Subject: [PATCH 315/320] Add '2' to the Lim_Blinds lookup table

Fixes Dogs import issue.
---
 pyfpdb/PokerStarsToFpdb.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
index 24cf3bb7..75cf3cbb 100644
--- a/pyfpdb/PokerStarsToFpdb.py
+++ b/pyfpdb/PokerStarsToFpdb.py
@@ -144,6 +144,7 @@ class PokerStars(HandHistoryConverter):
         # translations from captured groups to fpdb info strings
         Lim_Blinds = {  '0.04': ('0.01', '0.02'),    '0.10': ('0.02', '0.05'),     '0.20': ('0.05', '0.10'),
                         '0.50': ('0.10', '0.25'),    '1.00': ('0.25', '0.50'),     '2.00': ('0.50', '1.00'), 
+                        '2': ('0.50', '1.00'),
                         '4.00': ('1.00', '2.00'),    '6.00': ('1.00', '3.00'),    '10.00': ('2.00', '5.00'),
                        '20.00': ('5.00', '10.00'),  '30.00': ('10.00', '15.00'),  '60.00': ('15.00', '30.00'),
                       '100.00': ('25.00', '50.00'),'200.00': ('50.00', '100.00'),'400.00': ('100.00', '200.00'),

From c0ebc4b7cf4a039418e9eb0f5e6425312d1e3886 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 22 Apr 2010 23:22:28 +0800
Subject: [PATCH 316/320] Update to Session viewer

Fix a couple of crashers

- Make sure last session in list is displayed correctly
- Actually calculate hands/hour (Thanks Socratic)
- Make graph display the correct number of sessions
---
 pyfpdb/GuiSessionViewer.py | 62 +++++++++++++++++++++++++++++---------
 1 file changed, 47 insertions(+), 15 deletions(-)

diff --git a/pyfpdb/GuiSessionViewer.py b/pyfpdb/GuiSessionViewer.py
index b5ca0867..d11f83d8 100755
--- a/pyfpdb/GuiSessionViewer.py
+++ b/pyfpdb/GuiSessionViewer.py
@@ -184,7 +184,7 @@ class GuiSessionViewer (threading.Thread):
                 sitenos.append(siteids[site])
                 _q = self.sql.query['getPlayerId']
                 _name = Charset.to_utf8(heroes[site])
-                print 'DEBUG(_name) :: %s' % _name
+                #print 'DEBUG(_name) :: %s' % _name
                 self.cursor.execute(_q, (_name,)) # arg = tuple
                 result = self.db.cursor.fetchall()
                 if len(result) == 1:
@@ -262,13 +262,20 @@ class GuiSessionViewer (threading.Thread):
         times = map(lambda x:long(x[0]), hands)
         handids = map(lambda x:int(x[1]), hands)
         winnings = map(lambda x:float(x[4]), hands)
-        print "DEBUG: len(times) %s" %(len(times))
+        #print "DEBUG: len(times) %s" %(len(times))
         diffs = diff(times) # This array is the difference in starttime between consecutive hands
         index = nonzero(diff(times) > THRESHOLD) # This array represents the indexes into 'times' for start/end times of sessions
                                                  # ie. times[index[0][0]] is the end of the first session
         #print "DEBUG: len(index[0]) %s" %(len(index[0]))
-        #print "DEBUG: index %s" %(index)
-        #print "DEBUG: index[0][0] %s" %(index[0][0])
+        if len(index[0]) > 0:
+            #print "DEBUG: index[0][0] %s" %(index[0][0])
+            #print "DEBUG: index %s" %(index)
+            pass
+        else:
+            index = [[0]]
+            #print "DEBUG: index %s" %(index)
+            #print "DEBUG: index[0][0] %s" %(index[0][0])
+            pass
 
         total = 0
         last_idx = 0
@@ -281,27 +288,57 @@ class GuiSessionViewer (threading.Thread):
         results = []
         cum_sum = cumsum(winnings)
         cum_sum = cum_sum/100
+        sid = 0
         # Take all results and format them into a list for feeding into gui model.
         for i in range(len(index[0])):
-            sid = i                                                             # Session id
             hds = index[0][i] - last_idx                                        # Number of hands in session
             if hds > 0:
                 stime = strftime("%d/%m/%Y %H:%M", localtime(times[last_idx]))      # Formatted start time
                 etime = strftime("%d/%m/%Y %H:%M", localtime(times[index[0][i]]))   # Formatted end time
-                hph = (times[index[0][i]] - times[last_idx])/60                     # Hands per hour
+                minutesplayed = (times[index[0][i]] - times[last_idx])/60
+                if minutesplayed == 0:
+                    minutesplayed = 1
+                hph = hds*60/minutesplayed # Hands per hour
                 won = sum(winnings[last_idx:index[0][i]])/100.0
                 hwm = max(cum_sum[last_idx:index[0][i]])
                 lwm = min(cum_sum[last_idx:index[0][i]])
-                #print "DEBUG: range: (%s, %s) - (min, max): (%s, %s)" %(last_idx, index[0][i], hwm, lwm)
+                open = (sum(winnings[:last_idx]))/100
+                close = (sum(winnings[:index[0][i]]))/100
+                #print "DEBUG: range: (%s, %s) - (min, max): (%s, %s) - (open,close): (%s, %s)" %(last_idx, index[0][i], lwm, hwm, open, close)
             
                 results.append([sid, hds, stime, etime, hph, won])
-                opens.append((sum(winnings[:last_idx]))/100)
-                closes.append((sum(winnings[:index[0][i]]))/100)
+                opens.append(open)
+                closes.append(close)
                 highs.append(hwm)
                 lows.append(lwm)
-                #print "Hands in session %4s: %4s  Start: %s End: %s HPH: %s Profit: %s" %(sid, hds, stime, etime, hph, won)
+                #print "DEBUG: Hands in session %4s: %4s  Start: %s End: %s HPH: %s Profit: %s" %(sid, hds, stime, etime, hph, won)
                 total = total + (index[0][i] - last_idx)
                 last_idx = index[0][i] + 1
+                sid = sid+1
+            else:
+                print "hds <= 0"
+
+        #The last session is between times[last_idx:-1]
+        hds = len(times) - last_idx
+        stime = strftime("%d/%m/%Y %H:%M", localtime(times[last_idx]))      # Formatted start time
+        etime = strftime("%d/%m/%Y %H:%M", localtime(times[index[0][-1]]))  # Formatted end time
+        minutesplayed = (times[-1] - times[last_idx])/60
+        if minutesplayed == 0:
+            minutesplayed = 1
+        hph = hds*60/minutesplayed # Hands per hour
+        won = sum(winnings[last_idx:-1])/100.0
+        hwm = max(cum_sum[last_idx:-1])
+        lwm = min(cum_sum[last_idx:-1])
+        open = (sum(winnings[:last_idx]))/100
+        close = (sum(winnings[:-1]))/100
+        #print "DEBUG: range: (%s, %s) - (min, max): (%s, %s) - (open,close): (%s, %s)" %(last_idx, index[0][i], lwm, hwm, open, close)
+
+        results.append([sid, hds, stime, etime, hph, won])
+        opens.append(open)
+        closes.append(close)
+        highs.append(hwm)
+        lows.append(lwm)
+        #print "Hands in session %4s: %4s  Start: %s End: %s HPH: %s Profit: %s" %(sid, hds, stime, etime, hph, won)
 
         return (results, opens, closes, highs, lows)
 
@@ -330,11 +367,6 @@ class GuiSessionViewer (threading.Thread):
     def generateGraph(self, opens, closes, highs, lows):
         self.clearGraphData()
 
-        #FIXME: Weird - first data entry is crashing this for me
-        opens = opens[1:]
-        closes = closes[1:]
-        highs = highs[1:]
-        lows = lows[1:]
 #        print "DEBUG:"
 #        print "highs = %s" % highs
 #        print "lows = %s" % lows

From d11623c7364b8b7ed06cfd0e1b790093668ebcc0 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Fri, 23 Apr 2010 11:39:52 +0800
Subject: [PATCH 317/320] Update Session viewer based on Socratic comments

---
 pyfpdb/GuiSessionViewer.py | 61 ++++++++++++++------------------------
 1 file changed, 22 insertions(+), 39 deletions(-)

diff --git a/pyfpdb/GuiSessionViewer.py b/pyfpdb/GuiSessionViewer.py
index d11f83d8..b4f14d95 100755
--- a/pyfpdb/GuiSessionViewer.py
+++ b/pyfpdb/GuiSessionViewer.py
@@ -33,7 +33,7 @@ try:
     from matplotlib.backends.backend_gtkagg import NavigationToolbar2GTKAgg as NavigationToolbar
     from matplotlib.finance import candlestick2
 
-    from numpy import diff, nonzero, sum, cumsum, max, min
+    from numpy import diff, nonzero, sum, cumsum, max, min, append
 #    from matplotlib.dates import  DateFormatter, WeekdayLocator, HourLocator, \
 #     DayLocator, MONDAY, timezone
 
@@ -241,6 +241,9 @@ class GuiSessionViewer (threading.Thread):
     #end def fillStatsFrame(self, vbox):
 
     def generateDatasets(self, playerids, sitenos, limits, seats):
+        THRESHOLD = 1800                    # Minimum number of seconds between consecutive hands before being considered a new session
+        PADDING   = 5                       # Additional time in minutes to add to a session, session startup, shutdown etc (FiXME: user configurable)
+
         # Get a list of all handids and their timestampts
         #FIXME: Query still need to filter on blind levels
 
@@ -255,7 +258,6 @@ class GuiSessionViewer (threading.Thread):
         q = q.replace("<ampersand_s>", "%s")
 
         self.db.cursor.execute(q)
-        THRESHOLD = 1800
         hands = self.db.cursor.fetchall()
 
         # Take that list and create an array of the time between hands
@@ -263,9 +265,11 @@ class GuiSessionViewer (threading.Thread):
         handids = map(lambda x:int(x[1]), hands)
         winnings = map(lambda x:float(x[4]), hands)
         #print "DEBUG: len(times) %s" %(len(times))
-        diffs = diff(times) # This array is the difference in starttime between consecutive hands
-        index = nonzero(diff(times) > THRESHOLD) # This array represents the indexes into 'times' for start/end times of sessions
-                                                 # ie. times[index[0][0]] is the end of the first session
+        diffs = diff(times)                      # This array is the difference in starttime between consecutive hands
+        diffs2 = append(diffs,THRESHOLD + 1)     # Append an additional session to the end of the diffs, so the next line
+                                                 # includes an index into the last 'session'
+        index = nonzero(diffs2 > THRESHOLD)      # This array represents the indexes into 'times' for start/end times of sessions
+                                                 # times[index[0][0]] is the end of the first session,
         #print "DEBUG: len(index[0]) %s" %(len(index[0]))
         if len(index[0]) > 0:
             #print "DEBUG: index[0][0] %s" %(index[0][0])
@@ -278,7 +282,7 @@ class GuiSessionViewer (threading.Thread):
             pass
 
         total = 0
-        last_idx = 0
+        first_idx = 0
         lowidx = 0
         uppidx = 0
         opens = []
@@ -288,23 +292,24 @@ class GuiSessionViewer (threading.Thread):
         results = []
         cum_sum = cumsum(winnings)
         cum_sum = cum_sum/100
-        sid = 0
+        sid = 1
         # Take all results and format them into a list for feeding into gui model.
         for i in range(len(index[0])):
-            hds = index[0][i] - last_idx                                        # Number of hands in session
+            hds = index[0][i] - first_idx + 1                                        # Number of hands in session
             if hds > 0:
-                stime = strftime("%d/%m/%Y %H:%M", localtime(times[last_idx]))      # Formatted start time
+                stime = strftime("%d/%m/%Y %H:%M", localtime(times[first_idx]))      # Formatted start time
                 etime = strftime("%d/%m/%Y %H:%M", localtime(times[index[0][i]]))   # Formatted end time
-                minutesplayed = (times[index[0][i]] - times[last_idx])/60
+                minutesplayed = (times[index[0][i]] - times[first_idx])/60
                 if minutesplayed == 0:
                     minutesplayed = 1
+                minutesplayed = minutesplayed + PADDING
                 hph = hds*60/minutesplayed # Hands per hour
-                won = sum(winnings[last_idx:index[0][i]])/100.0
-                hwm = max(cum_sum[last_idx:index[0][i]])
-                lwm = min(cum_sum[last_idx:index[0][i]])
-                open = (sum(winnings[:last_idx]))/100
+                won = sum(winnings[first_idx:index[0][i]])/100.0
+                hwm = max(cum_sum[first_idx:index[0][i]])
+                lwm = min(cum_sum[first_idx:index[0][i]])
+                open = (sum(winnings[:first_idx]))/100
                 close = (sum(winnings[:index[0][i]]))/100
-                #print "DEBUG: range: (%s, %s) - (min, max): (%s, %s) - (open,close): (%s, %s)" %(last_idx, index[0][i], lwm, hwm, open, close)
+                #print "DEBUG: range: (%s, %s) - (min, max): (%s, %s) - (open,close): (%s, %s)" %(first_idx, index[0][i], lwm, hwm, open, close)
             
                 results.append([sid, hds, stime, etime, hph, won])
                 opens.append(open)
@@ -312,34 +317,12 @@ class GuiSessionViewer (threading.Thread):
                 highs.append(hwm)
                 lows.append(lwm)
                 #print "DEBUG: Hands in session %4s: %4s  Start: %s End: %s HPH: %s Profit: %s" %(sid, hds, stime, etime, hph, won)
-                total = total + (index[0][i] - last_idx)
-                last_idx = index[0][i] + 1
+                total = total + (index[0][i] - first_idx)
+                first_idx = index[0][i] + 1
                 sid = sid+1
             else:
                 print "hds <= 0"
 
-        #The last session is between times[last_idx:-1]
-        hds = len(times) - last_idx
-        stime = strftime("%d/%m/%Y %H:%M", localtime(times[last_idx]))      # Formatted start time
-        etime = strftime("%d/%m/%Y %H:%M", localtime(times[index[0][-1]]))  # Formatted end time
-        minutesplayed = (times[-1] - times[last_idx])/60
-        if minutesplayed == 0:
-            minutesplayed = 1
-        hph = hds*60/minutesplayed # Hands per hour
-        won = sum(winnings[last_idx:-1])/100.0
-        hwm = max(cum_sum[last_idx:-1])
-        lwm = min(cum_sum[last_idx:-1])
-        open = (sum(winnings[:last_idx]))/100
-        close = (sum(winnings[:-1]))/100
-        #print "DEBUG: range: (%s, %s) - (min, max): (%s, %s) - (open,close): (%s, %s)" %(last_idx, index[0][i], lwm, hwm, open, close)
-
-        results.append([sid, hds, stime, etime, hph, won])
-        opens.append(open)
-        closes.append(close)
-        highs.append(hwm)
-        lows.append(lwm)
-        #print "Hands in session %4s: %4s  Start: %s End: %s HPH: %s Profit: %s" %(sid, hds, stime, etime, hph, won)
-
         return (results, opens, closes, highs, lows)
 
     def clearGraphData(self):

From c871d7fc2fbe15bb7347be6bf685fab96b54ba46 Mon Sep 17 00:00:00 2001
From: gimick <bbtgaf@googlemail.com>
Date: Thu, 15 Apr 2010 23:16:26 +0100
Subject: [PATCH 318/320] gimick - Do not set CBChance if there has been a
 donkbet

---
 pyfpdb/DerivedStats.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py
index 4e55cdfc..f5278b99 100644
--- a/pyfpdb/DerivedStats.py
+++ b/pyfpdb/DerivedStats.py
@@ -368,8 +368,8 @@ class DerivedStats():
             name = self.lastBetOrRaiser(hand.actionStreets[i+1])
             if name:
                 chance = self.noBetsBefore(hand.actionStreets[i+2], name)
-                self.handsplayers[name]['street%dCBChance' % (i+1)] = True
                 if chance == True:
+                    self.handsplayers[name]['street%dCBChance' % (i+1)] = True
                     self.handsplayers[name]['street%dCBDone' % (i+1)] = self.betStreet(hand.actionStreets[i+2], name)
 
     def calcCheckCallRaise(self, hand):

From 6e603149267822b07259d84ffa6c52c0590c8e53 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Fri, 23 Apr 2010 11:49:57 +0800
Subject: [PATCH 319/320] First part of making FTP archive files work

---
 pyfpdb/HandHistoryConverter.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index 2053eba9..5b65b955 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -62,7 +62,7 @@ class HandHistoryConverter():
     codepage = "cp1252"
 
 
-    def __init__(self, config, in_path = '-', out_path = '-', follow=False, index=0, autostart=True, starsArchive=False):
+    def __init__(self, config, in_path = '-', out_path = '-', follow=False, index=0, autostart=True, starsArchive=False, ftpArchive=False):
         """\
 in_path   (default '-' = sys.stdin)
 out_path  (default '-' = sys.stdout)
@@ -75,6 +75,7 @@ follow :  whether to tail -f the input"""
 
         self.index     = index
         self.starsArchive = starsArchive
+        self.ftpArchive = ftpArchive
 
         self.in_path = in_path
         self.out_path = out_path
@@ -247,6 +248,11 @@ which it expects to find at self.re_TailSplitHands -- see for e.g. Everleaf.py.
             m = re.compile('^Hand #\d+', re.MULTILINE)
             self.obs = m.sub('', self.obs)
 
+        if self.ftpArchive == True:
+            log.debug("Converting ftpArchive format to readable")
+            m = re.compile('^\*\*\*\*\*\*+\s#\s\d+\s\*\*\*\*\*+$', re.MULTILINE)
+            self.obs = m.sub('', self.obs)
+
         if self.obs is None or self.obs == "":
             log.info("Read no hands.")
             return []

From 9ac46c8c92c1c135e9741bc8812d39f0dd51eb52 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Fri, 23 Apr 2010 17:09:08 +0800
Subject: [PATCH 320/320] Add to Stars limit lookup table.

---
 pyfpdb/PokerStarsToFpdb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
index 75cf3cbb..c964faa5 100644
--- a/pyfpdb/PokerStarsToFpdb.py
+++ b/pyfpdb/PokerStarsToFpdb.py
@@ -144,7 +144,7 @@ class PokerStars(HandHistoryConverter):
         # translations from captured groups to fpdb info strings
         Lim_Blinds = {  '0.04': ('0.01', '0.02'),    '0.10': ('0.02', '0.05'),     '0.20': ('0.05', '0.10'),
                         '0.50': ('0.10', '0.25'),    '1.00': ('0.25', '0.50'),     '2.00': ('0.50', '1.00'), 
-                        '2': ('0.50', '1.00'),
+                        '2': ('0.50', '1.00'), '4': ('1.00', '2.00'), '6': ('1.00', '3.00'),
                         '4.00': ('1.00', '2.00'),    '6.00': ('1.00', '3.00'),    '10.00': ('2.00', '5.00'),
                        '20.00': ('5.00', '10.00'),  '30.00': ('10.00', '15.00'),  '60.00': ('15.00', '30.00'),
                       '100.00': ('25.00', '50.00'),'200.00': ('50.00', '100.00'),'400.00': ('100.00', '200.00'),