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

Update

Browse Source 
svn: r6362
This commit is contained in:
Alex Roitman 2006-04-19 04:30:55 +00:00
parent 54957e0a21
commit 76684bacf6
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/GrampsDb/_ReadXML.py
View File

@ -346,6 +346,7 @@ class GrampsParser:
self.event = None self.event = None
self.eventref = None self.eventref = None
self.childref = None self.childref = None
self.personref = None
self.name = None self.name = None
self.tempDefault = None self.tempDefault = None
self.home = None self.home = None
@ -977,8 +978,9 @@ class GrampsParser:
def start_name(self,attrs): def start_name(self,attrs):
if not self.in_witness: if not self.in_witness:
self.name = RelLib.Name() self.name = RelLib.Name()
self.name.type.set(_ConstXML.tuple_from_xml( self.name.type.set_from_xml_str(attrs.get('type'))
_ConstXML.name_types,attrs.get('type','Birth Name'))) ## (_ConstXML.tuple_from_xml(
## _ConstXML.name_types,attrs.get('type','Birth Name')))
self.name.sort_as = int(attrs.get("sort",RelLib.Name.DEF)) self.name.sort_as = int(attrs.get("sort",RelLib.Name.DEF))
self.name.display_as = int(attrs.get("display",RelLib.Name.DEF)) self.name.display_as = int(attrs.get("display",RelLib.Name.DEF))
self.name.conf = int(attrs.get("conf",2)) self.name.conf = int(attrs.get("conf",2))
@ -1417,19 +1419,20 @@ class GrampsParser:
else: else:
self.person.add_event_ref(ref) self.person.add_event_ref(ref)
if self.event.get_description() == "" and \ ## # FIXME: re-enable when event types are fixed.
self.event.get_type()[0] != RelLib.Event.CUSTOM: ## if self.event.get_description() == "" and \
if self.family: ## self.event.get_type()[0] != RelLib.Event.CUSTOM:
text = _event_family_str % { ## if self.family:
'event_name' : Utils.family_events[self.event.get_type()[0]], ## text = _event_family_str % {
'family' : Utils.family_name(self.family,self.db), ## 'event_name' : Utils.family_events[self.event.get_type()[0]],
} ## 'family' : Utils.family_name(self.family,self.db),
else: ## }
text = _event_person_str % { ## else:
'event_name' : Utils.personal_events[self.event.get_type()[0]], ## text = _event_person_str % {
'person' : NameDisplay.displayer.display(self.person), ## 'event_name' : Utils.personal_events[self.event.get_type()[0]],
} ## 'person' : NameDisplay.displayer.display(self.person),
self.event.set_description(text) ## }
## self.event.set_description(text)
self.db.commit_event(self.event,self.trans,self.change) self.db.commit_event(self.event,self.trans,self.change)
self.event = None self.event = None