diff --git a/pyfpdb/AbsoluteToFpdb.py b/pyfpdb/AbsoluteToFpdb.py index b8eaac01..e0ceed48 100755 --- a/pyfpdb/AbsoluteToFpdb.py +++ b/pyfpdb/AbsoluteToFpdb.py @@ -72,7 +72,7 @@ class Absolute(HandHistoryConverter): re_RingInfoFromFilename = re.compile(ur".*IHH([0-9]+) (?P.*) -") re_TrnyInfoFromFilename = re.compile( ur"IHH\s?([0-9]+) (?P.*) "\ - ur"ID (?P\d+)\s?\((?P
\d+)\) .* "\ + ur"ID (?P\d+)\s?(\((?P
\d+)\))? .* "\ ur"(?:\$|\s€|)(?P[0-9.]+)\s*\+\s*(?:\$|\s€|)(?P[0-9.]+)" ) @@ -194,6 +194,8 @@ class Absolute(HandHistoryConverter): else self.re_RingInfoFromFilename 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: tmp = hand.handText[0:100]