From c2e553751e0db87b053fb26726c0b4e37d0af8fe Mon Sep 17 00:00:00 2001 From: Worros Date: Wed, 5 Jan 2011 14:26:49 +0800 Subject: [PATCH] FTPSummary: Fix 'Daily Dollar' summary file Also comment out some noisy debug --- pyfpdb/FullTiltPokerSummary.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pyfpdb/FullTiltPokerSummary.py b/pyfpdb/FullTiltPokerSummary.py index d3bcf191..7c65a82f 100644 --- a/pyfpdb/FullTiltPokerSummary.py +++ b/pyfpdb/FullTiltPokerSummary.py @@ -57,7 +57,7 @@ class FullTiltPokerSummary(TourneySummary): re_TourneyInfo = re.compile(u""" \s.* - (?PTournament|Sit\s\&\sGo|\(Rebuy\))\s\((?P[0-9]+)\)(\s+)? + (?PTournament|Sit\s\&\sGo|\(Rebuy\)|)\s\((?P[0-9]+)\)(\s+)? (?PHold\'em|Razz|RAZZ|7\sCard\sStud|7\sCard\sStud\sHi/Lo|Omaha|Omaha\sHi|Omaha\sHi/Lo|Badugi|Triple\sDraw\s2\-7\sLowball|5\sCard\sDraw)\s+ (?PNo\sLimit|Limit|LIMIT|Pot\sLimit)\s+ (Buy-In:\s\$(?P[.\d]+)(\s\+\s\$(?P[.\d]+))?\s+)? @@ -86,14 +86,14 @@ class FullTiltPokerSummary(TourneySummary): codepage = ["utf-16", "cp1252", "utf-8"] def parseSummary(self): - m = self.re_TourneyInfo.search(self.summaryText) + m = self.re_TourneyInfo.search(self.summaryText[:2000]) if m == None: tmp = self.summaryText[0:200] log.error(_("parseSummary: Unable to recognise Tourney Info: '%s'") % tmp) log.error(_("parseSummary: Raising FpdbParseError")) raise FpdbParseError(_("Unable to recognise Tourney Info: '%s'") % tmp) - print "DEBUG: m.groupdict(): %s" % m.groupdict() + #print "DEBUG: m.groupdict(): %s" % m.groupdict() mg = m.groupdict() if 'TOURNO' in mg: self.tourNo = mg['TOURNO'] @@ -128,7 +128,7 @@ class FullTiltPokerSummary(TourneySummary): m = self.re_Player.finditer(self.summaryText) for a in m: mg = a.groupdict() - print "DEBUG: a.groupdict(): %s" % mg + #print "DEBUG: a.groupdict(): %s" % mg name = mg['NAME'] rank = mg['RANK'] winnings = 0