From e6be901cf30bac42632b520df0bd6480048079d5 Mon Sep 17 00:00:00 2001 From: Worros Date: Mon, 24 Jan 2011 14:00:25 +0800 Subject: [PATCH] FTP: Fixes for Multi entry rush and FTP archive files - Minor fix for table name match - Make the word 'Table|Match' optional as it isn't in the archive file - Add optional section for 'Entry #id' --- pyfpdb/FulltiltToFpdb.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py index d4d59473..11323939 100755 --- a/pyfpdb/FulltiltToFpdb.py +++ b/pyfpdb/FulltiltToFpdb.py @@ -77,11 +77,12 @@ class Fulltilt(HandHistoryConverter): ''' % substitutions, re.VERBOSE) re_SplitHands = re.compile(r"\n\n\n+") re_TailSplitHands = re.compile(r"(\n\n+)") - re_HandInfo = re.compile(r'''.*\#(?P[0-9]+):\s + re_HandInfo = re.compile(u'''.*\#(?P[0-9]+):\s (?:(?P.+)\s\((?P\d+)\),\s)? - (Table|Match)\s + ((Table|Match)\s)? (?PPlay\sChip\s|PC)? - (?P[%(TAB)s]+)\s + (?P
[%(TAB)s]+\s?) + (?P,\sEntry\s\#\d+\s)? (\((?P.+)\)\s)?-\s [%(LS)s]?(?P[%(NUM)s]+)/[%(LS)s]?(?P[%(NUM)s]+)\s(Ante\s[%(LS)s]?(?P[.0-9]+)\s)?-\s [%(LS)s]?(?P[.0-9]+\sCap\s)? @@ -262,6 +263,8 @@ class Fulltilt(HandHistoryConverter): tmp = hand.handText[0:100] log.error(_("readHandInfo: Unable to recognise handinfo from: '%s'") % tmp) raise FpdbParseError(_("No match in readHandInfo.")) + + #print "DEBUG: m.groupdict: %s" % m.groupdict() hand.handid = m.group('HID') hand.tablename = m.group('TABLE')