Better date range parsing, and handling of adopted children on GEDCOM import

svn: r84
This commit is contained in:
Don Allingham
2001-06-03 23:18:07 +00:00
parent cac1f8d33e
commit 9ea0bf0423
2 changed files with 32 additions and 5 deletions

View File

@@ -41,12 +41,12 @@ class Date:
normal = 0
from_str = _("(from|between|bet)")
to_str = _("(and|to)")
to_str = _("(and|to|-)")
efmt = re.compile(r"\s*(from|between|bet)\s+(.+)\s+(and|to)\s+(.+)\s*$",
efmt = re.compile(r"\s*(from|between|bet)\.?\s+(.+)\s+(and|to)\s+(.+)\s*$",
re.IGNORECASE)
fmt = re.compile(r"\s*" + from_str + r"\s+(.+)\s+" + to_str + r"\s+(.+)\s*$",
fmt = re.compile(r"\s*" + from_str + r"\.?\s+(.+)\s+" + to_str + r"\s+(.+)\s*$",
re.IGNORECASE)
def __init__(self):