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

* src/GrampsDb/_ReadGedcom.py: fix event handling, fix skip_record

Browse Source 
svn: r5821
This commit is contained in:
Don Allingham
2006-01-23 01:55:29 +00:00
parent 9e83727f09
commit b204a3bc70
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -2,7 +2,7 @@
* src/Makefile.am: remove PeopleView.py * src/Makefile.am: remove PeopleView.py
* src/PeopleView.py: removed, replaced by PersonView * src/PeopleView.py: removed, replaced by PersonView
* src/PersonView.py: set ellipsize property * src/PersonView.py: set ellipsize property
* src/GrampsDb/_ReadGedcom.py: fix event handling * src/GrampsDb/_ReadGedcom.py: fix event handling, fix skip_record
2006-01-21 Don Allingham <don@gramps-project.org> 2006-01-21 Don Allingham <don@gramps-project.org>
* src/PeopleModel.py: fix sorting of subnames * src/PeopleModel.py: fix sorting of subnames

14
src/GrampsDb/_ReadGedcom.py
View File

@@ -1517,9 +1517,9 @@ class GedcomParser:
etype = event.get_type() etype = event.get_type()
if etype[0] == RelLib.Event.CUSTOM: if etype[0] == RelLib.Event.CUSTOM:
try: try:
event.set_name((ged2fam[matches[2]],'')) event.set_type((ged2fam[matches[2]],''))
except: except:
event.set_name((RelLib.Event.CUSTOM,matches[2])) event.set_type((RelLib.Event.CUSTOM,matches[2]))
else: else:
note = 'Status = %s\n' % matches[2] note = 'Status = %s\n' % matches[2]
elif matches[1] == TOKEN_DATE: elif matches[1] == TOKEN_DATE:
@@ -2127,7 +2127,13 @@ class GedcomParser:
def func_person_attr(self,matches,state): def func_person_attr(self,matches,state):
attr = RelLib.Attribute() attr = RelLib.Attribute()
attr.set_type(matches[1]) n = matches[3]
atype = self.gedattr.get(n,RelLib.Attribute.CUSTOM)
if atype == RelLib.Attribute.CUSTOM:
attr.set_type((atype,n))
else:
attr.set_type((atype,''))
attr.set_value(matches[2]) attr.set_value(matches[2])
state.person.add_attribute(attr) state.person.add_attribute(attr)
@@ -2245,7 +2251,7 @@ class GedcomParser:
sref = self.handle_source(matches,state.level+1) sref = self.handle_source(matches,state.level+1)
state.name.add_source_reference(sref) state.name.add_source_reference(sref)
def skip_record(self,matches): def skip_record(self,matches,state):
self.ignore_sub_junk(2) self.ignore_sub_junk(2)
#------------------------------------------------------------------------- #-------------------------------------------------------------------------