diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py index 6d409bda..263ea9d5 100755 --- a/pyfpdb/EverleafToFpdb.py +++ b/pyfpdb/EverleafToFpdb.py @@ -78,7 +78,7 @@ class Everleaf(HandHistoryConverter): self.rexx.setPostBbRegex('.*\n(?P.*): posts big blind \[\$? (?P[.0-9]+)') self.rexx.setPostBothRegex('.*\n(?P.*): posts small \& big blinds \[\$? (?P[.0-9]+)') self.rexx.setHeroCardsRegex('.*\nDealt\sto\s(?P.*)\s\[ (?P.*) \]') - self.rexx.setActionStepRegex('.*\n(?P.*)(?P: bets| checks| raises| calls| folds)(\s\[\$ (?P[.\d]+) (USD|EUR)\])?') + self.rexx.setActionStepRegex('.*\n(?P.*)(?P: bets| checks|: raises| calls| folds)(\s\[\$ (?P[.\d]+) (USD|EUR)\])?') self.rexx.setShowdownActionRegex('.*\n(?P.*) shows \[ (?P.*) \]') self.rexx.setCollectPotRegex('.*\n(?P.*) wins \$ (?P[.\d]+) (USD|EUR)(.*?\[ (?P.*?) \])?') #self.rexx.setCollectPotRegex('.*\n(?P.*) wins \$ (?P[.\d]+) USD(.*\[ (?P) \S\S, \S\S, \S\S, \S\S, \S\S \])?') diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py index 7cadbf3d..aede8974 100644 --- a/pyfpdb/Hand.py +++ b/pyfpdb/Hand.py @@ -158,6 +158,7 @@ Card ranks will be uppercased def checkPlayerExists(self,player): + print "XXXX player: ", player if player not in [p[1] for p in self.players]: raise FpdbParseError