From 46085cba5d7f7db18d77ff79bb435bd39a2ec12b Mon Sep 17 00:00:00 2001 From: Ray Date: Sat, 15 Aug 2009 13:30:31 -0400 Subject: [PATCH] Repair missing line in regex, comment out skipping tournaments. --- pyfpdb/FulltiltToFpdb.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py index 1fd251ca..e476dc30 100755 --- a/pyfpdb/FulltiltToFpdb.py +++ b/pyfpdb/FulltiltToFpdb.py @@ -33,7 +33,8 @@ class Fulltilt(HandHistoryConverter): siteId = 1 # Needs to match id entry in Sites database # Static regexes - re_GameInfo = re.compile('''(?:(?P.+)\s\((?P\d+)\),\s)? + re_GameInfo = re.compile('''.*\#(?P[0-9]+):\s + (?:(?P.+)\s\((?P\d+)\),\s)? .+ -\s(?P\$|)? (?P[.0-9]+)/ @@ -110,7 +111,7 @@ class Fulltilt(HandHistoryConverter): if not m: return None mg = m.groupdict() - + print mg # translations from captured groups to our info strings limits = { 'No Limit':'nl', 'Pot Limit':'pl', 'Limit':'fl' } games = { # base, category @@ -132,7 +133,7 @@ class Fulltilt(HandHistoryConverter): if mg['TOURNO'] == None: info['type'] = "ring" else: info['type'] = "tour" # NB: SB, BB must be interpreted as blinds or bets depending on limit type. - if info['type'] == "tour": return None # importer is screwed on tournies, pass on those hands so we don't interrupt other autoimporting +# if info['type'] == "tour": return None # importer is screwed on tournies, pass on those hands so we don't interrupt other autoimporting return info #Following function is a hack, we should be dealing with this in readFile (i think correct codepage....)