From 56bd7b37baedba73f5c45ee611150c2be86ef116 Mon Sep 17 00:00:00 2001
From: Ray <ray.barker@hughes.net>
Date: Tue, 7 Jul 2009 13:48:43 -0400
Subject: [PATCH 1/8] Parse Stars tournaments for flop and stud games.

Tournaments are not correctly written in writehand(). Nor are
stud games.
---
 pyfpdb/Hand.py             |  5 +++++
 pyfpdb/PokerStarsToFpdb.py | 39 +++++++++++++++++++++++++++++++++-----
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index db1d1197..d51424e6 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -1088,6 +1088,11 @@ Add a complete on [street] by [player] to [amountTo]
     def writeHand(self, fh=sys.__stdout__):
         # PokerStars format.
 #        print >>fh, _("%s Game #%s:  %s ($%s/$%s) - %s" %("PokerStars", self.handid, self.getGameTypeAsString(), self.sb, self.bb, time.strftime('%Y/%m/%d - %H:%M:%S (ET)', self.starttime)))
+
+# TODO:
+#    Hole cards are not currently correctly written. Currently the down cards for non-heros
+#    are shown in the "dealt to" lines. They should be hidden in those lines. I tried to fix
+#    but mind got boggled, will try again.
         print >>fh, _("%s Game #%s:  %s ($%s/$%s) - %s" %("PokerStars", self.handid, self.getGameTypeAsString(), self.sb, self.bb, datetime.datetime.strftime(self.starttime,'%Y/%m/%d - %H:%M:%S ET')))
         print >>fh, _("Table '%s' %d-max Seat #%s is the button" %(self.tablename, self.maxseats, self.buttonpos))
         
diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
index 45306281..3c2c959c 100755
--- a/pyfpdb/PokerStarsToFpdb.py
+++ b/pyfpdb/PokerStarsToFpdb.py
@@ -26,7 +26,18 @@ from HandHistoryConverter import *
 class PokerStars(HandHistoryConverter):
 
     # Static regexes
-    re_GameInfo     = re.compile("PokerStars Game #(?P<HID>[0-9]+):\s+(?P<MIXED>HORSE|8\-Game|HOSE)? \(?(?P<GAME>Hold\'em|Razz|7 Card Stud|7 Card Stud Hi/Lo|Omaha|Omaha Hi/Lo|Badugi) (?P<LIMIT>No Limit|Limit|Pot Limit),? \(?(?P<CURRENCY>\$|)?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+)\) - (?P<DATETIME>.*$)", re.MULTILINE)
+#    re_GameInfo     = re.compile("PokerStars Game #(?P<HID>[0-9]+):\s+(?P<MIXED>HORSE|8\-Game|HOSE)? \(?(?P<GAME>Hold\'em|Razz|7 Card Stud|7 Card Stud Hi/Lo|Omaha|Omaha Hi/Lo|Badugi) (?P<LIMIT>No Limit|Limit|Pot Limit),? \(?(?P<CURRENCY>\$|)?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+)\) - (?P<DATETIME>.*$)", re.MULTILINE)
+    re_GameInfo     = re.compile("""PokerStars\sGame\s\#(?P<HID>[0-9]+):\s+
+                                  (Tournament\s\#(?P<TOURNO>\d+),\s(?P<BUYIN>[\$\+\d\.]+)\s)?
+                                  (?P<MIXED>HORSE|8\-Game|HOSE)?\s?\(?
+                                  (?P<GAME>Hold\'em|Razz|7\sCard Stud|7\sCard\sStud\sHi/Lo|Omaha|Omaha\sHi/Lo|Badugi)\s
+                                  (?P<LIMIT>No\sLimit|Limit|Pot\sLimit),?\s
+                                  (-\sLevel\s(?P<LEVEL>[IVXLC]+)\s)?\(?
+                                  (?P<CURRENCY>\$|)?
+                                  (?P<SB>[.0-9]+)/\$?
+                                  (?P<BB>[.0-9]+)\)\s-\s
+                                  (?P<DATETIME>.*$)""",
+                                  re.MULTILINE|re.VERBOSE)
     re_SplitHands   = re.compile('\n\n+')
     re_TailSplitHands   = re.compile('(\n\n\n+)')
     re_HandInfo     = re.compile("^Table \'(?P<TABLE>[- a-zA-Z]+)\'(?P<TABLEATTRIBUTES>.+?$)?", re.MULTILINE)
@@ -62,7 +73,8 @@ follow :  whether to tail -f the input"""
             self.re_BringIn          = re.compile(r"^%s: brings[- ]in( low|) for \$?(?P<BRINGIN>[.0-9]+)" % player_re, re.MULTILINE)
             self.re_PostBoth         = re.compile(r"^%s: posts small \& big blinds \[\$? (?P<SBBB>[.0-9]+)" %  player_re, re.MULTILINE)
             self.re_HeroCards        = re.compile(r"^Dealt to %s(?: \[(?P<OLDCARDS>.+?)\])?( \[(?P<NEWCARDS>.+?)\])" % player_re, re.MULTILINE)
-            self.re_Action           = re.compile(r"^%s:(?P<ATYPE> bets| checks| raises| calls| folds| discards| stands pat)( \$(?P<BET>[.\d]+))?( to \$(?P<BETTO>[.\d]+))?( (?P<NODISCARDED>\d) cards?( \[(?P<DISCARDED>.+?)\])?)?" %  player_re, re.MULTILINE)
+#            self.re_Action           = re.compile(r"^%s:(?P<ATYPE> bets| checks| raises| calls| folds| discards| stands pat)( \$(?P<BET>[.\d]+))?( to \$(?P<BETTO>[.\d]+))?( (?P<NODISCARDED>\d) cards?( \[(?P<DISCARDED>.+?)\])?)?" %  player_re, re.MULTILINE)
+            self.re_Action           = re.compile(r"^%s:(?P<ATYPE> bets| checks| raises| calls| folds| discards| stands pat)( \$?(?P<BET>[.\d]+))?( to \$?(?P<BETTO>[.\d]+))?( (?P<NODISCARDED>\d) cards?( \[(?P<DISCARDED>.+?)\])?)?" %  player_re, re.MULTILINE)
             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("^%s sits out" %  player_re, re.MULTILINE)
@@ -72,20 +84,26 @@ follow :  whether to tail -f the input"""
         return [["ring", "hold", "nl"],
                 ["ring", "hold", "pl"],
                 ["ring", "hold", "fl"],
+
                 ["ring", "stud", "fl"],
                 #["ring", "draw", "fl"],
-                ["ring", "omaha", "pl"]
+
+                ["tour", "hold", "nl"],
+                ["tour", "hold", "pl"],
+                ["tour", "hold", "fl"],
+
+                ["tour", "stud", "fl"],
                ]
 
     def determineGameType(self, handText):
-        info = {'type':'ring'}
         
+        info = {}
         m = self.re_GameInfo.search(handText)
         if not m:
             return None
 
         mg = m.groupdict()
-        
+        print "mg =", mg
         # translations from captured groups to our info strings
         limits = { 'No Limit':'nl', 'Pot Limit':'pl', 'Limit':'fl' }
         mixes = { 'HORSE': 'horse', '8-Game': '8game', 'HOSE': 'hose'}
@@ -99,6 +117,10 @@ follow :  whether to tail -f the input"""
                    'Badugi' : ('draw','badugi')
                }
         currencies = { u'€':'EUR', '$':'USD', '':'T$' }
+#    I don't think this is doing what we think. mg will always have all 
+#    the expected keys, but the ones that didn't match in the regex will
+#    have a value of None. It is OK if it throws an exception when it 
+#    runs across an unknown game or limit or whatever.
         if 'LIMIT' in mg:
             info['limitType'] = limits[mg['LIMIT']]
         if 'GAME' in mg:
@@ -111,6 +133,13 @@ follow :  whether to tail -f the input"""
             info['currency'] = currencies[mg['CURRENCY']]
         if 'MIXED' in mg and mg['MIXED'] != None:
             info['mixedType'] = mixes[mg['MIXED']]
+        info['tourNo'] = mg['TOURNO']
+        if info['tourNo'] == None:
+            info['type'] = 'ring'
+        else:
+            info['type'] = 'tour'
+        info['buyin'] = mg['BUYIN']
+        info['level'] = mg['LEVEL'] 
         # NB: SB, BB must be interpreted as blinds or bets depending on limit type.
         
         return info

From 4e952de82529b3e6ff8595998fbcee7e8e2c2672 Mon Sep 17 00:00:00 2001
From: Ray <ray.barker@hughes.net>
Date: Tue, 7 Jul 2009 14:15:36 -0400
Subject: [PATCH 2/8] Remove intermediate print.

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

diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
index 3c2c959c..580d5481 100755
--- a/pyfpdb/PokerStarsToFpdb.py
+++ b/pyfpdb/PokerStarsToFpdb.py
@@ -103,7 +103,7 @@ follow :  whether to tail -f the input"""
             return None
 
         mg = m.groupdict()
-        print "mg =", mg
+#        print "mg =", mg
         # translations from captured groups to our info strings
         limits = { 'No Limit':'nl', 'Pot Limit':'pl', 'Limit':'fl' }
         mixes = { 'HORSE': 'horse', '8-Game': '8game', 'HOSE': 'hose'}

From d8820ae1f7a5dbf5b963144b42d1dcfd60a20e8a Mon Sep 17 00:00:00 2001
From: Ray <ray.barker@hughes.net>
Date: Sat, 11 Jul 2009 13:44:32 -0400
Subject: [PATCH 3/8] Allow parsing of tournaments, draw and play money.

Sorry about the massive commit. There are still numerous bugs
parsing non-holdem hands and writehand() is broken for all
but holdem cash games.
---
 pyfpdb/Hand.py             | 76 ++++++++++++++++++++++++++---------
 pyfpdb/PokerStarsToFpdb.py | 81 ++++++++++++++++++++++++--------------
 2 files changed, 108 insertions(+), 49 deletions(-)

diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index d51424e6..cc1dfd5a 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -45,6 +45,9 @@ class Hand:
         self.maxseats = 10
         self.counted_seats = 0
         self.buttonpos = 0
+        self.tourNo = None
+        self.buyin = None
+        self.level = None
         self.seating = []
         self.players = []
         self.posted = []
@@ -56,17 +59,19 @@ class Hand:
         self.actions = {} # [['mct','bets','$10'],['mika','folds'],['carlg','raises','$20']]
         self.board = {} # dict from street names to community cards
         self.holecards = {}
+        self.discards = {}
         for street in self.allStreets:
             self.streets[street] = "" # portions of the handText, filled by markStreets()
+            self.actions[street] = []
+        for street in self.actionStreets:
             self.bets[street] = {}
             self.lastBet[street] = 0
-            self.actions[street] = []
             self.board[street] = []
+        for street in self.holeStreets:
             self.holecards[street] = {} # dict from player names to holecards
-        
+            self.discards[street] = {} # dict from player names to dicts by street ... of tuples ... of discarded holecards
         # Collections indexed by player names
 #        self.holecards = {} # dict from player names to dicts by street ... of tuples ... of holecards
-        self.discards = {} # dict from player names to dicts by street ... of tuples ... of discarded holecards
         self.stacks = {}
         self.collected = [] #list of ?
         self.collectees = {} # dict from player names to amounts collected (?)
@@ -93,6 +98,9 @@ class Hand:
                  ("TABLE NAME", self.tablename),
                  ("HERO", self.hero),
                  ("MAXSEATS", self.maxseats),
+                 ("TOURNAMENT NO", self.tourNo),
+                 ("BUYIN", self.buyin),
+                 ("LEVEL", self.level),
                  ("LASTBET", self.lastBet),
                  ("ACTION STREETS", self.actionStreets),
                  ("STREETS", self.streets),   
@@ -221,10 +229,10 @@ If a player has None chips he won't be added."""
             self.players.append([seat, name, chips])
             self.stacks[name] = Decimal(chips)
             self.pot.addPlayer(name)
-            for street in self.allStreets:
+            for street in self.actionStreets:
                 self.bets[street][name] = []
                 #self.holecards[name] = {} # dict from street names.
-                self.discards[name] = {} # dict from street names.
+                #self.discards[name] = {} # dict from street names.
 
 
     def addStreets(self, match):
@@ -784,8 +792,10 @@ class DrawHand(Hand):
         if gametype['base'] != 'draw':
             pass # or indeed don't pass and complain instead
         self.streetList = ['BLINDSANTES', 'DEAL', 'DRAWONE', 'DRAWTWO', 'DRAWTHREE']
+        self.allStreets = ['BLINDSANTES', 'DEAL', 'DRAWONE', 'DRAWTWO', 'DRAWTHREE']
         self.holeStreets = ['DEAL', 'DRAWONE', 'DRAWTWO', 'DRAWTHREE']
         self.actionStreets =  ['PREDEAL', 'DEAL', 'DRAWONE', 'DRAWTWO', 'DRAWTHREE']
+        self.communityStreets = []
         Hand.__init__(self, sitename, gametype, handText)
         self.sb = gametype['sb']
         self.bb = gametype['bb']
@@ -849,18 +859,19 @@ player  (string) name of player
             self.checkPlayerExists(player)
 #            if shown and len(cardset) > 0:
 #                self.shown.add(player)
-            self.holecards[player][street] = (newcards,oldcards)
+            self.holecards[street][player] = (newcards,oldcards)
         except FpdbParseError, e:
             print "[ERROR] Tried to add holecards for unknown player: %s" % (player,)
 
 
     def discardDrawHoleCards(self, cards, player, street):
         logging.debug("discardDrawHoleCards '%s' '%s' '%s'" % (cards, player, street))
-        self.discards[player][street] = set([cards])
+        self.discards[street][player] = set([cards])
 
 
     def addDiscard(self, street, player, num, cards):
         self.checkPlayerExists(player)
+        print "street, player, num, cards =", street, player, num, cards
         if cards:
             act = (player, 'discards', num, cards)
             self.discardDrawHoleCards(cards, player, street)
@@ -869,12 +880,12 @@ player  (string) name of player
         self.actions[street].append(act)
 
 
-    def addShownCards(self, cards, player, holeandboard=None):
-        """\
-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))
+#    def addShownCards(self, cards, player, holeandboard=None, shown=False, mucked=False):
+#        """\
+#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))
 #        if cards is not None:
 #            self.shown.add(player)
 #            self.addHoleCards(cards,player)
@@ -884,6 +895,33 @@ Card ranks will be uppercased
 #            self.addHoleCards(holeandboard.difference(board),player,shown=True)
 
 
+    def addHoleCards(self, cards, player, shown, mucked, dealt=False):
+        """\
+Assigns observed holecards to a player.
+cards   list of card bigrams e.g. ['2h','Jc']
+player  (string) name of player
+shown   whether they were revealed at showdown
+mucked  whether they were mucked at showdown
+dealt   whether they were seen in a 'dealt to' line
+"""
+#    I think this only gets called for shown cards.
+        logging.debug("addHoleCards %s %s" % (cards, player))
+        try:
+            self.checkPlayerExists(player)
+        except FpdbParseError, e:
+            print "[ERROR] Tried to add holecards for unknown player: %s" % (player,)
+            return
+
+        if dealt:
+            self.dealt.add(player)
+        if shown:
+            self.shown.add(player)
+        if mucked:
+            self.mucked.add(player)
+        if player != self.hero: #skip hero, we know his cards
+            print "player, cards =", player, cards
+            self.holecards[self.holeStreets[-1]][player] = (cards, set([]))
+
     def writeHand(self, fh=sys.__stdout__):
         # PokerStars format.
         print >>fh, _("%s Game #%s:  %s ($%s/$%s) - %s" %("PokerStars", self.handid, self.getGameTypeAsString(), self.sb, self.bb, time.strftime('%Y/%m/%d %H:%M:%S ET', self.starttime)))
@@ -913,8 +951,8 @@ Card ranks will be uppercased
             for act in self.actions['DRAWONE']:
                 print >>fh, self.actionString(act)
                 if act[0] == self.hero and act[1] == 'discards':
-                    (nc,oc) = self.holecards[act[0]]['DRAWONE']
-                    dc = self.discards[act[0]]['DRAWONE']
+                    (nc,oc) = self.holecards['DRAWONE'][act[0]]
+                    dc = self.discards['DRAWONE'][act[0]]
                     kc = oc - dc
                     print >>fh, _("Dealt to %s [%s] [%s]" % (act[0], " ".join(kc), " ".join(nc)))
 
@@ -923,8 +961,8 @@ Card ranks will be uppercased
             for act in self.actions['DRAWTWO']:
                 print >>fh, self.actionString(act)
                 if act[0] == self.hero and act[1] == 'discards':
-                    (nc,oc) = self.holecards[act[0]]['DRAWTWO']
-                    dc = self.discards[act[0]]['DRAWTWO']
+                    (nc,oc) = self.holecards['DRAWTWO'][act[0]]
+                    dc = self.discards['DRAWTWO'][act[0]]
                     kc = oc - dc
                     print >>fh, _("Dealt to %s [%s] [%s]" % (act[0], " ".join(kc), " ".join(nc)))
 
@@ -933,8 +971,8 @@ Card ranks will be uppercased
             for act in self.actions['DRAWTHREE']:
                 print >>fh, self.actionString(act)
                 if act[0] == self.hero and act[1] == 'discards':
-                    (nc,oc) = self.holecards[act[0]]['DRAWTHREE']
-                    dc = self.discards[act[0]]['DRAWTHREE']
+                    (nc,oc) = self.holecards['DRAWTHREE'][act[0]]
+                    dc = self.discards['DRAWTHREE'][act[0]]
                     kc = oc - dc
                     print >>fh, _("Dealt to %s [%s] [%s]" % (act[0], " ".join(kc), " ".join(nc)))
 
diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
index 580d5481..80c16d07 100755
--- a/pyfpdb/PokerStarsToFpdb.py
+++ b/pyfpdb/PokerStarsToFpdb.py
@@ -30,7 +30,7 @@ class PokerStars(HandHistoryConverter):
     re_GameInfo     = re.compile("""PokerStars\sGame\s\#(?P<HID>[0-9]+):\s+
                                   (Tournament\s\#(?P<TOURNO>\d+),\s(?P<BUYIN>[\$\+\d\.]+)\s)?
                                   (?P<MIXED>HORSE|8\-Game|HOSE)?\s?\(?
-                                  (?P<GAME>Hold\'em|Razz|7\sCard Stud|7\sCard\sStud\sHi/Lo|Omaha|Omaha\sHi/Lo|Badugi)\s
+                                  (?P<GAME>Hold\'em|Razz|7\sCard Stud|7\sCard\sStud\sHi/Lo|Omaha|Omaha\sHi/Lo|Badugi|Triple\sDraw\s2\-7\sLowball)\s
                                   (?P<LIMIT>No\sLimit|Limit|Pot\sLimit),?\s
                                   (-\sLevel\s(?P<LEVEL>[IVXLC]+)\s)?\(?
                                   (?P<CURRENCY>\$|)?
@@ -40,7 +40,11 @@ class PokerStars(HandHistoryConverter):
                                   re.MULTILINE|re.VERBOSE)
     re_SplitHands   = re.compile('\n\n+')
     re_TailSplitHands   = re.compile('(\n\n\n+)')
-    re_HandInfo     = re.compile("^Table \'(?P<TABLE>[- a-zA-Z]+)\'(?P<TABLEATTRIBUTES>.+?$)?", re.MULTILINE)
+    re_HandInfo     = re.compile("""^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)?""", 
+                                    re.MULTILINE|re.VERBOSE)
     re_Button       = re.compile('Seat #(?P<BUTTON>\d+) is the button', re.MULTILINE)
     re_PlayerInfo   = re.compile('^Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\$?(?P<CASH>[.0-9]+) in chips\)', re.MULTILINE)
     re_Board        = re.compile(r"\[(?P<CARDS>.+)\]")
@@ -73,8 +77,11 @@ follow :  whether to tail -f the input"""
             self.re_BringIn          = re.compile(r"^%s: brings[- ]in( low|) for \$?(?P<BRINGIN>[.0-9]+)" % player_re, re.MULTILINE)
             self.re_PostBoth         = re.compile(r"^%s: posts small \& big blinds \[\$? (?P<SBBB>[.0-9]+)" %  player_re, re.MULTILINE)
             self.re_HeroCards        = re.compile(r"^Dealt to %s(?: \[(?P<OLDCARDS>.+?)\])?( \[(?P<NEWCARDS>.+?)\])" % player_re, re.MULTILINE)
-#            self.re_Action           = re.compile(r"^%s:(?P<ATYPE> bets| checks| raises| calls| folds| discards| stands pat)( \$(?P<BET>[.\d]+))?( to \$(?P<BETTO>[.\d]+))?( (?P<NODISCARDED>\d) cards?( \[(?P<DISCARDED>.+?)\])?)?" %  player_re, re.MULTILINE)
-            self.re_Action           = re.compile(r"^%s:(?P<ATYPE> bets| checks| raises| calls| folds| discards| stands pat)( \$?(?P<BET>[.\d]+))?( to \$?(?P<BETTO>[.\d]+))?( (?P<NODISCARDED>\d) cards?( \[(?P<DISCARDED>.+?)\])?)?" %  player_re, re.MULTILINE)
+#            self.re_Action           = re.compile(r"^%s:(?P<ATYPE> bets| checks| raises| calls| folds| discards| stands pat)( \$?(?P<BET>[.\d]+))?( to \$?(?P<BETTO>[.\d]+))?( (?P<NODISCARDED>\d) cards?( \[(?P<DISCARDED>.+?)\])?)?" %  player_re, re.MULTILINE)
+            self.re_Action           = re.compile(r"""^%s:(?P<ATYPE>\sbets|\schecks|\sraises|\scalls|\sfolds|\sdiscards|\sstands\spat)
+                                                        (\s\$?(?P<BET>[.\d]+))?(\sto\s\$?(?P<BETTO>[.\d]+))?  # the number discarded goes in <BET>
+                                                        (\scards?(\s\[(?P<DISCARDED>.+?)\])?)?"""
+                                                         %  player_re, 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]+): %s (\(button\) |\(small blind\) |\(big blind\) )?(collected|showed \[.*\] and won) \(\$(?P<POT>[.\d]+)\)(, mucked| with.*|)" %  player_re, re.MULTILINE)
             self.re_sitsOut          = re.compile("^%s sits out" %  player_re, re.MULTILINE)
@@ -86,7 +93,8 @@ follow :  whether to tail -f the input"""
                 ["ring", "hold", "fl"],
 
                 ["ring", "stud", "fl"],
-                #["ring", "draw", "fl"],
+
+                ["ring", "draw", "fl"],
 
                 ["tour", "hold", "nl"],
                 ["tour", "hold", "pl"],
@@ -96,6 +104,9 @@ follow :  whether to tail -f the input"""
                ]
 
     def determineGameType(self, handText):
+#    inspect the handText and return the gametype dict
+#    gametype dict is:
+#    {'limitType': xxx, 'base': xxx, 'category': xxx}
         
         info = {}
         m = self.re_GameInfo.search(handText)
@@ -103,18 +114,18 @@ follow :  whether to tail -f the input"""
             return None
 
         mg = m.groupdict()
-#        print "mg =", mg
-        # translations from captured groups to our info strings
+        # translations from captured groups to fpdb info strings
         limits = { 'No Limit':'nl', 'Pot Limit':'pl', 'Limit':'fl' }
         mixes = { 'HORSE': 'horse', '8-Game': '8game', 'HOSE': 'hose'}
-        games = {              # base, category
-                  "Hold'em" : ('hold','holdem'), 
-                    'Omaha' : ('hold','omahahi'),
-              'Omaha Hi/Lo' : ('hold','omahahilo'),
-                     'Razz' : ('stud','razz'), 
-              '7 Card Stud' : ('stud','studhi'),
-        '7 Card Stud Hi/Lo' : ('stud','studhilo'),
-                   'Badugi' : ('draw','badugi')
+        games = {                          # base, category
+                              "Hold'em" : ('hold','holdem'), 
+                                'Omaha' : ('hold','omahahi'),
+                          'Omaha Hi/Lo' : ('hold','omahahilo'),
+                                 'Razz' : ('stud','razz'), 
+                          '7 Card Stud' : ('stud','studhi'),
+                    '7 Card Stud Hi/Lo' : ('stud','studhilo'),
+                               'Badugi' : ('draw','badugi'),
+              'Triple Draw 2-7 Lowball' : ('draw','27_3draw'),
                }
         currencies = { u'€':'EUR', '$':'USD', '':'T$' }
 #    I don't think this is doing what we think. mg will always have all 
@@ -131,17 +142,13 @@ follow :  whether to tail -f the input"""
             info['bb'] = mg['BB']
         if 'CURRENCY' in mg:
             info['currency'] = currencies[mg['CURRENCY']]
-        if 'MIXED' in mg and mg['MIXED'] != None:
-            info['mixedType'] = mixes[mg['MIXED']]
-        info['tourNo'] = mg['TOURNO']
-        if info['tourNo'] == None:
+
+        if 'TOURNO' in mg and mg['TOURNO'] == None:
             info['type'] = 'ring'
         else:
             info['type'] = 'tour'
-        info['buyin'] = mg['BUYIN']
-        info['level'] = mg['LEVEL'] 
+
         # NB: SB, BB must be interpreted as blinds or bets depending on limit type.
-        
         return info
 
 
@@ -150,14 +157,13 @@ follow :  whether to tail -f the input"""
         m = self.re_HandInfo.search(hand.handText,re.DOTALL)
         if m:
             info.update(m.groupdict())
-            # TODO: Be less lazy and parse maxseats from the HandInfo regex
-            if m.group('TABLEATTRIBUTES'):
-                m2 = re.search("\s*(\d+)-max", m.group('TABLEATTRIBUTES'))
-                hand.maxseats = int(m2.group(1))
+#                hand.maxseats = int(m2.group(1))
+        else:
+            pass  # throw an exception here, eh?
         m = self.re_GameInfo.search(hand.handText)
         if m: info.update(m.groupdict())
-        m = self.re_Button.search(hand.handText)
-        if m: info.update(m.groupdict()) 
+#        m = self.re_Button.search(hand.handText)
+#        if m: info.update(m.groupdict()) 
         # TODO : I rather like the idea of just having this dict as hand.info
         logging.debug("readHandInfo: %s" % info)
         for key in info:
@@ -174,7 +180,21 @@ follow :  whether to tail -f the input"""
                 hand.tablename = info[key]
             if key == 'BUTTON':
                 hand.buttonpos = info[key]
-        
+            if key == 'MAX':
+                hand.maxseats = info[key]
+
+            if key == 'MIXED':
+                hand.mixed = info[key]
+
+            if key == 'TOURNO':
+                hand.tourNo = info[key]
+            if key == 'BUYIN':
+                hand.buyin = info[key]
+            if key == 'LEVEL':
+                hand.level = info[key]
+            if key == 'PLAY' and info['PLAY'] != None:
+                hand.currency = 'play' # overrides previously set value
+
     def readButton(self, hand):
         m = self.re_Button.search(hand.handText)
         if m:
@@ -314,6 +334,7 @@ follow :  whether to tail -f the input"""
     def readAction(self, hand, street):
         m = self.re_Action.finditer(hand.streets[street])
         for action in m:
+            acts = action.groupdict()
             if action.group('ATYPE') == ' raises':
                 hand.addRaiseBy( street, action.group('PNAME'), action.group('BET') )
             elif action.group('ATYPE') == ' calls':
@@ -325,7 +346,7 @@ follow :  whether to tail -f the input"""
             elif action.group('ATYPE') == ' checks':
                 hand.addCheck( street, action.group('PNAME'))
             elif action.group('ATYPE') == ' discards':
-                hand.addDiscard(street, action.group('PNAME'), action.group('NODISCARDED'), action.group('DISCARDED'))
+                hand.addDiscard(street, action.group('PNAME'), action.group('BET'), action.group('DISCARDED'))
             elif action.group('ATYPE') == ' stands pat':
                 hand.addStandsPat( street, action.group('PNAME'))
             else:

From e294314e25594e92c91a8ac08e77e11d050b5785 Mon Sep 17 00:00:00 2001
From: Ray <ray.barker@hughes.net>
Date: Sun, 12 Jul 2009 13:14:50 -0400
Subject: [PATCH 4/8] Fix: hand.maxseats has to be and int.

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

diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
index 80c16d07..a16e0cef 100755
--- a/pyfpdb/PokerStarsToFpdb.py
+++ b/pyfpdb/PokerStarsToFpdb.py
@@ -23,6 +23,9 @@ from HandHistoryConverter import *
 
 # PokerStars HH Format
 
+# TODO: fix finding hero in stud games
+# TODO: fix open/closed hole cards for stud games 
+
 class PokerStars(HandHistoryConverter):
 
     # Static regexes
@@ -181,7 +184,7 @@ follow :  whether to tail -f the input"""
             if key == 'BUTTON':
                 hand.buttonpos = info[key]
             if key == 'MAX':
-                hand.maxseats = info[key]
+                hand.maxseats = int(info[key])
 
             if key == 'MIXED':
                 hand.mixed = info[key]

From 3234f89aad45f36928fa1113c19d35140b5a15aa Mon Sep 17 00:00:00 2001
From: Ray <ray.barker@hughes.net>
Date: Sun, 12 Jul 2009 16:01:02 -0400
Subject: [PATCH 5/8] Rationalized hole card format for flop games.

Also updated writehand() so flop hands are written OK.
This breaks stud and draw--fixing them now.
---
 pyfpdb/Hand.py             | 69 +++++++++++++++++++-------------------
 pyfpdb/PokerStarsToFpdb.py | 50 ++++++++++++++++++++-------
 2 files changed, 72 insertions(+), 47 deletions(-)

diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index cc1dfd5a..a9d6d49d 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -138,6 +138,29 @@ class Hand:
             str = str + "\n%s =\n" % name + pprint.pformat(struct, 4)
         return str
 
+    def addHoleCards(self, street, player, open=[], closed=[], shown=False, mucked=False, dealt=False):
+        """\
+Assigns observed holecards to a player.
+cards   list of card bigrams e.g. ['2h','Jc']
+player  (string) name of player
+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))
+        try:
+            self.checkPlayerExists(player)
+        except FpdbParseError, e:
+            print "[ERROR] Tried to add holecards for unknown player: %s" % (player,)
+            return
+
+        if dealt:  self.dealt.add(player)
+        if shown:  self.shown.add(player)
+        if mucked: self.mucked.add(player)
+
+        print "stuff =", street, player, open, closed
+        self.holecards[street][player] = [open, closed]
+
     def insert(self, db):
         """ Function to insert Hand into database
 Should not commit, and do minimal selects. Callers may want to cache commits
@@ -559,35 +582,13 @@ class HoldemOmahaHand(Hand):
             pass
                 
 
-    def addHoleCards(self, cards, player, shown, mucked, dealt=False):
-        """\
-Assigns observed holecards to a player.
-cards   list of card bigrams e.g. ['2h','Jc']
-player  (string) name of player
-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" % (cards, player))
-        try:
-            self.checkPlayerExists(player)
-        except FpdbParseError, e:
-            print "[ERROR] Tried to add holecards for unknown player: %s" % (player,)
-            return
-
-        cardset = set((self.card(c) for c in cards))
-        if len(cardset) == 0:
-            return
-        if dealt:
-            self.dealt.add(player)
-        if shown:
-            self.shown.add(player)
-        if mucked:
-            self.mucked.add(player)
-        if player in self.holecards['PREFLOP']:
-            self.holecards['PREFLOP'][player].update(cardset)
+    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)
+            if mucked: self.mucked.add(player)
         else:
-            self.holecards['PREFLOP'][player] = cardset
+            self.addHoleCards('PREFLOP', player, open=[], closed=cards, shown=shown, mucked=mucked, dealt=dealt)
+
 
     def writeHTMLHand(self, fh=sys.__stdout__):
         from nevow import tags as T
@@ -701,10 +702,10 @@ dealt   whether they were seen in a 'dealt to' line
         
         print >>fh, ("*** HOLE CARDS ***")
         for player in self.dealt:
-            print >>fh, ("Dealt to %s [%s]" %(player, " ".join(self.holecards['PREFLOP'][player])))
+            print >>fh, ("Dealt to %s [%s]" %(player, " ".join(self.holecards['PREFLOP'][player][1])))
         if self.hero == "":
             for player in self.shown.difference(self.dealt):
-                print >>fh, ("Dealt to %s [%s]" %(player, " ".join(self.holecards['PREFLOP'][player])))
+                print >>fh, ("Dealt to %s [%s]" %(player, " ".join(self.holecards['PREFLOP'][player][1])))
 
         if self.actions['PREFLOP']:
             for act in self.actions['PREFLOP']:
@@ -743,7 +744,7 @@ dealt   whether they were seen in a 'dealt to' line
                 elif self.gametype['category'] in ('holdem'):
                     numOfHoleCardsNeeded = 2
                 if len(self.holecards['PREFLOP'][name]) == numOfHoleCardsNeeded:
-                    print >>fh, ("%s shows [%s] (a hand...)" % (name, " ".join(self.holecards['PREFLOP'][name])))
+                    print >>fh, ("%s shows [%s] (a hand...)" % (name, " ".join(self.holecards['PREFLOP'][name][1])))
                 
         # Current PS format has the lines:
         # Uncalled bet ($111.25) returned to s0rrow
@@ -770,7 +771,7 @@ dealt   whether they were seen in a 'dealt to' line
             seatnum = player[0]
             name = player[1]
             if name in self.collectees and name in self.shown:
-                print >>fh, ("Seat %d: %s showed [%s] and won ($%s)" % (seatnum, name, " ".join(self.holecards['PREFLOP'][name]), self.collectees[name]))
+                print >>fh, ("Seat %d: %s showed [%s] and won ($%s)" % (seatnum, name, " ".join(self.holecards['PREFLOP'][name][1]), self.collectees[name]))
             elif name in self.collectees:
                 print >>fh, ("Seat %d: %s collected ($%s)" % (seatnum, name, self.collectees[name]))
             #~ elif name in self.shown:
@@ -779,9 +780,9 @@ dealt   whether they were seen in a 'dealt to' line
                 print >>fh, ("Seat %d: %s folded" % (seatnum, name))
             else:
                 if name in self.shown:
-                    print >>fh, ("Seat %d: %s showed [%s] and lost with..." % (seatnum, name, " ".join(self.holecards['PREFLOP'][name])))
+                    print >>fh, ("Seat %d: %s showed [%s] and lost with..." % (seatnum, name, " ".join(self.holecards['PREFLOP'][name][1])))
                 elif name in self.mucked:
-                    print >>fh, ("Seat %d: %s mucked [%s] " % (seatnum, name, " ".join(self.holecards['PREFLOP'][name])))
+                    print >>fh, ("Seat %d: %s mucked [%s] " % (seatnum, name, " ".join(self.holecards['PREFLOP'][name][1])))
                 else:
                     print >>fh, ("Seat %d: %s mucked" % (seatnum, name))
 
diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
index a16e0cef..1be2f767 100755
--- a/pyfpdb/PokerStarsToFpdb.py
+++ b/pyfpdb/PokerStarsToFpdb.py
@@ -80,6 +80,7 @@ follow :  whether to tail -f the input"""
             self.re_BringIn          = re.compile(r"^%s: brings[- ]in( low|) for \$?(?P<BRINGIN>[.0-9]+)" % player_re, re.MULTILINE)
             self.re_PostBoth         = re.compile(r"^%s: posts small \& big blinds \[\$? (?P<SBBB>[.0-9]+)" %  player_re, re.MULTILINE)
             self.re_HeroCards        = re.compile(r"^Dealt to %s(?: \[(?P<OLDCARDS>.+?)\])?( \[(?P<NEWCARDS>.+?)\])" % player_re, re.MULTILINE)
+#            self.re_DealToCards      = re.compile(r"^Dealt to %s(?: \[(?P<OLDCARDS>.+?)\])?( \[(?P<NEWCARDS>.+?)\])" % player_re, re.MULTILINE)
 #            self.re_Action           = re.compile(r"^%s:(?P<ATYPE> bets| checks| raises| calls| folds| discards| stands pat)( \$?(?P<BET>[.\d]+))?( to \$?(?P<BETTO>[.\d]+))?( (?P<NODISCARDED>\d) cards?( \[(?P<DISCARDED>.+?)\])?)?" %  player_re, re.MULTILINE)
             self.re_Action           = re.compile(r"""^%s:(?P<ATYPE>\sbets|\schecks|\sraises|\scalls|\sfolds|\sdiscards|\sstands\spat)
                                                         (\s\$?(?P<BET>[.\d]+))?(\sto\s\$?(?P<BETTO>[.\d]+))?  # the number discarded goes in <BET>
@@ -265,18 +266,41 @@ follow :  whether to tail -f the input"""
         for a in self.re_PostBoth.finditer(hand.handText):
             hand.addBlind(a.group('PNAME'), 'both', a.group('SBBB'))
 
+#    def readHeroCards(self, hand):
+#        m = self.re_HeroCards.search(hand.handText)
+#        if(m == None):
+#            #Not involved in hand
+#            hand.involved = False
+#        else:
+#            hand.hero = m.group('PNAME')
+#            # "2c, qh" -> set(["2c","qc"])
+#            # Also works with Omaha hands.
+#            cards = m.group('NEWCARDS')
+#            cards = set(cards.split(' '))
+#            hand.addHoleCards(cards, m.group('PNAME'), shown=False, mucked=False, dealt=True)
+
     def readHeroCards(self, hand):
-        m = self.re_HeroCards.search(hand.handText)
-        if(m == None):
-            #Not involved in hand
-            hand.involved = False
-        else:
-            hand.hero = m.group('PNAME')
-            # "2c, qh" -> set(["2c","qc"])
-            # Also works with Omaha hands.
-            cards = m.group('NEWCARDS')
-            cards = set(cards.split(' '))
-            hand.addHoleCards(cards, m.group('PNAME'), shown=False, mucked=False, dealt=True)
+#    streets PREFLOP, PREDRAW, and THIRD are special cases
+        for street in ('PREFLOP', 'PREDRAW'):
+            if street in hand.streets.keys():
+                print "text =", hand.streets[street]
+                m = self.re_HeroCards.search(hand.streets[street])
+                if m == None:
+                    hand.involved = False
+                else:
+                    hand.hero = m.group('PNAME')
+                    newcards = m.group('NEWCARDS').split(' ')
+                    hand.addHoleCards(street, hand.hero, closed=newcards, shown=False, mucked=False, dealt=True)
+
+#    def readHeroCards(self, hand):
+#        for street, text in hand.streets.iteritems():
+#            m = self.re_HeroCards.search(hand.handText)
+#            if(m == None):
+#                #Not involved in hand
+#                hand.involved = False
+#            else:
+                
+
 
     def readDrawCards(self, hand, street):
         logging.debug("readDrawCards")
@@ -357,9 +381,9 @@ follow :  whether to tail -f the input"""
 
 
     def readShowdownActions(self, hand):
+# TODO: pick up mucks also
         for shows in self.re_ShowdownAction.finditer(hand.handText):            
-            cards = shows.group('CARDS')
-            cards = set(cards.split(' '))
+            cards = shows.group('CARDS').split(' ')
             hand.addShownCards(cards, shows.group('PNAME'))
 
     def readCollectPot(self,hand):

From dd1b442122cc1686516fd4f69a338e105f392f15 Mon Sep 17 00:00:00 2001
From: Ray <ray.barker@hughes.net>
Date: Mon, 13 Jul 2009 00:37:51 -0400
Subject: [PATCH 6/8] Rationalized holecards for stud and draw games.

Cards are now lists of cards rather than sets. Removed some
game-specific methods and replaced with general methods.
Let the superclass handle some stuff.
---
 pyfpdb/Hand.py             | 180 +++++++++++++++++++++----------------
 pyfpdb/PokerStarsToFpdb.py | 169 ++++++++++++++++++----------------
 2 files changed, 193 insertions(+), 156 deletions(-)

diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index a9d6d49d..a2570f42 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -15,6 +15,8 @@
 #In the "official" distribution you can find the license in
 #agpl-3.0.txt in the docs folder of the package.
 
+# TODO: get writehand() encoding correct
+
 import re
 import sys
 import traceback
@@ -147,7 +149,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))
+#        logging.debug("addHoleCards %s %s" % (open + closed, player))
         try:
             self.checkPlayerExists(player)
         except FpdbParseError, e:
@@ -158,7 +160,6 @@ dealt   whether they were seen in a 'dealt to' line
         if shown:  self.shown.add(player)
         if mucked: self.mucked.add(player)
 
-        print "stuff =", street, player, open, closed
         self.holecards[street][player] = [open, closed]
 
     def insert(self, db):
@@ -808,12 +809,13 @@ class DrawHand(Hand):
             hhc.markStreets(self)
             hhc.readBlinds(self)
             hhc.readButton(self)
+            hhc.readHeroCards(self)
             hhc.readShowdownActions(self)
             # Read actions in street order
             for street in self.streetList:
                 if self.streets[street]:
                     # hhc.readCommunityCards(self, street)
-                    hhc.readDrawCards(self, street)
+#                    hhc.readDrawCards(self, street)
                     hhc.readAction(self, street)
             hhc.readCollectPot(self)
             hhc.readShownCards(self)
@@ -849,20 +851,28 @@ class DrawHand(Hand):
         #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)
+            if mucked: self.mucked.add(player)
+        else:
+# TODO: Probably better to find the last street with action and add the hole cards to that street
+            self.addHoleCards('DRAWTHREE', player, open=[], closed=cards, shown=shown, mucked=mucked, dealt=dealt)
 
-    def addDrawHoleCards(self, newcards, oldcards, player, street, shown=False):
-        """\
-Assigns observed holecards to a player.
-cards   list of card bigrams e.g. ['2h','Jc']
-player  (string) name of player
-"""
-        try:
-            self.checkPlayerExists(player)
-#            if shown and len(cardset) > 0:
-#                self.shown.add(player)
-            self.holecards[street][player] = (newcards,oldcards)
-        except FpdbParseError, e:
-            print "[ERROR] Tried to add holecards for unknown player: %s" % (player,)
+
+#    def addDrawHoleCards(self, newcards, oldcards, player, street, shown=False):
+#        """\
+#Assigns observed holecards to a player.
+#cards   list of card bigrams e.g. ['2h','Jc']
+#player  (string) name of player
+#"""
+#        try:
+#            self.checkPlayerExists(player)
+##            if shown and len(cardset) > 0:
+##                self.shown.add(player)
+#            self.holecards[street][player] = (newcards,oldcards)
+#        except FpdbParseError, e:
+#            print "[ERROR] Tried to add holecards for unknown player: %s" % (player,)
 
 
     def discardDrawHoleCards(self, cards, player, street):
@@ -872,7 +882,6 @@ player  (string) name of player
 
     def addDiscard(self, street, player, num, cards):
         self.checkPlayerExists(player)
-        print "street, player, num, cards =", street, player, num, cards
         if cards:
             act = (player, 'discards', num, cards)
             self.discardDrawHoleCards(cards, player, street)
@@ -896,32 +905,32 @@ player  (string) name of player
 #            self.addHoleCards(holeandboard.difference(board),player,shown=True)
 
 
-    def addHoleCards(self, cards, player, shown, mucked, dealt=False):
-        """\
-Assigns observed holecards to a player.
-cards   list of card bigrams e.g. ['2h','Jc']
-player  (string) name of player
-shown   whether they were revealed at showdown
-mucked  whether they were mucked at showdown
-dealt   whether they were seen in a 'dealt to' line
-"""
-#    I think this only gets called for shown cards.
-        logging.debug("addHoleCards %s %s" % (cards, player))
-        try:
-            self.checkPlayerExists(player)
-        except FpdbParseError, e:
-            print "[ERROR] Tried to add holecards for unknown player: %s" % (player,)
-            return
-
-        if dealt:
-            self.dealt.add(player)
-        if shown:
-            self.shown.add(player)
-        if mucked:
-            self.mucked.add(player)
-        if player != self.hero: #skip hero, we know his cards
-            print "player, cards =", player, cards
-            self.holecards[self.holeStreets[-1]][player] = (cards, set([]))
+#    def addHoleCards(self, cards, player, shown, mucked, dealt=False):
+#        """\
+#Assigns observed holecards to a player.
+#cards   list of card bigrams e.g. ['2h','Jc']
+#player  (string) name of player
+#shown   whether they were revealed at showdown
+#mucked  whether they were mucked at showdown
+#dealt   whether they were seen in a 'dealt to' line
+#"""
+##    I think this only gets called for shown cards.
+#        logging.debug("addHoleCards %s %s" % (cards, player))
+#        try:
+#            self.checkPlayerExists(player)
+#        except FpdbParseError, e:
+#            print "[ERROR] Tried to add holecards for unknown player: %s" % (player,)
+#            return
+#
+#        if dealt:
+#            self.dealt.add(player)
+#        if shown:
+#            self.shown.add(player)
+#        if mucked:
+#            self.mucked.add(player)
+#        if player != self.hero: #skip hero, we know his cards
+#            print "player, cards =", player, cards
+#            self.holecards[self.holeStreets[-1]][player] = (cards, set([]))
 
     def writeHand(self, fh=sys.__stdout__):
         # PokerStars format.
@@ -1023,13 +1032,14 @@ class StudHand(Hand):
             hhc.markStreets(self)
             hhc.readAntes(self)
             hhc.readBringIn(self)
+            hhc.readHeroCards(self)
             #hhc.readShowdownActions(self) # not done yet
             # Read actions in street order
             for street in self.streetList:
                 if self.streets[street]:
                     logging.debug(street)
                     logging.debug(self.streets[street])
-                    hhc.readStudPlayerCards(self, street)
+#                    hhc.readStudPlayerCards(self, street)
                     hhc.readAction(self, street)
             hhc.readCollectPot(self)
             hhc.readShownCards(self) # not done yet
@@ -1038,6 +1048,19 @@ class StudHand(Hand):
         elif builtFrom == "DB":
             self.select("dummy") # Will need a handId
 
+    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)
+            if mucked: self.mucked.add(player)
+        else:
+#            self.addHoleCards('PREFLOP', player, open=[], closed=cards, shown=shown, mucked=mucked, dealt=dealt)
+            self.addHoleCards('THIRD',   player, open=[cards[2]], closed=cards[0:2], shown=shown, mucked=mucked)
+            self.addHoleCards('FOURTH',  player, open=[cards[3]], closed=[],         shown=shown, mucked=mucked)
+            self.addHoleCards('FIFTH',   player, open=[cards[4]], closed=[],         shown=shown, mucked=mucked)
+            self.addHoleCards('SIXTH',   player, open=[cards[5]], closed=[],         shown=shown, mucked=mucked)
+            self.addHoleCards('SEVENTH', player, open=[],         closed=[cards[6]], shown=shown, mucked=mucked)
+
+
     def addPlayerCards(self, player,  street,  open=[],  closed=[]):
         """\
 Assigns observed cards to a player.
@@ -1055,42 +1078,41 @@ closed    likewise, but known only to player
         except FpdbParseError, e:
             print "[ERROR] Tried to add holecards for unknown player: %s" % (player,)
 
-    def addHoleCards(self, cards, player, shown, mucked, dealt=False):
-        """\
-Assigns observed holecards to a player.
-cards   list of card bigrams e.g. ['2h','Jc']
-player  (string) name of player
-shown   whether they were revealed at showdown
-mucked  whether they were mucked at showdown
-dealt   whether they were seen in a 'dealt to' line
-"""
+#    def addHoleCards(self, cards, player, shown, mucked, dealt=False):
+#        """\
+#Assigns observed holecards to a player.
+#cards   list of card bigrams e.g. ['2h','Jc']
+#player  (string) name of player
+#shown   whether they were revealed at showdown
+#mucked  whether they were mucked at showdown
+#dealt   whether they were seen in a 'dealt to' line
+#"""
+##
+##    For stud games we just need to do the routine setting of shown/mucked/etc
+##    and then update the cards 'THIRD' and 'SEVENTH'
+#        logging.debug("addHoleCards %s %s" % (cards, player))
+#        try:
+#            self.checkPlayerExists(player)
+#        except FpdbParseError, e:
+#            print "[ERROR] Tried to add holecards for unknown player: %s" % (player,)
+#            return
 #
-#    For stud games we just need to do the routine setting of shown/mucked/etc
-#    and then update the cards 'THIRD' and 'SEVENTH'
-        logging.debug("addHoleCards %s %s" % (cards, player))
-        try:
-            self.checkPlayerExists(player)
-        except FpdbParseError, e:
-            print "[ERROR] Tried to add holecards for unknown player: %s" % (player,)
-            return
-
-        if dealt:
-            self.dealt.add(player)
-        if shown:
-            self.shown.add(player)
-        if mucked:
-            self.mucked.add(player)
-        if player == self.hero:
-            if len(cards) > 2:
-                self.holecards['THIRD'][player] = ([cards[0:3]], [])
-            if len(cards) > 6:
-                self.holecards['SEVENTH'][player] = ([cards[6]], [])
-        else:
-            if len(cards) > 2:
-                self.holecards['THIRD'][player] = ([cards[0]], cards[1:3])
-            if len(cards) > 6:
-                self.holecards['SEVENTH'][player] = ([], [cards[6]])
-
+#        if dealt:
+#            self.dealt.add(player)
+#        if shown:
+#            self.shown.add(player)
+#        if mucked:
+#            self.mucked.add(player)
+#        if player == self.hero:
+#            if len(cards) > 2:
+#                self.holecards['THIRD'][player] = ([cards[0:3]], [])
+#            if len(cards) > 6:
+#                self.holecards['SEVENTH'][player] = ([cards[6]], [])
+#        else:
+#            if len(cards) > 2:
+#                self.holecards['THIRD'][player] = ([cards[0]], cards[1:3])
+#            if len(cards) > 6:
+#                self.holecards['SEVENTH'][player] = ([], [cards[6]])
     # TODO: def addComplete(self, player, amount):
     def addComplete(self, street, player, amountTo):
         # assert street=='THIRD'
diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
index 1be2f767..a4b5d6f8 100755
--- a/pyfpdb/PokerStarsToFpdb.py
+++ b/pyfpdb/PokerStarsToFpdb.py
@@ -18,18 +18,19 @@
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ########################################################################
 
+# TODO: play money currency showing up as T$
+# TODO: straighten out discards for draw games
 import sys
 from HandHistoryConverter import *
 
 # PokerStars HH Format
 
-# TODO: fix finding hero in stud games
-# TODO: fix open/closed hole cards for stud games 
-
 class PokerStars(HandHistoryConverter):
 
+############################################################
+#    Class Variables
+
     # Static regexes
-#    re_GameInfo     = re.compile("PokerStars Game #(?P<HID>[0-9]+):\s+(?P<MIXED>HORSE|8\-Game|HOSE)? \(?(?P<GAME>Hold\'em|Razz|7 Card Stud|7 Card Stud Hi/Lo|Omaha|Omaha Hi/Lo|Badugi) (?P<LIMIT>No Limit|Limit|Pot Limit),? \(?(?P<CURRENCY>\$|)?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+)\) - (?P<DATETIME>.*$)", re.MULTILINE)
     re_GameInfo     = re.compile("""PokerStars\sGame\s\#(?P<HID>[0-9]+):\s+
                                   (Tournament\s\#(?P<TOURNO>\d+),\s(?P<BUYIN>[\$\+\d\.]+)\s)?
                                   (?P<MIXED>HORSE|8\-Game|HOSE)?\s?\(?
@@ -71,6 +72,9 @@ follow :  whether to tail -f the input"""
         players = set([player[1] for player in hand.players])
         if not players <= self.compiledPlayers: # x <= y means 'x is subset of y'
             # we need to recompile the player regexs.
+# TODO: should probably rename re_HeroCards and corresponding method,
+#    since they are used to find all cards on lines starting with "Dealt to:"
+#    They still identify the hero.
             self.compiledPlayers = players
             player_re = "(?P<PNAME>" + "|".join(map(re.escape, players)) + ")"
             logging.debug("player_re: " + player_re)
@@ -80,14 +84,12 @@ follow :  whether to tail -f the input"""
             self.re_BringIn          = re.compile(r"^%s: brings[- ]in( low|) for \$?(?P<BRINGIN>[.0-9]+)" % player_re, re.MULTILINE)
             self.re_PostBoth         = re.compile(r"^%s: posts small \& big blinds \[\$? (?P<SBBB>[.0-9]+)" %  player_re, re.MULTILINE)
             self.re_HeroCards        = re.compile(r"^Dealt to %s(?: \[(?P<OLDCARDS>.+?)\])?( \[(?P<NEWCARDS>.+?)\])" % player_re, re.MULTILINE)
-#            self.re_DealToCards      = re.compile(r"^Dealt to %s(?: \[(?P<OLDCARDS>.+?)\])?( \[(?P<NEWCARDS>.+?)\])" % player_re, re.MULTILINE)
-#            self.re_Action           = re.compile(r"^%s:(?P<ATYPE> bets| checks| raises| calls| folds| discards| stands pat)( \$?(?P<BET>[.\d]+))?( to \$?(?P<BETTO>[.\d]+))?( (?P<NODISCARDED>\d) cards?( \[(?P<DISCARDED>.+?)\])?)?" %  player_re, re.MULTILINE)
             self.re_Action           = re.compile(r"""^%s:(?P<ATYPE>\sbets|\schecks|\sraises|\scalls|\sfolds|\sdiscards|\sstands\spat)
                                                         (\s\$?(?P<BET>[.\d]+))?(\sto\s\$?(?P<BETTO>[.\d]+))?  # the number discarded goes in <BET>
                                                         (\scards?(\s\[(?P<DISCARDED>.+?)\])?)?"""
                                                          %  player_re, 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]+): %s (\(button\) |\(small blind\) |\(big blind\) )?(collected|showed \[.*\] and won) \(\$(?P<POT>[.\d]+)\)(, mucked| with.*|)" %  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("^%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)
 
@@ -280,83 +282,96 @@ follow :  whether to tail -f the input"""
 #            hand.addHoleCards(cards, m.group('PNAME'), shown=False, mucked=False, dealt=True)
 
     def readHeroCards(self, hand):
-#    streets PREFLOP, PREDRAW, and THIRD are special cases
-        for street in ('PREFLOP', 'PREDRAW'):
+#    streets PREFLOP, PREDRAW, and THIRD are special cases beacause
+#    we need to grab hero's cards
+        for street in ('PREFLOP', 'DEAL'):
             if street in hand.streets.keys():
-                print "text =", hand.streets[street]
-                m = self.re_HeroCards.search(hand.streets[street])
-                if m == None:
-                    hand.involved = False
-                else:
-                    hand.hero = m.group('PNAME')
-                    newcards = m.group('NEWCARDS').split(' ')
+                m = self.re_HeroCards.finditer(hand.streets[street])
+                for found in m:
+#                    if m == None:
+#                        hand.involved = False
+#                    else:
+                    hand.hero = found.group('PNAME')
+                    newcards = found.group('NEWCARDS').split(' ')
                     hand.addHoleCards(street, hand.hero, closed=newcards, shown=False, mucked=False, dealt=True)
 
-#    def readHeroCards(self, hand):
-#        for street, text in hand.streets.iteritems():
-#            m = self.re_HeroCards.search(hand.handText)
-#            if(m == None):
-#                #Not involved in hand
-#                hand.involved = False
-#            else:
-                
-
-
-    def readDrawCards(self, hand, street):
-        logging.debug("readDrawCards")
-        m = self.re_HeroCards.finditer(hand.streets[street])
-        if m == None:
-            hand.involved = False
-        else:
-            for player in m:
-                hand.hero = player.group('PNAME') # Only really need to do this once
-                newcards = player.group('NEWCARDS')
-                oldcards = player.group('OLDCARDS')
-                if newcards == None:
-                    newcards = set()
+        for street, text in hand.streets.iteritems():
+            if street in ('PREFLOP', 'DEAL'): continue  # already done these
+            m = self.re_HeroCards.finditer(hand.streets[street])
+            for found in m:
+                player = found.group('PNAME')
+                if found.group('NEWCARDS') == None:
+                    newcards = []
                 else:
-                    newcards = set(newcards.split(' '))
-                if oldcards == None:
-                    oldcards = set()
+                    newcards = found.group('NEWCARDS').split(' ')
+                if found.group('OLDCARDS') == None:
+                    oldcards = []
                 else:
-                    oldcards = set(oldcards.split(' '))
-                hand.addDrawHoleCards(newcards, oldcards, player.group('PNAME'), street)
+                    oldcards = found.group('OLDCARDS').split(' ')
+
+                if street == 'THIRD' and len(newcards) == 3: # hero in stud game
+                    hand.hero = player
+                    hand.dealt.add(player) # need this for stud??
+                    hand.addHoleCards(street, player, closed=newcards[0:2], open=[newcards[2]], shown=False, mucked=False, dealt=False)
+                else:
+                    hand.addHoleCards(street, player, open=newcards, closed=oldcards, shown=False, mucked=False, dealt=False)
+
+            
+#    def readDrawCards(self, hand, street):
+#        logging.debug("readDrawCards")
+#        m = self.re_HeroCards.finditer(hand.streets[street])
+#        if m == None:
+#            hand.involved = False
+#        else:
+#            for player in m:
+#                hand.hero = player.group('PNAME') # Only really need to do this once
+#                newcards = player.group('NEWCARDS')
+#                oldcards = player.group('OLDCARDS')
+#                if newcards == None:
+#                    newcards = set()
+#                else:
+#                    newcards = set(newcards.split(' '))
+#                if oldcards == None:
+#                    oldcards = set()
+#                else:
+#                    oldcards = set(oldcards.split(' '))
+#                hand.addDrawHoleCards(newcards, oldcards, player.group('PNAME'), street)
 
 
-    def readStudPlayerCards(self, hand, street):
-        # See comments of reference implementation in FullTiltToFpdb.py
-        logging.debug("readStudPlayerCards")
-        m = self.re_HeroCards.finditer(hand.streets[street])
-        for player in m:
-            #~ logging.debug(player.groupdict())
-            (pname,  oldcards,  newcards) = (player.group('PNAME'), player.group('OLDCARDS'), player.group('NEWCARDS'))
-            if oldcards:
-                oldcards = [c.strip() for c in oldcards.split(' ')]
-            if newcards:
-                newcards = [c.strip() for c in newcards.split(' ')]
-            if street=='ANTES':
-                return
-            elif street=='THIRD':
-                # we'll have observed hero holecards in CARDS and thirdstreet open cards in 'NEWCARDS'
-                # hero: [xx][o]
-                # others: [o]
-                hand.addPlayerCards(player = player.group('PNAME'), street = street,  closed = oldcards,  open = newcards)
-            elif street in ('FOURTH',  'FIFTH',  'SIXTH'):
-                # 4th:
-                # hero: [xxo] [o]
-                # others: [o] [o]
-                # 5th:
-                # hero: [xxoo] [o]
-                # others: [oo] [o]
-                # 6th:
-                # hero: [xxooo] [o]
-                # others:  [ooo] [o]
-                hand.addPlayerCards(player = player.group('PNAME'), street = street, open = newcards)
-                # we may additionally want to check the earlier streets tally with what we have but lets trust it for now.
-            elif street=='SEVENTH' and newcards:
-                # hero: [xxoooo] [x]
-                # others: not reported.
-                hand.addPlayerCards(player = player.group('PNAME'), street = street, closed = newcards)
+#    def readStudPlayerCards(self, hand, street):
+#        # See comments of reference implementation in FullTiltToFpdb.py
+#        logging.debug("readStudPlayerCards")
+#        m = self.re_HeroCards.finditer(hand.streets[street])
+#        for player in m:
+#            #~ logging.debug(player.groupdict())
+#            (pname,  oldcards,  newcards) = (player.group('PNAME'), player.group('OLDCARDS'), player.group('NEWCARDS'))
+#            if oldcards:
+#                oldcards = [c.strip() for c in oldcards.split(' ')]
+#            if newcards:
+#                newcards = [c.strip() for c in newcards.split(' ')]
+#            if street=='ANTES':
+#                return
+#            elif street=='THIRD':
+#                # we'll have observed hero holecards in CARDS and thirdstreet open cards in 'NEWCARDS'
+#                # hero: [xx][o]
+#                # others: [o]
+#                hand.addPlayerCards(player = player.group('PNAME'), street = street,  closed = oldcards,  open = newcards)
+#            elif street in ('FOURTH',  'FIFTH',  'SIXTH'):
+#                # 4th:
+#                # hero: [xxo] [o]
+#                # others: [o] [o]
+#                # 5th:
+#                # hero: [xxoo] [o]
+#                # others: [oo] [o]
+#                # 6th:
+#                # hero: [xxooo] [o]
+#                # others:  [ooo] [o]
+#                hand.addPlayerCards(player = player.group('PNAME'), street = street, open = newcards)
+#                # we may additionally want to check the earlier streets tally with what we have but lets trust it for now.
+#            elif street=='SEVENTH' and newcards:
+#                # hero: [xxoooo] [x]
+#                # others: not reported.
+#                hand.addPlayerCards(player = player.group('PNAME'), street = street, closed = newcards)
 
     def readAction(self, hand, street):
         m = self.re_Action.finditer(hand.streets[street])

From d79ea0e6e5c2f67f49be7d4830ce58a5b9d7596f Mon Sep 17 00:00:00 2001
From: Ray <ray.barker@hughes.net>
Date: Mon, 13 Jul 2009 16:21:20 -0400
Subject: [PATCH 7/8] Fixes for Mixed and Play Money games.

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

diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
index a4b5d6f8..b6fd09fb 100755
--- a/pyfpdb/PokerStarsToFpdb.py
+++ b/pyfpdb/PokerStarsToFpdb.py
@@ -18,7 +18,6 @@
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ########################################################################
 
-# TODO: play money currency showing up as T$
 # TODO: straighten out discards for draw games
 import sys
 from HandHistoryConverter import *
@@ -53,7 +52,9 @@ class PokerStars(HandHistoryConverter):
     re_PlayerInfo   = re.compile('^Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\$?(?P<CASH>[.0-9]+) in chips\)', re.MULTILINE)
     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]+)')    
-    
+
+    mixes = { 'HORSE': 'horse', '8-Game': '8game', 'HOSE': 'hose'}
+
     def __init__(self, in_path = '-', out_path = '-', follow = False, autostart=True):
         """\
 in_path   (default '-' = sys.stdin)
@@ -122,7 +123,6 @@ follow :  whether to tail -f the input"""
         mg = m.groupdict()
         # translations from captured groups to fpdb info strings
         limits = { 'No Limit':'nl', 'Pot Limit':'pl', 'Limit':'fl' }
-        mixes = { 'HORSE': 'horse', '8-Game': '8game', 'HOSE': 'hose'}
         games = {                          # base, category
                               "Hold'em" : ('hold','holdem'), 
                                 'Omaha' : ('hold','omahahi'),
@@ -190,7 +190,8 @@ follow :  whether to tail -f the input"""
                 hand.maxseats = int(info[key])
 
             if key == 'MIXED':
-                hand.mixed = info[key]
+                if info[key] == None: hand.mixed = None
+                else:   hand.mixed = self.mixes[info[key]]
 
             if key == 'TOURNO':
                 hand.tourNo = info[key]
@@ -199,7 +200,8 @@ follow :  whether to tail -f the input"""
             if key == 'LEVEL':
                 hand.level = info[key]
             if key == 'PLAY' and info['PLAY'] != None:
-                hand.currency = 'play' # overrides previously set value
+#                hand.currency = 'play' # overrides previously set value
+                hand.gametype['currency'] = 'play'
 
     def readButton(self, hand):
         m = self.re_Button.search(hand.handText)

From 31dd10b5e62cce808a635f0613826c843c756e74 Mon Sep 17 00:00:00 2001
From: Ray <ray.barker@hughes.net>
Date: Mon, 13 Jul 2009 16:22:23 -0400
Subject: [PATCH 8/8] Make writehand() to work for tournament/mixed/play$
 games.

Also refactored the writing of the first 2 lines in writehand().
---
 pyfpdb/Hand.py | 58 +++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 50 insertions(+), 8 deletions(-)

diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index a2570f42..1846b240 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -33,8 +33,15 @@ import DerivedStats
 import Card
 
 class Hand:
+
+###############################################################3
+#    Class Variables
     UPS = {'a':'A', 't':'T', 'j':'J', 'q':'Q', 'k':'K', 'S':'s', 'C':'c', 'H':'h', 'D':'d'}
     LCS = {'H':'h', 'D':'d', 'C':'c', 'S':'s'}
+    SYMBOL = {'USD': '$', 'EUR': u'E', 'T$': '', 'play': ''}
+    MS = {'horse' : 'HORSE', '8game' : '8-Game', 'hose'  : 'HOSE'}
+
+
     def __init__(self, sitename, gametype, handText, builtFrom = "HHC"):
         self.sitename = sitename
         self.stats = DerivedStats.DerivedStats(self)
@@ -50,6 +57,7 @@ class Hand:
         self.tourNo = None
         self.buyin = None
         self.level = None
+        self.mixed = None
         self.seating = []
         self.players = []
         self.posted = []
@@ -103,6 +111,7 @@ class Hand:
                  ("TOURNAMENT NO", self.tourNo),
                  ("BUYIN", self.buyin),
                  ("LEVEL", self.level),
+                 ("MIXED", self.mixed),
                  ("LASTBET", self.lastBet),
                  ("ACTION STREETS", self.actionStreets),
                  ("STREETS", self.streets),   
@@ -479,7 +488,7 @@ Card ranks will be uppercased
 Map the tuple self.gametype onto the pokerstars string describing it
 """
         # currently it appears to be something like ["ring", "hold", "nl", sb, bb]:
-        gs = {"holdem"       : "Hold'em",
+        gs = {"holdem"     : "Hold'em",
               "omahahi"    : "Omaha",
               "omahahilo"  : "Omaha Hi/Lo",
               "razz"       : "Razz",
@@ -499,7 +508,6 @@ Map the tuple self.gametype onto the pokerstars string describing it
 
         logging.debug("gametype: %s" %(self.gametype))
         retstring = "%s %s" %(gs[self.gametype['category']], ls[self.gametype['limitType']])
-            
         return retstring
 
 
@@ -536,6 +544,33 @@ Map the tuple self.gametype onto the pokerstars string describing it
         elif act[1] == 'stands pat':
             return ("%s: stands pat" %(act[0]))
 
+    def getStakesAsString(self):
+        retstring = "%s%s/%s%s" % (self.SYMBOL[self.gametype['currency']], self.sb, self.SYMBOL[self.gametype['currency']], self.bb)
+        return retstring
+
+    def writeGameLine(self):
+#        print >>fh, ("%s Game #%s:  %s ($%s/$%s) - %s" %("PokerStars", self.handid, self.getGameTypeAsString(), self.sb, self.bb, datetime.datetime.strftime(self.starttime,'%Y/%m/%d - %H:%M:%S ET')))
+        game_string = "PokerStars Game #%s: " % self.handid
+        if self.tourNo != None:
+            game_string = game_string + "Tournament #%s, %s %s - Level %s (%s) - " % (self.tourNo, 
+                            self.buyin, self.getGameTypeAsString(), self.level, self.getStakesAsString())
+        elif self.mixed != None:
+            game_string = game_string + " %s (%s, %s) - " % (self.MS[self.mixed], 
+                            self.getGameTypeAsString(), self.getStakesAsString())
+        else:
+            game_string = game_string + " %s (%s) - " % (self.getGameTypeAsString(), self.getStakesAsString())
+        game_string = game_string + datetime.datetime.strftime(self.starttime,'%Y/%m/%d %H:%M:%S ET')
+        return game_string
+
+
+    def writeTableLine(self):
+        table_string = "Table \'%s\' %s-max" % (self.tablename, self.maxseats)
+        if self.gametype['currency'] == 'play':
+            table_string = table_string + " (Play Money)"
+        if self.buttonpos != None:
+            table_string = table_string + " Seat #%s is the button" % self.buttonpos
+        return table_string
+
 
 class HoldemOmahaHand(Hand):
     def __init__(self, hhc, sitename, gametype, handText, builtFrom = "HHC", handid=None):
@@ -688,8 +723,11 @@ class HoldemOmahaHand(Hand):
         
     def writeHand(self, fh=sys.__stdout__):
         # PokerStars format.
-        print >>fh, ("%s Game #%s:  %s ($%s/$%s) - %s" %("PokerStars", self.handid, self.getGameTypeAsString(), self.sb, self.bb, datetime.datetime.strftime(self.starttime,'%Y/%m/%d - %H:%M:%S ET')))
-        print >>fh, ("Table '%s' %d-max Seat #%s is the button" %(self.tablename, self.maxseats, self.buttonpos))
+#        print >>fh, ("%s Game #%s:  %s ($%s/$%s) - %s" %("PokerStars", self.handid, self.getGameTypeAsString(), self.sb, self.bb, datetime.datetime.strftime(self.starttime,'%Y/%m/%d - %H:%M:%S ET')))
+        print >>fh, self.writeGameLine() 
+        print >>fh, self.writeTableLine() 
+
+#        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']]+[x[0] for x in self.actions['BLINDSANTES']]))
         logging.debug(self.actions['PREFLOP'])
@@ -934,8 +972,10 @@ class DrawHand(Hand):
 
     def writeHand(self, fh=sys.__stdout__):
         # PokerStars format.
-        print >>fh, _("%s Game #%s:  %s ($%s/$%s) - %s" %("PokerStars", self.handid, self.getGameTypeAsString(), self.sb, self.bb, time.strftime('%Y/%m/%d %H:%M:%S ET', self.starttime)))
-        print >>fh, _("Table '%s' %d-max Seat #%s is the button" %(self.tablename, self.maxseats, self.buttonpos))
+#        print >>fh, _("%s Game #%s:  %s ($%s/$%s) - %s" %("PokerStars", self.handid, self.getGameTypeAsString(), self.sb, self.bb, time.strftime('%Y/%m/%d %H:%M:%S ET', self.starttime)))
+        print >>fh, self.writeGameLine() 
+#        print >>fh, _("Table '%s' %d-max Seat #%s is the button" %(self.tablename, self.maxseats, self.buttonpos))
+        print >>fh, self.writeTableLine()
 
         players_who_act_ondeal = set(([x[0] for x in self.actions['DEAL']]+[x[0] for x in self.actions['BLINDSANTES']]))
 
@@ -1154,8 +1194,10 @@ Add a complete on [street] by [player] to [amountTo]
 #    Hole cards are not currently correctly written. Currently the down cards for non-heros
 #    are shown in the "dealt to" lines. They should be hidden in those lines. I tried to fix
 #    but mind got boggled, will try again.
-        print >>fh, _("%s Game #%s:  %s ($%s/$%s) - %s" %("PokerStars", self.handid, self.getGameTypeAsString(), self.sb, self.bb, datetime.datetime.strftime(self.starttime,'%Y/%m/%d - %H:%M:%S ET')))
-        print >>fh, _("Table '%s' %d-max Seat #%s is the button" %(self.tablename, self.maxseats, self.buttonpos))
+#        print >>fh, _("%s Game #%s:  %s ($%s/$%s) - %s" %("PokerStars", self.handid, self.getGameTypeAsString(), self.sb, self.bb, datetime.datetime.strftime(self.starttime,'%Y/%m/%d - %H:%M:%S ET')))
+        print >>fh, self.writeGameLine() 
+        print >>fh, self.writeTableLine() 
+#        print >>fh, _("Table '%s' %d-max Seat #%s is the button" %(self.tablename, self.maxseats, self.buttonpos))
         
         players_who_post_antes = set([x[0] for x in self.actions['ANTES']])