diff --git a/pyfpdb/PkrToFpdb.py b/pyfpdb/PkrToFpdb.py index 5d4a601f..c13dd284 100755 --- a/pyfpdb/PkrToFpdb.py +++ b/pyfpdb/PkrToFpdb.py @@ -116,7 +116,7 @@ class Pkr(HandHistoryConverter): (\s(%(CUR)s)?(?P[.\d]+))? """ % subst, re.MULTILINE|re.VERBOSE) self.re_ShowdownAction = re.compile(r"^%s: shows \[(?P.*)\]" % player_re, re.MULTILINE) - self.re_CollectPot = re.compile(r"Seat (?P[0-9]+): %(PLYR)s (\(button\) |\(small blind\) |\(big blind\) |\(button\) \(small blind\) )?(collected|showed \[.*\] and won) \(%(CUR)s(?P[.\d]+)\)(, mucked| with.*|)" % subst, re.MULTILINE) + self.re_CollectPot = re.compile(r"^%(PLYR)s wins %(CUR)s(?P[.\d]+)" % subst, re.MULTILINE) self.re_sitsOut = re.compile("^%s sits out" % player_re, re.MULTILINE) self.re_ShownCards = re.compile("^Seat (?P[0-9]+): %s (\(.*\) )?(?Pshowed|mucked) \[(?P.*)\].*" % player_re, re.MULTILINE) @@ -361,6 +361,7 @@ class Pkr(HandHistoryConverter): def readCollectPot(self,hand): for m in self.re_CollectPot.finditer(hand.handText): + #print "DEBUG: addCollectPot(%s, %s)" %(m.group('PNAME'), m.group('POT')) hand.addCollectPot(player=m.group('PNAME'),pot=m.group('POT')) def readShownCards(self,hand):