Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* src/ReadGedcom.py (parse_family_object): Support _WITN and _GODP; Ignore _LOC extended locations

Browse Source 
svn: r4399
This commit is contained in:
Martin Hawlisch 2005-04-21 14:20:26 +00:00
parent 970f851d4d
commit f4dd79c642
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gramps2/ChangeLog
View File

@ -2,6 +2,7 @@
* src/ReadGedcom.py (parse_family_object): Set MediaRef properly; * src/ReadGedcom.py (parse_family_object): Set MediaRef properly;
(parse_individual): Set Adoption event properly; (parse_individual): Set Adoption event properly;
(importData): Dont crash because of a short line; (importData): Dont crash because of a short line;
Support _WITN and _GODP; Ignore _LOC extended locations
* src/Marriage.py (__init__): Properly get place title * src/Marriage.py (__init__): Properly get place title
2005-04-20 Don Allingham <don@gramps-project.org> 2005-04-20 Don Allingham <don@gramps-project.org>

12
gramps2/src/ReadGedcom.py
View File

@ -653,6 +653,10 @@ class GedcomParser:
# noteobj.append(text + self.parse_continue_data(1)) # noteobj.append(text + self.parse_continue_data(1))
noteobj.append(text + self.parse_note_continue(1)) noteobj.append(text + self.parse_note_continue(1))
self.parse_note_data(1) self.parse_note_data(1)
elif matches[2] == "_LOC":
# TODO: Add support for extended Locations.
# See: http://en.wiki.genealogy.net/index.php/Gedcom_5.5EL
self.ignore_sub_junk(1)
elif matches[0] < 1 or matches[1] == "TRLR": elif matches[0] < 1 or matches[1] == "TRLR":
self.backup() self.backup()
return return
@ -1281,6 +1285,8 @@ class GedcomParser:
address.set_postal_code(matches[2]) address.set_postal_code(matches[2])
elif matches[1] == "CTRY": elif matches[1] == "CTRY":
address.set_country(matches[2]) address.set_country(matches[2])
elif matches[1] == "_LOC":
pass # ignore unsupported extended location syntax
else: else:
self.barf(level+1) self.barf(level+1)
@ -1374,6 +1380,9 @@ class GedcomParser:
event.set_description("%s%s" % (d, matches[2])) event.set_description("%s%s" % (d, matches[2]))
elif matches[1] == "CONT": elif matches[1] == "CONT":
event.set_description("%s\n%s" % (event.get_description(),matches[2])) event.set_description("%s\n%s" % (event.get_description(),matches[2]))
elif matches[1] in ["_GODP", "_WITN"]:
witness = RelLib.Witness(RelLib.Event.NAME,matches[2])
event.add_witness(witness)
elif matches[1] in ["RELI", "TIME","ADDR","AGE","AGNC","STAT","TEMP","OBJE","_DATE2"]: elif matches[1] in ["RELI", "TIME","ADDR","AGE","AGNC","STAT","TEMP","OBJE","_DATE2"]:
self.ignore_sub_junk(level+1) self.ignore_sub_junk(level+1)
else: else:
@ -1538,6 +1547,9 @@ class GedcomParser:
note = note + "\n" + matches[2] note = note + "\n" + matches[2]
elif matches[1] == "NOTE": elif matches[1] == "NOTE":
note = self.parse_note(matches,event,level+1,note) note = self.parse_note(matches,event,level+1,note)
elif matches[1] == "_WITN":
witness = RelLib.Witness(RelLib.Event.NAME,matches[2])
event.add_witness(witness)
else: else:
self.barf(level+1) self.barf(level+1)