From 5c468d0a3877fc4ab09344bb9bc6d5221f35dd96 Mon Sep 17 00:00:00 2001
From: grindi <email-is-hidden>
Date: Sat, 8 Aug 2009 15:47:58 +0400
Subject: [PATCH 01/12] Added party hh path into HUD_config.xml.example

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

diff --git a/pyfpdb/HUD_config.xml.example b/pyfpdb/HUD_config.xml.example
index bd8cb7df..adc8141c 100644
--- a/pyfpdb/HUD_config.xml.example
+++ b/pyfpdb/HUD_config.xml.example
@@ -252,10 +252,10 @@
 
 	    <site enabled="False"
 	          site_name="PartyPoker"
-	          table_finder="PartyPoker.exe"
+	          table_finder="PartyGaming.exe"
 	          screen_name="YOUR SCREEN NAME HERE"
-	          site_path=""
-	          HH_path=""
+	          site_path="C:/Program Files/PartyGaming/PartyPoker"
+	          HH_path="C:/Program Files/PartyGaming/PartyPoker/HandHistory/YOUR SCREEN NAME HERE/"
 	          decoder="everleaf_decode_table"
               converter="PartyPokerToFpdb"
 	          supported_games="holdem">

From 4074092f322dff53f1ce4bbe619a542e80f83c11 Mon Sep 17 00:00:00 2001
From: grindi <email-is-hidden>
Date: Sat, 8 Aug 2009 17:36:48 +0400
Subject: [PATCH 02/12] Removed .gitignore

---
 .gitignore | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index f3d74a9a..00000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.pyc
-*~

From c042bea1817a99a6639c4ecbd66be20d54e76d28 Mon Sep 17 00:00:00 2001
From: grindi <email-is-hidden>
Date: Sun, 9 Aug 2009 16:24:31 +0400
Subject: [PATCH 03/12] Improved table-by-name recognition for non-latin window
 titles

What i mean:
  u'1464739' in 'Speed #1464739 -  \xc1\xcb \xd5\xee\xeb\xe4\xe5\xec' -> Exception
  u'1464739' in 'Speed #1464739 -  \xc1\xcb \xd5\xee\xeb\xe4\xe5\xec'.decode('cp1251') -> True
---
 pyfpdb/Tables.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/Tables.py b/pyfpdb/Tables.py
index 97a897ca..9fdc8630 100755
--- a/pyfpdb/Tables.py
+++ b/pyfpdb/Tables.py
@@ -230,11 +230,20 @@ def discover_nt_by_name(c, tablename):
     """Finds poker client window with the given table name."""
     titles = {}
     win32gui.EnumWindows(win_enum_handler, titles)
+    
+    def getDefaultEncoding():
+        # FIXME: if somebody know better place fot this function - move it
+        # FIXME: it's better to use GetCPInfo for windows http://msdn.microsoft.com/en-us/library/dd318078(VS.85).aspx
+        # but i have no idea, how to call it
+        import locale
+        return locale.getpreferredencoding()
+        
     for hwnd in titles:
         #print "Tables.py: tablename =", tablename, "title =", titles[hwnd]
         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].lower(): continue
+            if not tablename.lower() in titles[hwnd].decode(getDefaultEncoding()).lower(): continue
         except:
             continue
         if 'History for table:' in titles[hwnd]: continue # Everleaf Network HH viewer window

From 730c82bc95613030559925cbac30e225ff7c0cc1 Mon Sep 17 00:00:00 2001
From: grindi <email-is-hidden>
Date: Sun, 9 Aug 2009 16:38:55 +0400
Subject: [PATCH 04/12] Party hhc: added max seats recognition

---
 pyfpdb/PartyPokerToFpdb.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pyfpdb/PartyPokerToFpdb.py b/pyfpdb/PartyPokerToFpdb.py
index af1081df..81044e78 100644
--- a/pyfpdb/PartyPokerToFpdb.py
+++ b/pyfpdb/PartyPokerToFpdb.py
@@ -88,6 +88,7 @@ class PartyPoker(HandHistoryConverter):
             """, 
           re.MULTILINE|re.VERBOSE)
 
+    re_TotalPlayers = re.compile("^Total\s+number\s+of\s+players\s*:\s*(?P<MAXSEATS>\d+)", re.MULTILINE)
     re_SplitHands   = re.compile('\x00+')
     re_TailSplitHands   = re.compile('(\x00+)')
     lineSplitter    = '\n'
@@ -112,6 +113,8 @@ follow :  whether to tail -f the input"""
 
     def allHandsAsList(self):
         list = HandHistoryConverter.allHandsAsList(self)
+        if list is None:
+            return None
         return filter(lambda text: len(text.strip()), list)
 
     def compilePlayerRegexs(self,  hand):
@@ -249,6 +252,9 @@ follow :  whether to tail -f the input"""
         m = self.re_Hid.search(hand.handText)
         if m: info.update(m.groupdict())
 
+        m = self.re_TotalPlayers.search(hand.handText)
+        if m: info.update(m.groupdict())
+
         # FIXME: it's a hack cause party doesn't supply hand.maxseats info
         #hand.maxseats = ???
         hand.mixed = None
@@ -281,6 +287,8 @@ follow :  whether to tail -f the input"""
                 #FIXME: it's dirty hack T_T
                 cur = info[key][0] if info[key][0] not in '0123456789' else ''
                 hand.buyin = info[key] + '+%s0' % cur
+            if key == 'MAXSEATS':
+                hand.maxseats = int(info[key])
             if key == 'LEVEL':
                 hand.level = info[key]
             if key == 'PLAY' and info['PLAY'] != 'Real':

From a32d4e053a4df6d1d7a469307e5784d9e6fb3db2 Mon Sep 17 00:00:00 2001
From: Matt Turnbull <mcturnbull@fastmail.fm>
Date: Sun, 9 Aug 2009 15:19:43 +0100
Subject: [PATCH 05/12] FulltiltToFpdb handles canceled hands Better exception
 handling during parsing FpdbParseEcxeption takes an optional HID Stripped
 pointless __init__s from *ToFpdb subclasses Logging now has logging.conf
 config - default is to log only INFO to file but easily changed to DEBUG for
 devel work

---
 pyfpdb/BetfairToFpdb.py        |  18 ++---
 pyfpdb/EverleafToFpdb.py       |  23 ++----
 pyfpdb/Exceptions.py           |   5 +-
 pyfpdb/FulltiltToFpdb.py       |  35 ++++-----
 pyfpdb/Hand.py                 |  51 ++++++-------
 pyfpdb/HandHistoryConverter.py | 133 +++++++++++++++++++++------------
 pyfpdb/PartyPokerToFpdb.py     |  19 ++---
 pyfpdb/PokerStarsToFpdb.py     |  26 ++-----
 pyfpdb/Win2dayToFpdb.py        |  16 ++--
 pyfpdb/test_FullTilt.py        |   7 +-
 pyfpdb/test_PokerStars.py      |   2 +-
 11 files changed, 164 insertions(+), 171 deletions(-)

diff --git a/pyfpdb/BetfairToFpdb.py b/pyfpdb/BetfairToFpdb.py
index 1ccec5d0..59344991 100755
--- a/pyfpdb/BetfairToFpdb.py
+++ b/pyfpdb/BetfairToFpdb.py
@@ -26,6 +26,11 @@ from HandHistoryConverter import *
 
 class Betfair(HandHistoryConverter):
 
+    sitename = 'Betfair'
+    filetype = "text"
+    codepage = "cp1252"
+    siteId   = 7 # Needs to match id entry in Sites database
+
     # Static regexes
     re_GameInfo      = re.compile("^(?P<LIMIT>NL|PL|) (?P<CURRENCY>\$|)?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) (?P<GAME>(Texas Hold\'em|Omaha Hi|Razz))", re.MULTILINE)
     re_SplitHands    = re.compile(r'\n\n+')
@@ -34,19 +39,6 @@ class Betfair(HandHistoryConverter):
     re_PlayerInfo    = re.compile("Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*)\s\(\s(\$(?P<CASH>[.0-9]+)) \)")
     re_Board         = re.compile(ur"\[ (?P<CARDS>.+) \]")
 
-    def __init__(self, in_path = '-', out_path = '-', follow = False, autostart=True, index=0):
-        """\
-in_path   (default '-' = sys.stdin)
-out_path  (default '-' = sys.stdout)
-follow :  whether to tail -f the input"""
-        HandHistoryConverter.__init__(self, in_path, out_path, sitename="Betfair", follow=follow, index) # Call super class init.
-        logging.info("Initialising Betfair converter class")
-        self.filetype = "text"
-        self.codepage = "cp1252"
-        self.siteId   = 7 # Needs to match id entry in Sites database
-        if autostart:
-            self.start()
-
 
     def compilePlayerRegexs(self,  hand):
         players = set([player[1] for player in hand.players])
diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py
index 9c63bcf0..2835b6ff 100755
--- a/pyfpdb/EverleafToFpdb.py
+++ b/pyfpdb/EverleafToFpdb.py
@@ -26,6 +26,11 @@ from HandHistoryConverter import *
 
 class Everleaf(HandHistoryConverter):
     
+    sitename = 'Everleaf'
+    filetype = "text"
+    codepage = "cp1252"
+    siteId   = 3 # Needs to match id entry in Sites database
+
     # Static regexes
     re_SplitHands  = re.compile(r"\n\n\n+")
     re_TailSplitHands  = re.compile(r"(\n\n\n+)")
@@ -37,24 +42,6 @@ class Everleaf(HandHistoryConverter):
     re_Board       = re.compile(ur"\[ (?P<CARDS>.+) \]")
     
     
-    def __init__(self, in_path = '-', out_path = '-', follow = False, autostart=True, debugging=False, index=0):
-        """\
-in_path   (default '-' = sys.stdin)
-out_path  (default '-' = sys.stdout)
-follow :  whether to tail -f the input
-autostart: whether to run the thread (or you can call start() yourself)
-debugging: if False, pass on partially supported game types. If true, have a go and error..."""
-        #print "DEBUG: XXXXXXXXXXXXXXX"
-        HandHistoryConverter.__init__(self, in_path, out_path, sitename="Everleaf", follow=follow, index=index)
-        logging.info("Initialising Everleaf converter class")
-        self.filetype = "text"
-        self.codepage = "cp1252"
-        self.siteId   = 3 # Needs to match id entry in Sites database
-        self.debugging = debugging
-        if autostart:
-            self.start()
-            # otherwise you need to call start yourself.
-
     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'
diff --git a/pyfpdb/Exceptions.py b/pyfpdb/Exceptions.py
index fa76f3cd..8259a484 100644
--- a/pyfpdb/Exceptions.py
+++ b/pyfpdb/Exceptions.py
@@ -1 +1,4 @@
-class FpdbParseError(Exception): pass
+class FpdbParseError(Exception): 
+    def __init__(self,hid=None):
+        self.hid = hid
+
diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index a68c1cbd..19a666f1 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -27,6 +27,11 @@ from HandHistoryConverter import *
 
 class Fulltilt(HandHistoryConverter):
     
+    sitename = "Fulltilt"
+    filetype = "text"
+    codepage = "cp1252"
+    siteId   = 1 # Needs to match id entry in Sites database
+
     # Static regexes
     re_GameInfo     = re.compile('''(?:(?P<TOURNAMENT>.+)\s\((?P<TOURNO>\d+)\),\s)?
                                     .+
@@ -39,7 +44,7 @@ class Fulltilt(HandHistoryConverter):
                                  ''', re.VERBOSE)
     re_SplitHands   = re.compile(r"\n\n+")
     re_TailSplitHands   = re.compile(r"(\n\n+)")
-    re_HandInfo     = re.compile('''.*\#(?P<HID>[0-9]+):\s
+    re_HandInfo     = re.compile(r'''.*\#(?P<HID>[0-9]+):\s
                                     (?:(?P<TOURNAMENT>.+)\s\((?P<TOURNO>\d+)\),\s)?
                                     Table\s
                                     (?P<PLAY>Play\sChip\s|PC)?
@@ -47,8 +52,9 @@ class Fulltilt(HandHistoryConverter):
                                     (\((?P<TABLEATTRIBUTES>.+)\)\s)?-\s
                                     \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+)\s(Ante\s\$?(?P<ANTE>[.0-9]+)\s)?-\s
                                     (?P<GAMETYPE>[a-zA-Z\/\'\s]+)\s-\s
-                                    (?P<DATETIME>.*)
-                                 ''', re.VERBOSE)
+                                    (?P<DATETIME>.*?)\n
+                                    (?:.*?\n(?P<CANCELLED>Hand\s\#(?P=HID)\shas\sbeen\scanceled))?
+                                 ''', re.VERBOSE|re.DOTALL)
     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_Board        = re.compile(r"\[(?P<CARDS>.+)\]")
@@ -60,20 +66,6 @@ class Fulltilt(HandHistoryConverter):
 
     mixes = { 'HORSE': 'horse', '7-Game': '7game', 'HOSE': 'hose', 'HA': 'ha'}
 
-    def __init__(self, in_path = '-', out_path = '-', follow = False, autostart=True, index=0):
-        """\
-in_path   (default '-' = sys.stdin)
-out_path  (default '-' = sys.stdout)
-follow :  whether to tail -f the input"""
-        HandHistoryConverter.__init__(self, in_path, out_path, sitename="Fulltilt", follow=follow, index=index)
-        logging.info("Initialising Fulltilt converter class")
-        self.filetype = "text"
-        self.codepage = "cp1252"
-        self.siteId   = 1 # Needs to match id entry in Sites database
-        if autostart:
-            self.start()
-
-
     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'
@@ -162,7 +154,7 @@ follow :  whether to tail -f the input"""
         return re.split(self.re_SplitHands,  self.obs)
 
     def readHandInfo(self, hand):
-        m =  self.re_HandInfo.search(hand.handText,re.DOTALL)
+        m =  self.re_HandInfo.search(hand.handText)
         if(m == None):
             logging.info("Didn't match re_HandInfo")
             logging.info(hand.handText)
@@ -170,6 +162,10 @@ follow :  whether to tail -f the input"""
         hand.handid = m.group('HID')
         hand.tablename = m.group('TABLE')
         hand.starttime = datetime.datetime.strptime(m.group('DATETIME'), "%H:%M:%S ET - %Y/%m/%d")
+
+        if m.group("CANCELLED"):
+            raise FpdbParseError(hid=m.group('HID'))
+
         if m.group('TABLEATTRIBUTES'):
             m2 = self.re_Max.search(m.group('TABLEATTRIBUTES'))
             if m2: hand.maxseats = int(m2.group('MAX'))
@@ -369,7 +365,4 @@ if __name__ == "__main__":
 
     (options, args) = parser.parse_args()
 
-    LOG_FILENAME = './logging.out'
-    logging.basicConfig(filename=LOG_FILENAME,level=options.verbosity)
-
     e = Fulltilt(in_path = options.ipath, out_path = options.opath, follow = options.follow)
diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 0946e6f9..47de760a 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -32,6 +32,8 @@ import pprint
 import DerivedStats
 import Card
 
+log = logging.getLogger("parser")
+
 class Hand(object):
 
 ###############################################################3
@@ -162,7 +164,7 @@ shown   whether they were revealed at showdown
 mucked  whether they were mucked at showdown
 dealt   whether they were seen in a 'dealt to' line
 """
-#        logging.debug("addHoleCards %s %s" % (open + closed, player))
+#        log.debug("addHoleCards %s %s" % (open + closed, player))
         try:
             self.checkPlayerExists(player)
         except FpdbParseError, e:
@@ -264,7 +266,7 @@ seat    (int) indicating the seat
 name    (string) player name
 chips   (string) the chips the player has at the start of the hand (can be None)
 If a player has None chips he won't be added."""
-        logging.debug("addPlayer: %s %s (%s)" % (seat, name, chips))
+        log.debug("addPlayer: %s %s (%s)" % (seat, name, chips))
         if chips is not None:
             chips = re.sub(u',', u'', chips) #some sites have commas
             self.players.append([seat, name, chips])
@@ -280,9 +282,9 @@ If a player has None chips he won't be added."""
         # go through m and initialise actions to empty list for each street.
         if match:
             self.streets.update(match.groupdict())
-            logging.debug("markStreets:\n"+ str(self.streets))
+            log.debug("markStreets:\n"+ str(self.streets))
         else:
-            logging.error("markstreets didn't match")
+            log.error("markstreets didn't match")
 
     def checkPlayerExists(self,player):
         if player not in [p[1] for p in self.players]:
@@ -292,7 +294,7 @@ If a player has None chips he won't be added."""
 
 
     def setCommunityCards(self, street, cards):
-        logging.debug("setCommunityCards %s %s" %(street,  cards))
+        log.debug("setCommunityCards %s %s" %(street,  cards))
         self.board[street] = [self.card(c) for c in cards]
 #        print "DEBUG: self.board: %s" % self.board
 
@@ -303,7 +305,7 @@ If a player has None chips he won't be added."""
         return c
 
     def addAnte(self, player, ante):
-        logging.debug("%s %s antes %s" % ('ANTES', player, ante))
+        log.debug("%s %s antes %s" % ('ANTES', player, ante))
         if player is not None:
             ante = re.sub(u',', u'', ante) #some sites have commas
             self.bets['ANTES'][player].append(Decimal(ante))
@@ -322,7 +324,7 @@ If a player has None chips he won't be added."""
         #   - this is a call of 1 sb and a raise to 1 bb
         #
 
-        logging.debug("addBlind: %s posts %s, %s" % (player, blindtype, amount))
+        log.debug("addBlind: %s posts %s, %s" % (player, blindtype, amount))
         if player is not None:
             amount = re.sub(u',', u'', amount) #some sites have commas
             self.bets['PREFLOP'][player].append(Decimal(amount))
@@ -344,7 +346,7 @@ If a player has None chips he won't be added."""
     def addCall(self, street, player=None, amount=None):
         if amount:
             amount = re.sub(u',', u'', amount) #some sites have commas
-        logging.debug("%s %s calls %s" %(street, player, amount))
+        log.debug("%s %s calls %s" %(street, player, amount))
         # Potentially calculate the amount of the call if not supplied
         # corner cases include if player would be all in
         if amount is not None:
@@ -414,7 +416,7 @@ Add a raise on [street] by [player] to [amountTo]
         self._addRaise(street, player, C, Rb, Rt)
 
     def _addRaise(self, street, player, C, Rb, Rt):
-        logging.debug("%s %s raise %s" %(street, player, Rt))
+        log.debug("%s %s raise %s" %(street, player, Rt))
         self.bets[street][player].append(C + Rb)
         self.stacks[player] -= (C + Rb)
         act = (player, 'raises', Rb, Rt, C, self.stacks[player]==0)
@@ -425,7 +427,7 @@ Add a raise on [street] by [player] to [amountTo]
         
         
     def addBet(self, street, player, amount):
-        logging.debug("%s %s bets %s" %(street, player, amount))
+        log.debug("%s %s bets %s" %(street, player, amount))
         amount = re.sub(u',', u'', amount) #some sites have commas
         self.checkPlayerExists(player)
         self.bets[street][player].append(Decimal(amount))
@@ -444,7 +446,7 @@ Add a raise on [street] by [player] to [amountTo]
         
 
     def addFold(self, street, player):
-        logging.debug("%s %s folds" % (street, player))
+        log.debug("%s %s folds" % (street, player))
         self.checkPlayerExists(player)
         self.folded.add(player)
         self.pot.addFold(player)
@@ -458,7 +460,7 @@ Add a raise on [street] by [player] to [amountTo]
 
 
     def addCollectPot(self,player, pot):
-        logging.debug("%s collected %s" % (player, pot))
+        log.debug("%s collected %s" % (player, pot))
         self.checkPlayerExists(player)
         self.collected = self.collected + [[player, pot]]
         if player not in self.collectees:
@@ -472,7 +474,7 @@ Add a raise on [street] by [player] to [amountTo]
 For when a player shows cards for any reason (for showdown or out of choice).
 Card ranks will be uppercased
 """
-        logging.debug("addShownCards %s hole=%s all=%s" % (player, cards,  holeandboard))
+        log.debug("addShownCards %s hole=%s all=%s" % (player, cards,  holeandboard))
         if cards is not None:
             self.addHoleCards(cards,player,shown, mucked)
         elif holeandboard is not None:
@@ -522,7 +524,7 @@ Map the tuple self.gametype onto the pokerstars string describing it
               "cp"  : "Cap Pot Limit"
              }
 
-        logging.debug("gametype: %s" %(self.gametype))
+        log.debug("gametype: %s" %(self.gametype))
         retstring = "%s %s" %(gs[self.gametype['category']], ls[self.gametype['limitType']])
         return retstring
 
@@ -601,7 +603,7 @@ class HoldemOmahaHand(Hand):
     def __init__(self, hhc, sitename, gametype, handText, builtFrom = "HHC", handid=None):
         if gametype['base'] != 'hold':
             pass # or indeed don't pass and complain instead
-        logging.debug("HoldemOmahaHand")
+        log.debug("HoldemOmahaHand")
         self.allStreets = ['BLINDSANTES', 'PREFLOP','FLOP','TURN','RIVER']
         self.holeStreets = ['PREFLOP']
         self.communityStreets = ['FLOP', 'TURN', 'RIVER']
@@ -640,9 +642,9 @@ class HoldemOmahaHand(Hand):
             if handid is not None:
                 self.select(handid) # Will need a handId
             else:
-                logging.warning("HoldemOmahaHand.__init__:Can't assemble hand from db without a handid")
+                log.warning("HoldemOmahaHand.__init__:Can't assemble hand from db without a handid")
         else:
-            logging.warning("HoldemOmahaHand.__init__:Neither HHC nor DB+handid provided")
+            log.warning("HoldemOmahaHand.__init__:Neither HHC nor DB+handid provided")
             pass
                 
 
@@ -754,7 +756,7 @@ class HoldemOmahaHand(Hand):
         super(HoldemOmahaHand, self).writeHand(fh)
 
         players_who_act_preflop = set(([x[0] for x in self.actions['PREFLOP']]+[x[0] for x in self.actions['BLINDSANTES']]))
-        logging.debug(self.actions['PREFLOP'])
+        log.debug(self.actions['PREFLOP'])
         for player in [x for x in self.players if x[1] in players_who_act_preflop]:
             #Only print stacks of players who do something preflop
             print >>fh, ("Seat %s: %s ($%s in chips) " %(player[0], player[1], player[2]))
@@ -897,7 +899,7 @@ class DrawHand(Hand):
         #   - this is a call of 1 sb and a raise to 1 bb
         # 
         
-        logging.debug("addBlind: %s posts %s, %s" % (player, blindtype, amount))
+        log.debug("addBlind: %s posts %s, %s" % (player, blindtype, amount))
         if player is not None:
             self.bets['DEAL'][player].append(Decimal(amount))
             self.stacks[player] -= Decimal(amount)
@@ -924,7 +926,7 @@ class DrawHand(Hand):
 
 
     def discardDrawHoleCards(self, cards, player, street):
-        logging.debug("discardDrawHoleCards '%s' '%s' '%s'" % (cards, player, street))
+        log.debug("discardDrawHoleCards '%s' '%s' '%s'" % (cards, player, street))
         self.discards[street][player] = set([cards])
 
 
@@ -1042,8 +1044,7 @@ class StudHand(Hand):
             for street in self.actionStreets:
                 if street == 'ANTES': continue # OMG--sometime someone folds in the ante round
                 if self.streets[street]:
-                    logging.debug(street)
-                    logging.debug(self.streets[street])
+                    log.debug(street + self.streets[street])
                     hhc.readAction(self, street)
             hhc.readCollectPot(self)
             hhc.readShownCards(self) # not done yet
@@ -1075,7 +1076,7 @@ street  (string) the street name (in streetList)
 open  list of card bigrams e.g. ['2h','Jc'], dealt face up
 closed    likewise, but known only to player
 """
-        logging.debug("addPlayerCards %s, o%s x%s" % (player,  open, closed))
+        log.debug("addPlayerCards %s, o%s x%s" % (player,  open, closed))
         try:
             self.checkPlayerExists(player)
             self.holecards[street][player] = (open, closed)
@@ -1089,7 +1090,7 @@ closed    likewise, but known only to player
         """\
 Add a complete on [street] by [player] to [amountTo]
 """
-        logging.debug("%s %s completes %s" % (street, player, amountTo))
+        log.debug("%s %s completes %s" % (street, player, amountTo))
         amountTo = re.sub(u',', u'', amountTo) #some sites have commas
         self.checkPlayerExists(player)
         Bp = self.lastBet['THIRD']
@@ -1107,7 +1108,7 @@ Add a complete on [street] by [player] to [amountTo]
         
     def addBringIn(self, player, bringin):
         if player is not None:
-            logging.debug("Bringin: %s, %s" % (player , bringin))
+            log.debug("Bringin: %s, %s" % (player , bringin))
             self.bets['THIRD'][player].append(Decimal(bringin))
             self.stacks[player] -= Decimal(bringin)
             act = (player, 'bringin', bringin, self.stacks[player]==0)
diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index bb30e705..912c84ae 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -19,7 +19,6 @@ import Hand
 import re
 import sys
 import traceback
-import logging
 from optparse import OptionParser
 import os
 import os.path
@@ -30,19 +29,37 @@ import operator
 from xml.dom.minidom import Node
 import time
 import datetime
+from Exceptions import FpdbParseError
 
 import gettext
 gettext.install('fpdb')
 
+import logging, logging.config
+logging.config.fileConfig("logging.conf")
+log = logging.getLogger("parser")
+
 class HandHistoryConverter():
 
-    READ_CHUNK_SIZE = 10000 # bytes to read at a time from file (in tail mode)
-    def __init__(self, in_path = '-', out_path = '-', sitename = None, follow=False, index=0):
-        logging.info("HandHistory init")
+    READ_CHUNK_SIZE = 10000 # bytes to read at a time from file in tail mode
+
+    # filetype can be "text" or "xml"
+    # so far always "text"
+    # subclass HHC_xml for xml parsing
+    filetype = "text"
+
+    # codepage indicates the encoding of the text file.
+    # cp1252 is a safe default
+    # "utf_8" is more likely if there are funny characters
+    codepage = "cp1252"
+
+    def __init__(self, in_path = '-', out_path = '-', follow=False, index=0, autostart=True):
+        """\
+in_path   (default '-' = sys.stdin)
+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) )
         
-        # default filetype and codepage. Subclasses should set these properly.
-        self.filetype  = "text"
-        self.codepage  = "utf8"
         self.index     = 0
 
         self.in_path = in_path
@@ -59,49 +76,72 @@ class HandHistoryConverter():
             # TODO: out_path should be sanity checked.
             out_dir = os.path.dirname(self.out_path)
             if not os.path.isdir(out_dir):
-                logging.info("Creatin directory '%s'" % out_dir)
+                log.info("Creating directory '%s'" % out_dir)
                 os.makedirs(out_dir)
-            self.out_fh = open(self.out_path, 'w')
+            try:
+                self.out_fh = open(self.out_path, 'w')
+                log.debug("out_path %s opened as %s" % (self.out_path, self.out_fh))
+            except:
+                log.error("out_path %s couldn't be opened" % (self.out_path))
 
-        self.sitename  = sitename
         self.follow = follow
         self.compiledPlayers   = set()
         self.maxseats  = 10
 
+        if autostart:
+            self.start()
+
     def __str__(self):
         return """
 HandHistoryConverter: '%(sitename)s'
-    filetype:   '%(filetype)s'
-    in_path:    '%(in_path)s'
-    out_path:   '%(out_path)s'
-    """ % { 'sitename':self.sitename, 'filetype':self.filetype, 'in_path':self.in_path, 'out_path':self.out_path }
+    filetype    '%(filetype)s'
+    in_path     '%(in_path)s'
+    out_path    '%(out_path)s'
+    follow      '%(follow)s'
+    """ %  locals() 
 
     def start(self):
-        """process a hand at a time from the input specified by in_path.
+        """Process a hand at a time from the input specified by in_path.
 If in follow mode, wait for more data to turn up.
-Otherwise, finish at eof.
+Otherwise, finish at EOF.
 
 """
         starttime = time.time()
         if not self.sanityCheck():
-            print "Cowardly refusing to continue after failed sanity check"
+            log.warning("Failed sanity check")
             return
 
-        if self.follow:
+        try:
             numHands = 0
-            for handText in self.tailHands():
-                numHands+=1
-                self.processHand(handText)
-        else:
-            handsList = self.allHandsAsList()
-            logging.info("Parsing %d hands" % len(handsList))
-            for handText in handsList:
-                self.processedHands.append(self.processHand(handText))
-            numHands=  len(handsList)
-        endtime = time.time()
-        print "read %d hands in %.3f seconds" % (numHands, endtime - starttime)
-        if self.out_fh != sys.stdout:
-            self.out_fh.close()
+            numErrors = 0
+            if self.follow:
+                log.info("Tailing '%s'" % self.in_path)
+                for handText in self.tailHands():
+                    try:
+                        self.processHand(handText)
+                        numHands+=1
+                    except FpdbParseError, e:
+                        numErrors+=1
+                        log.warning("Failed to convert hand %s" % e.hid)
+                        log.debug(handText)
+            else:
+                handsList = self.allHandsAsList()
+                log.info("Parsing %d hands" % len(handsList))
+                for handText in handsList:
+                    try:
+                        self.processedHands.append(self.processHand(handText))
+                    except FpdbParseError, e:
+                        numErrors+=1
+                        log.warning("Failed to convert hand %s" % e.hid)
+                        log.debug(handText)
+                numHands = len(handsList)
+            endtime = time.time()
+            log.info("Read %d hands (%d failed) in %.3f seconds" % (numHands, numErrors, endtime - starttime))
+        except IOError, ioe:
+            log.exception("Error converting '%s'" % self.in_path)
+        finally:
+            if self.out_fh != sys.stdout:
+                self.out_fh.close()
 
 
     def tailHands(self):
@@ -128,7 +168,7 @@ which it expects to find at self.re_TailSplitHands -- see for e.g. Everleaf.py.
                     time.sleep(interval)
                     fd.seek(where)
                 else:
-                    logging.debug("%s changed inode numbers from %d to %d" % (self.in_path, fd_results[1], st_results[1]))
+                    log.debug("%s changed inode numbers from %d to %d" % (self.in_path, fd_results[1], st_results[1]))
                     fd = codecs.open(self.in_path, 'r', self.codepage)
                     fd.seek(where)
             else:
@@ -173,13 +213,13 @@ which it expects to find at self.re_TailSplitHands -- see for e.g. Everleaf.py.
         self.obs = self.obs.strip()
         self.obs = self.obs.replace('\r\n', '\n')
         if self.obs == "" or self.obs == None:
-            logging.info("Read no hands.")
+            log.info("Read no hands.")
             return
         return re.split(self.re_SplitHands,  self.obs)
         
     def processHand(self, handText):
         gametype = self.determineGameType(handText)
-        logging.debug("gametype %s" % gametype)
+        log.debug("gametype %s" % gametype)
         hand = None
         if gametype is None: 
             l = None
@@ -194,14 +234,14 @@ which it expects to find at self.re_TailSplitHands -- see for e.g. Everleaf.py.
             l = [type] + [base] + [limit]
         if l in self.readSupportedGames():
             if gametype['base'] == 'hold':
-                logging.debug("hand = Hand.HoldemOmahaHand(self, self.sitename, gametype, handtext)")
+                log.debug("hand = Hand.HoldemOmahaHand(self, self.sitename, gametype, handtext)")
                 hand = Hand.HoldemOmahaHand(self, self.sitename, gametype, handText)
             elif gametype['base'] == 'stud':
                 hand = Hand.StudHand(self, self.sitename, gametype, handText)
             elif gametype['base'] == 'draw':
                 hand = Hand.DrawHand(self, self.sitename, gametype, handText)
         else:
-            logging.info("Unsupported game type: %s" % gametype)
+            log.info("Unsupported game type: %s" % gametype)
 
         if hand:
 #    uncomment these to calculate some stats
@@ -210,7 +250,7 @@ which it expects to find at self.re_TailSplitHands -- see for e.g. Everleaf.py.
             hand.writeHand(self.out_fh)
             return hand
         else:
-            logging.info("Unsupported game type: %s" % gametype)
+            log.info("Unsupported game type: %s" % gametype)
             # TODO: pity we don't know the HID at this stage. Log the entire hand?
             # From the log we can deduce that it is the hand after the one before :)
 
@@ -336,26 +376,23 @@ or None if we fail to get the info """
         return hands
 
     def readFile(self):
-        """open in_path according to self.codepage"""
+        """Open in_path according to self.codepage. Exceptions caught further up"""
         
         if(self.filetype == "text"):
             if self.in_path == '-':
                 # read from stdin
-                logging.debug("Reading stdin with %s" % self.codepage) # is this necessary? or possible? or what?
+                log.debug("Reading stdin with %s" % self.codepage) # is this necessary? or possible? or what?
                 in_fh = codecs.getreader('cp1252')(sys.stdin)
             else:
-                logging.debug("Opening %s with %s" % (self.in_path, self.codepage))
                 in_fh = codecs.open(self.in_path, 'r', self.codepage)
                 in_fh.seek(self.index)
-            self.obs = in_fh.read()
-            self.index = in_fh.tell()
-            in_fh.close()
+                log.debug("Opened in_path: '%s' with %s" % (self.in_path, self.codepage))
+                self.obs = in_fh.read()
+                self.index = in_fh.tell()
+                in_fh.close()
         elif(self.filetype == "xml"):
-            try:
-                doc = xml.dom.minidom.parse(filename)
-                self.doc = doc
-            except:
-                traceback.print_exc(file=sys.stderr)
+            doc = xml.dom.minidom.parse(filename)
+            self.doc = doc
 
     def guessMaxSeats(self, hand):
         """Return a guess at max_seats when not specified in HH."""
diff --git a/pyfpdb/PartyPokerToFpdb.py b/pyfpdb/PartyPokerToFpdb.py
index c0161bf0..04fd17cf 100644
--- a/pyfpdb/PartyPokerToFpdb.py
+++ b/pyfpdb/PartyPokerToFpdb.py
@@ -43,6 +43,11 @@ class PartyPoker(HandHistoryConverter):
 ############################################################
 #    Class Variables
 
+    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.
+
+
     sym = {'USD': "\$", }
 
     # Static regexes
@@ -127,20 +132,6 @@ class PartyPoker(HandHistoryConverter):
 #        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]+)')    
 
 
-    def __init__(self, in_path = '-', out_path = '-', follow = False, autostart=True, index=0):
-        """\
-in_path   (default '-' = sys.stdin)
-out_path  (default '-' = sys.stdout)
-follow :  whether to tail -f the input"""
-        HandHistoryConverter.__init__(self, in_path, out_path, sitename="PartyPoker", follow=follow, index=index)
-        logging.info("Initialising PartyPoker converter class")
-        self.filetype = "text"
-        self.codepage = "cp1252" # FIXME: wtf?
-        self.siteId   = 9 # Needs to match id entry in Sites database
-        self._gameType = None # cached reg-parse result
-        if autostart: 
-            self.start()
-
     def allHandsAsList(self):
         list = HandHistoryConverter.allHandsAsList(self)
         return filter(lambda text: len(text.strip()), list)
diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
index fcfecb84..7f845b38 100755
--- a/pyfpdb/PokerStarsToFpdb.py
+++ b/pyfpdb/PokerStarsToFpdb.py
@@ -19,6 +19,7 @@
 ########################################################################
 
 # TODO: straighten out discards for draw games
+
 import sys
 from HandHistoryConverter import *
 
@@ -26,8 +27,12 @@ from HandHistoryConverter import *
 
 class PokerStars(HandHistoryConverter):
 
-############################################################
-#    Class Variables
+    # Class Variables
+
+    sitename = "PokerStars"
+    filetype = "text"
+    codepage = "cp1252"
+    siteId   = 2 # Needs to match id entry in Sites database
 
     mixes = { 'HORSE': 'horse', '8-Game': '8game', 'HOSE': 'hose'} # Legal mixed games
     sym = {'USD': "\$", 'CAD': "\$", 'T$': "", "EUR": "\x80", "GBP": "\xa3"}         # ADD Euro, Sterling, etc HERE
@@ -77,20 +82,6 @@ class PokerStars(HandHistoryConverter):
 #        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]+)')    
 
 
-    def __init__(self, in_path = '-', out_path = '-', follow = False, autostart=True, index=0):
-        """\
-in_path   (default '-' = sys.stdin)
-out_path  (default '-' = sys.stdout)
-follow :  whether to tail -f the input"""
-        HandHistoryConverter.__init__(self, in_path, out_path, sitename="PokerStars", follow=follow, index=index)
-        logging.info("Initialising PokerStars converter class")
-        self.filetype = "text"
-        self.codepage = "cp1252"
-        self.siteId   = 2 # Needs to match id entry in Sites database
-        if autostart:
-            self.start()
-
-
     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'
@@ -388,7 +379,4 @@ if __name__ == "__main__":
 
     (options, args) = parser.parse_args()
 
-    LOG_FILENAME = './logging.out'
-    logging.basicConfig(filename=LOG_FILENAME,level=options.verbosity)
-
     e = PokerStars(in_path = options.ipath, out_path = options.opath, follow = options.follow)
diff --git a/pyfpdb/Win2dayToFpdb.py b/pyfpdb/Win2dayToFpdb.py
index 13787291..f16b44af 100755
--- a/pyfpdb/Win2dayToFpdb.py
+++ b/pyfpdb/Win2dayToFpdb.py
@@ -26,6 +26,11 @@ from HandHistoryConverter import *
 
 class Win2day(HandHistoryConverter):
 
+    sitename = "Win2day"
+    filetype = "text"
+    codepage = "cp1252"
+    siteID   = 4
+
     # Static regexes
     #<HISTORY ID="102271403" SESSION="session31237702.xml" TABLE="Innsbruck 3" GAME="GAME_THM" GAMETYPE="GAMETYPE_REAL" GAMEKIND="GAMEKIND_CASH" TABLECURRENCY="EUR" LIMIT="NL" STAKES="0.25/0.50" DATE="1246909773" WIN="0.00" LOSS="0.50">
     
@@ -39,15 +44,6 @@ class Win2day(HandHistoryConverter):
     re_Card        = re.compile('^<CARD LINK="(?P<CARD>[0-9]+)"></CARD>', re.MULTILINE)
     re_BoardLast    = re.compile('^<CARD LINK="(?P<CARD>[0-9]+)"></CARD></ACTION>', re.MULTILINE)
     
-    def __init__(self, in_path = '-', out_path = '-', follow = False, autostart=True, index=0):
-        HandHistoryConverter.__init__(self, in_path, out_path, sitename="Win2day", follow=follow, index=index)
-        logging.info("Initialising Win2day converter class")
-        self.filetype = "text"
-        self.codepage = "cp1252"
-        self.sideID   = 4
-        if autostart:
-            self.start()
-
 
     def compilePlayerRegexs(self,  hand):
         players = set([player[1] for player in hand.players])
@@ -65,7 +61,7 @@ class Win2day(HandHistoryConverter):
             self.re_PostBoth         = re.compile(r'^<ACTION TYPE="HAND_BLINDS" PLAYER="%s" KIND="HAND_AB" VALUE="(?P<SBBB>[.0-9]+)"></ACTION>' %  player_re, re.MULTILINE)
     
             #r'<ACTION TYPE="HAND_DEAL" PLAYER="%s">\n<CARD LINK="(?P<CARD1>[0-9]+)"></CARD>\n<CARD LINK="(?P<CARD2>[0-9]+)"></CARD></ACTION>'
-            self.re_HeroCards        = re.compile(r'<ACTION TYPE="HAND_DEAL" PLAYER="%s">\n(?P<CARDS><CARD LINK="[0-9]+"></CARD>\n<CARD LINK="[0-9]"></CARD>)</ACTION>' % player_re, re.MULTILINE)
+            self.re_HeroCards        = re.compile(r'<ACTION TYPE="HAND_DEAL" PLAYER="%s">\n(?P<CARDS><CARD LINK="[0-9]+"></CARD>\n<CARD LINK="[0-9]+"></CARD>)</ACTION>' % player_re, re.MULTILINE)
             
             #'^<ACTION TYPE="(?P<ATYPE>[_A-Z]+)" PLAYER="%s"( VALUE="(?P<BET>[.0-9]+)")?></ACTION>'
             self.re_Action           = re.compile(r'^<ACTION TYPE="(?P<ATYPE>[_A-Z]+)" PLAYER="%s"( VALUE="(?P<BET>[.0-9]+)")?></ACTION>' %  player_re, re.MULTILINE)
diff --git a/pyfpdb/test_FullTilt.py b/pyfpdb/test_FullTilt.py
index 81ea1d12..0f82da2a 100644
--- a/pyfpdb/test_FullTilt.py
+++ b/pyfpdb/test_FullTilt.py
@@ -4,7 +4,12 @@ import py
 
 # regression-test-files/fulltilt/nlhe/NLHE-6max-1.txt
 #   Sorrowful: start: $8.85 end: $14.70 total: $5.85 
-    
+  
+# 'Canceled' hand
+# regression-test-files/fulltilt/lh/Marlin.txt
+
+
+
 def checkGameInfo(hhc, header, info):
     assert hhc.determineGameType(header) == info
 
diff --git a/pyfpdb/test_PokerStars.py b/pyfpdb/test_PokerStars.py
index 454ee8d2..44a95b5e 100644
--- a/pyfpdb/test_PokerStars.py
+++ b/pyfpdb/test_PokerStars.py
@@ -14,7 +14,7 @@ text = ""
 
 hhc = PokerStarsToFpdb.PokerStars(autostart=False)
 
-h = HoldemOmahaHand(None, "ASite", gametype, text, builtFrom = "Test")
+h = HoldemOmahaHand(None, "PokerStars", gametype, text, builtFrom = "Test")
 h.addPlayer("1", "s0rrow", "100000")
 
 hhc.compilePlayerRegexs(h)

From 8ef03b0697aa3c04ac858b19074bba75232f9de3 Mon Sep 17 00:00:00 2001
From: grindi <email-is-hidden>
Date: Sun, 9 Aug 2009 19:54:35 +0400
Subject: [PATCH 06/12] Party hhc: added nl, pl and omaha hi support

---
 pyfpdb/PartyPokerToFpdb.py | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/pyfpdb/PartyPokerToFpdb.py b/pyfpdb/PartyPokerToFpdb.py
index 81044e78..70f14b3d 100644
--- a/pyfpdb/PartyPokerToFpdb.py
+++ b/pyfpdb/PartyPokerToFpdb.py
@@ -49,15 +49,15 @@ 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>\d+)\s*(?:USD)?\s*
-            (?P<LIMIT>(NL))\s+
-            (?P<GAME>(Texas\ Hold\'em))
+            (?P<CURRENCY>\$|)\s*(?P<RINGLIMIT>[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))\s+
-            (?P<GAME>(Texas\ Hold\'em))\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+
             Trny:\s?(?P<TOURNO>\d+)\s+
             Level:\s*(?P<LEVEL>\d+)\s+
@@ -157,12 +157,12 @@ follow :  whether to tail -f the input"""
 
     def readSupportedGames(self):
         return [["ring", "hold", "nl"],
-                #["ring", "hold", "pl"],
-                #["ring", "hold", "fl"],
+                ["ring", "hold", "pl"],
+                ["ring", "hold", "fl"],
 
                 ["tour", "hold", "nl"],
-                #["tour", "hold", "pl"],
-                #["tour", "hold", "fl"],
+                ["tour", "hold", "pl"],
+                ["tour", "hold", "fl"],
                ]
 
     def _getGameType(self, handText):
@@ -193,12 +193,10 @@ follow :  whether to tail -f the input"""
         
         mg = m.groupdict()
         # translations from captured groups to fpdb info strings
-        limits = { 'NL':'nl', 
-#            'Pot Limit':'pl', 'Limit':'fl' 
-            }
+        limits = { 'NL':'nl', 'PL':'pl', '':'fl' }
         games = {                          # base, category
                          "Texas Hold'em" : ('hold','holdem'), 
-                                #'Omaha' : ('hold','omahahi'),
+                                'Omaha' : ('hold','omahahi'),
                }
         currencies = { '$':'USD', '':'T$' }
 
@@ -208,7 +206,7 @@ follow :  whether to tail -f the input"""
                     "Cannot fetch field '%s'" % expectedField,
                     hh = handText)
         try:
-            info['limitType'] = limits[mg['LIMIT']]
+            info['limitType'] = limits[mg['LIMIT'].strip()]
         except:
             raise self.ParsingException(
                 "Unknown limit '%s'" % mg['LIMIT'],
@@ -232,8 +230,8 @@ follow :  whether to tail -f the input"""
             # FIXME: there are only $ and play money availible for cash
             info['currency'] = currencies[mg['CURRENCY']]
         else:
-            info['sb'] = renderTrnyMoney(mg['SB'])
-            info['bb'] = renderTrnyMoney(mg['BB'])
+            info['sb'] = clearMoneyString(mg['SB'])
+            info['bb'] = clearMoneyString(mg['BB'])
             info['currency'] = 'T$'
             
         # NB: SB, BB must be interpreted as blinds or bets depending on limit type.
@@ -309,7 +307,7 @@ follow :  whether to tail -f the input"""
         players = []
         for a in m:
             hand.addPlayer(int(a.group('SEAT')), a.group('PNAME'),
-                           renderTrnyMoney(a.group('CASH')))
+                           clearMoneyString(a.group('CASH')))
 
     def markStreets(self, hand):
         # PREFLOP = ** Dealing down cards **
@@ -434,11 +432,11 @@ follow :  whether to tail -f the input"""
                 
 def ringBlinds(ringLimit):
     "Returns blinds for current limit"
-    ringLimit = float(ringLimit)
+    ringLimit = float(clearMoneyString(ringLimit))
     if ringLimit == 5.: ringLimit = 4.
     return ('%.2f' % (ringLimit/200.), '%.2f' % (ringLimit/100.)  )
 
-def renderTrnyMoney(money):
+def clearMoneyString(money):
     "renders 'numbers' like '1 200' and '2,000'"
     return money.replace(' ', '').replace(',', '')
 

From f00a6ebfd2bbd86d0e18b664348c53cce4035ff8 Mon Sep 17 00:00:00 2001
From: grindi <email-is-hidden>
Date: Sun, 9 Aug 2009 21:24:48 +0400
Subject: [PATCH 07/12] Party hhc: removed "max seats" recognition

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

diff --git a/pyfpdb/PartyPokerToFpdb.py b/pyfpdb/PartyPokerToFpdb.py
index 70f14b3d..7abea321 100644
--- a/pyfpdb/PartyPokerToFpdb.py
+++ b/pyfpdb/PartyPokerToFpdb.py
@@ -114,8 +114,17 @@ follow :  whether to tail -f the input"""
     def allHandsAsList(self):
         list = HandHistoryConverter.allHandsAsList(self)
         if list is None:
-            return None
+            return []
         return filter(lambda text: len(text.strip()), list)
+    
+    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
+        return 9 if hand.gametype['type']=='ring' else 10
 
     def compilePlayerRegexs(self,  hand):
         players = set([player[1] for player in hand.players])
@@ -285,8 +294,8 @@ follow :  whether to tail -f the input"""
                 #FIXME: it's dirty hack T_T
                 cur = info[key][0] if info[key][0] not in '0123456789' else ''
                 hand.buyin = info[key] + '+%s0' % cur
-            if key == 'MAXSEATS':
-                hand.maxseats = int(info[key])
+            #if key == 'MAXSEATS':
+                #hand.maxseats = int(info[key])
             if key == 'LEVEL':
                 hand.level = info[key]
             if key == 'PLAY' and info['PLAY'] != 'Real':

From 2510cc66c909602cc2b410411bf55803483131ac Mon Sep 17 00:00:00 2001
From: Matt Turnbull <mcturnbull@fastmail.fm>
Date: Sun, 9 Aug 2009 20:03:43 +0100
Subject: [PATCH 08/12] default fairly taciturn logging.conf

---
 pyfpdb/logging.conf | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 pyfpdb/logging.conf

diff --git a/pyfpdb/logging.conf b/pyfpdb/logging.conf
new file mode 100644
index 00000000..f953e090
--- /dev/null
+++ b/pyfpdb/logging.conf
@@ -0,0 +1,40 @@
+[loggers]
+keys=root,parser
+
+[handlers]
+keys=consoleHandler,fileHandler
+
+[formatters]
+keys=fileFormatter,stderrFormatter
+
+[logger_root]
+level=INFO
+handlers=consoleHandler,fileHandler
+
+[logger_parser]
+level=INFO
+# set to NOTSET or DEBUG to see everything the parser does
+handlers=consoleHandler,fileHandler
+qualname=parser
+propagate=0
+
+[handler_consoleHandler]
+class=StreamHandler
+level=INFO
+formatter=stderrFormatter
+args=(sys.stderr,)
+
+[handler_fileHandler]
+class=FileHandler
+level=INFO
+formatter=fileFormatter
+args=('logging.out', 'a')
+
+
+[formatter_fileFormatter]
+format=%(asctime)s - %(name)-12s %(levelname)-8s %(message)s
+datefmt=
+
+[formatter_stderrFormatter]
+format=%(name)-12s: %(levelname)-8s %(message)s
+datefmt=

From bd12fc641097671416d8f3853620e14019d1190d Mon Sep 17 00:00:00 2001
From: Matt Turnbull <mcturnbull@fastmail.fm>
Date: Sun, 9 Aug 2009 20:22:23 +0100
Subject: [PATCH 09/12] fixes..

---
 pyfpdb/PartyPokerToFpdb.py | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)
 mode change 100644 => 100755 pyfpdb/PartyPokerToFpdb.py

diff --git a/pyfpdb/PartyPokerToFpdb.py b/pyfpdb/PartyPokerToFpdb.py
old mode 100644
new mode 100755
index b4c02f03..2b1619db
--- a/pyfpdb/PartyPokerToFpdb.py
+++ b/pyfpdb/PartyPokerToFpdb.py
@@ -43,6 +43,7 @@ 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.
@@ -114,9 +115,9 @@ 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])
-            logging.debug("player_re: " + subst['PLYR'])
-            logging.debug("CUR_SYM: " + subst['CUR_SYM'])
-            logging.debug("CUR: " + subst['CUR'])
+            log.debug("player_re: " + subst['PLYR'])
+            log.debug("CUR_SYM: " + subst['CUR_SYM'])
+            log.debug("CUR: " + subst['CUR'])
             self.re_PostSB = re.compile(
                 r"^%(PLYR)s posts small blind \[%(CUR_SYM)s(?P<SB>[.0-9]+) ?%(CUR)s\]\." %  subst, 
                 re.MULTILINE)
@@ -172,7 +173,7 @@ class PartyPoker(HandHistoryConverter):
         gametype dict is:
         {'limitType': xxx, 'base': xxx, 'category': xxx}"""
 
-        logging.debug(self.ParsingException().wrapHh( handText ))
+        log.debug(self.ParsingException().wrapHh( handText ))
         
         info = {}
         m = self._getGameType(handText)
@@ -244,7 +245,7 @@ class PartyPoker(HandHistoryConverter):
         #hand.maxseats = ???
         hand.mixed = None
         
-        logging.debug("readHandInfo: %s" % info)
+        log.debug("readHandInfo: %s" % info)
         for key in info:
             if key == 'DATETIME':
                 #Saturday, July 25, 07:53:52 EDT 2009
@@ -284,10 +285,10 @@ class PartyPoker(HandHistoryConverter):
         if m:
             hand.buttonpos = int(m.group('BUTTON'))
         else:
-            logging.info('readButton: not found')
+            log.info('readButton: not found')
 
     def readPlayerStacks(self, hand):
-        logging.debug("readPlayerStacks")
+        log.debug("readPlayerStacks")
         m = self.re_PlayerInfo.finditer(hand.handText)
         players = []
         for a in m:
@@ -314,7 +315,7 @@ class PartyPoker(HandHistoryConverter):
             hand.setCommunityCards(street, renderCards(m.group('CARDS')))
 
     def readAntes(self, hand):
-        logging.debug("reading antes")
+        log.debug("reading antes")
         m = self.re_Antes.finditer(hand.handText)
         for player in m:
             hand.addAnte(player.group('PNAME'), player.group('ANTE'))
@@ -445,7 +446,4 @@ if __name__ == "__main__":
 
     (options, args) = parser.parse_args()
 
-    #LOG_FILENAME = './logging.out'
-    logging.basicConfig(level=options.verbosity)
-
     e = PartyPoker(in_path = options.ipath, out_path = options.opath, follow = options.follow)

From 4c449059edcff6e06c66cb32243258c24cf7a17b Mon Sep 17 00:00:00 2001
From: grindi <email-is-hidden>
Date: Mon, 10 Aug 2009 00:26:24 +0400
Subject: [PATCH 10/12] HUD: added max seats submenu

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

diff --git a/pyfpdb/Hud.py b/pyfpdb/Hud.py
index 8a7aa740..4be9061f 100644
--- a/pyfpdb/Hud.py
+++ b/pyfpdb/Hud.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 """Hud.py
 
 Create and manage the hud overlays.
@@ -95,6 +96,8 @@ class Hud:
                 if my_import == None:
                     continue
                 self.aux_windows.append(my_import(self, config, aux_params))
+        
+        self.creation_attrs = None
 
     def create_mw(self):
 
@@ -146,6 +149,21 @@ class Hud:
         self.item4.connect("activate", self.debug_stat_windows)
         self.item4.show()
         
+        self.item5 = gtk.MenuItem('Set max seats')
+        self.menu.append(self.item5)
+        self.item5.show()
+        self.maxSeatsMenu = gtk.Menu()
+        self.item5.set_submenu(self.maxSeatsMenu)
+        for i in range(2, 11, 1):
+            item = gtk.MenuItem('%d-max' % i)
+            item.ms = i
+            self.maxSeatsMenu.append(item)
+            item.connect("activate", self.change_max_seats)
+            item.show()
+            setattr(self, 'maxSeatsMenuItem%d' % (i-1), item) 
+        
+            
+        
         self.ebox.connect_object("button-press-event", self.on_button_press, self.menu)
 
         self.main_window.show_all()
@@ -162,7 +180,19 @@ class Hud:
             self.main_window.gdkhandle.set_transient_for(self.main_window.parentgdkhandle) #
             
         self.update_table_position()
-               
+           
+    def change_max_seats(self, widget):
+        if self.max != widget.ms:
+            print 'change_max_seats', widget.ms
+            self.max = widget.ms
+            try:
+                self.kill()
+                self.create(*self.creation_attrs)
+                self.update(self.hand, self.config)
+            except Exception, e:
+                print "Expcetion:",str(e)
+                pass
+        
     def update_table_position(self):
         if os.name == 'nt':
             if not win32gui.IsWindow(self.table.number):
@@ -264,6 +294,8 @@ class Hud:
 #
 #    this method also manages the creating and destruction of stat
 #    windows via calls to the Stat_Window class
+        self.creation_attrs = hand, config, stat_dict, cards 
+
         self.hand = hand  
         if not self.mw_created:
             self.create_mw()

From 3d227a42cdb87d84e646a416aa17a9c20198562c Mon Sep 17 00:00:00 2001
From: grindi <email-is-hidden>
Date: Mon, 10 Aug 2009 01:45:55 +0400
Subject: [PATCH 11/12] Party hhc: fixed after Matt's refactoring ^_^

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

diff --git a/pyfpdb/PartyPokerToFpdb.py b/pyfpdb/PartyPokerToFpdb.py
index 38206845..1000c9b6 100755
--- a/pyfpdb/PartyPokerToFpdb.py
+++ b/pyfpdb/PartyPokerToFpdb.py
@@ -167,6 +167,8 @@ class PartyPoker(HandHistoryConverter):
                ]
 
     def _getGameType(self, handText):
+        if not hasattr(self, '_gameType'):
+            self._gameType = None
         if self._gameType is None:
             # let's determine whether hand is trny
             # and whether 5-th line contains head line

From 24e5c2252df01b7b70136aa54a831daa53b389cf Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Tue, 11 Aug 2009 20:52:07 +0800
Subject: [PATCH 12/12] Fix inserting into Gametypes

---
 pyfpdb/Database.py | 16 ++++++++++++++++
 pyfpdb/Hand.py     | 18 ++----------------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index 6fb96507..45de48e0 100755
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -1021,6 +1021,22 @@ class Database:
             print "Error during fdb.lock_for_insert:", str(sys.exc_value)
     #end def lock_for_insert
 
+    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):
diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 2c5045a2..97a68b18 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -189,21 +189,7 @@ db: a connected fpdb_db object"""
         sqlids = db.getSqlPlayerIDs([p[1] for p in self.players], self.siteId)
 
         #Gametypes
-
-        print "DEBUG: self.gametype %s" % self.gametype
-        #Nice way to discover if the game is already listed in the db?
-        #Also this is using an old method from fpdb_simple - should probably conform to the rest of the inserts
-
-        hilo = "h"
-        if self.gametype['category'] in ['studhilo', 'omahahilo']:
-            hilo = "s"
-        elif self.gametype['category'] in ['razz','27_3draw','badugi']:
-            hilo = "l"
-
-        gtid = db.insertGameTypes( (self.siteId, self.gametype['type'], self.gametype['base'], 
-                                    self.gametype['category'], self.gametype['limitType'], hilo,
-                                    int(Decimal(self.gametype['sb'])*100), int(Decimal(self.gametype['bb'])*100), 0, 0) )
-        
+        gtid = db.getGameTypeId(self.siteId, self.gametype)
 
         # HudCache data to come from DerivedStats class
         # HandsActions - all actions for all players for all streets - self.actions
@@ -212,7 +198,7 @@ db: a connected fpdb_db object"""
         hh = {}
         hh['siteHandNo'] =  self.handid
         hh['handStart'] = self.starttime
-        hh['gameTypeId'] = gtid[0]
+        hh['gameTypeId'] = gtid
         # seats TINYINT NOT NULL,
         hh['tableName'] = self.tablename
         hh['maxSeats'] = self.maxseats