Merge branch 'master' of git://git.assembla.com/fpdboz

This commit is contained in:
Eratosthenes 2010-11-10 18:11:20 -05:00
commit 2dcc39cdfc

View File

@ -72,7 +72,7 @@ class Absolute(HandHistoryConverter):
re_RingInfoFromFilename = re.compile(ur".*IHH([0-9]+) (?P<TABLE>.*) -") re_RingInfoFromFilename = re.compile(ur".*IHH([0-9]+) (?P<TABLE>.*) -")
re_TrnyInfoFromFilename = re.compile( re_TrnyInfoFromFilename = re.compile(
ur"IHH\s?([0-9]+) (?P<TRNY_NAME>.*) "\ ur"IHH\s?([0-9]+) (?P<TRNY_NAME>.*) "\
ur"ID (?P<TRNY_ID>\d+)\s?\((?P<TABLE>\d+)\) .* "\ ur"ID (?P<TRNY_ID>\d+)\s?(\((?P<TABLE>\d+)\))? .* "\
ur"(?:\$|\s€|)(?P<BUYIN>[0-9.]+)\s*\+\s*(?:\$|\s€|)(?P<FEE>[0-9.]+)" ur"(?:\$|\s€|)(?P<BUYIN>[0-9.]+)\s*\+\s*(?:\$|\s€|)(?P<FEE>[0-9.]+)"
) )
@ -194,6 +194,8 @@ class Absolute(HandHistoryConverter):
else self.re_RingInfoFromFilename else self.re_RingInfoFromFilename
fname_info = fname_re.search(self.in_path) fname_info = fname_re.search(self.in_path)
#print "DEBUG: fname_info.groupdict(): %s" %(fname_info.groupdict())
if m is None or fname_info is None: if m is None or fname_info is None:
if m is None: if m is None:
tmp = hand.handText[0:100] tmp = hand.handText[0:100]