From 1bbb2f2769ab776e921c3c6346ff3d321210476a Mon Sep 17 00:00:00 2001
From: Matt Turnbull <mcturnbull@fastmail.fm>
Date: Wed, 11 Mar 2009 14:05:38 +0000
Subject: [PATCH] here you go

---
 pyfpdb/EverleafToFpdb.py | 7 ++++---
 pyfpdb/Hand.py           | 2 +-
 pyfpdb/test_Everleaf.py  | 1 -
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py
index cc605662..97b636c2 100755
--- a/pyfpdb/EverleafToFpdb.py
+++ b/pyfpdb/EverleafToFpdb.py
@@ -28,7 +28,7 @@ class Everleaf(HandHistoryConverter):
     
     # Static regexes
     re_SplitHands  = re.compile(r"\n\n+")
-    re_GameInfo    = 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_GameInfo    = 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.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)
@@ -106,13 +106,13 @@ or None if we fail to get the info """
         info = {'type':'ring'}
         
         m = self.re_GameInfo.search(handText)
-        if not m: 
+        if not m:
             return None
         
         mg = m.groupdict()
         
         # translations from captured groups to our info strings
-        limits = { ' NL ':'nl', ' PL ':'pl', ' ':'fl' }
+        limits = { 'NL':'nl', 'PL':'pl', '':'fl' }
         games = {              # base, category
                   "Hold'em" : ('hold','holdem'), 
                     'Omaha' : ('hold','omahahi'), 
@@ -133,6 +133,7 @@ or None if we fail to get the info """
         # NB: SB, BB must be interpreted as blinds or bets depending on limit type.
         
         if not self.debugging and info['base']=='stud':
+            logging.warning("Not processing Everleaf Stud hand")
             return None
             
         return info
diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 5b29a735..b58f7d5d 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -430,7 +430,7 @@ Card ranks will be uppercased
         print >>fh, _("Table '%s' %d-max Seat #%s is the button" %(self.tablename, self.maxseats, self.buttonpos))
         
         players_who_act_preflop = set([x[0] for x in self.actions['PREFLOP']])
-
+        logging.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]))
diff --git a/pyfpdb/test_Everleaf.py b/pyfpdb/test_Everleaf.py
index 1e568bb7..6adfc495 100644
--- a/pyfpdb/test_Everleaf.py
+++ b/pyfpdb/test_Everleaf.py
@@ -50,4 +50,3 @@ Table Guanajuato""",
         yield checkGameInfo, hhc, header, info
 
 
-