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

* doc/grampsxml.dtd: Events preceed people.

Browse Source 
* doc/grampsxml.rng: Events preceed people.
* src/GrampsDb/_WriteXML.py: Events preceed people.
* src/GrampsDb/_ReadXML.py: Parse old and new style events, old
witnesses, new eventrefs.


svn: r5853
This commit is contained in:
Alex Roitman 2006-01-29 05:12:01 +00:00
parent 2c47024571
commit 1fa6267ca1
5 changed files with 213 additions and 221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,5 +1,10 @@
2006-01-28 Alex Roitman <shura@gramps-project.org> 2006-01-28 Alex Roitman <shura@gramps-project.org>
* src/GnomeMime.py: Import neede modules. * src/GnomeMime.py: Import neede modules.
* doc/grampsxml.dtd: Events preceed people.
* doc/grampsxml.rng: Events preceed people.
* src/GrampsDb/_WriteXML.py: Events preceed people.
* src/GrampsDb/_ReadXML.py: Parse old and new style events, old
witnesses, new eventrefs.
2006-01-28 Don Allingham <don@gramps-project.org> 2006-01-28 Don Allingham <don@gramps-project.org>
* src/DisplayTabs.py: add SourceRefModel, NameEmbedList, * src/DisplayTabs.py: add SourceRefModel, NameEmbedList,

2
doc/grampsxml.dtd
View File

@ -50,7 +50,7 @@ DATABASE
bookmarks bookmarks
--> -->
<!ELEMENT database (header, people?, families?, events?, sources?, <!ELEMENT database (header, events?, people?, families?, sources?,
places?, objects?, repositories?, bookmarks?)> places?, objects?, repositories?, bookmarks?)>
<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.1.0/"> <!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.1.0/">

12
doc/grampsxml.rng
View File

@ -46,6 +46,12 @@
</element></optional> </element></optional>
</element> </element>
<optional><element name="events">
<zeroOrMore><element name="event">
<ref name="event-content"/>
</element></zeroOrMore>
</element></optional>
<optional><element name="people"> <optional><element name="people">
<optional><attribute name="default"><text/></attribute></optional> <optional><attribute name="default"><text/></attribute></optional>
<optional><attribute name="home"> <optional><attribute name="home">
@ -62,12 +68,6 @@
</element></zeroOrMore> </element></zeroOrMore>
</element></optional> </element></optional>
<optional><element name="events">
<zeroOrMore><element name="event">
<ref name="event-content"/>
</element></zeroOrMore>
</element></optional>
<optional><element name="sources"> <optional><element name="sources">
<zeroOrMore><element name="source"> <zeroOrMore><element name="source">
<ref name="source-content"/> <ref name="source-content"/>

389
src/GrampsDb/_ReadXML.py
View File

@ -1,7 +1,7 @@
# #
# Gramps - a GTK+/GNOME based genealogy program # Gramps - a GTK+/GNOME based genealogy program
# #
# Copyright (C) 2000-2005 Donald N. Allingham # Copyright (C) 2000-2006 Donald N. Allingham
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -27,11 +27,17 @@
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import os import os
import sets import sets
import gtk
import shutil import shutil
from xml.parsers.expat import ExpatError, ParserCreate from xml.parsers.expat import ExpatError, ParserCreate
from gettext import gettext as _ from gettext import gettext as _
#-------------------------------------------------------------------------
#
# GTK+ Modules
#
#-------------------------------------------------------------------------
import gtk
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# Gramps Modules # Gramps Modules
@ -45,6 +51,7 @@ import const
import Utils import Utils
import DateHandler import DateHandler
import NameDisplay import NameDisplay
import _ConstXML
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -323,6 +330,7 @@ class GrampsParser:
self.callback = callback self.callback = callback
self.increment = 100 self.increment = 100
self.event = None self.event = None
self.eventref = None
self.name = None self.name = None
self.tempDefault = None self.tempDefault = None
self.home = None self.home = None
@ -361,9 +369,13 @@ class GrampsParser:
"cause" : (None, self.stop_cause), "cause" : (None, self.stop_cause),
"description": (None, self.stop_description), "description": (None, self.stop_description),
"event" : (self.start_event, self.stop_event), "event" : (self.start_event, self.stop_event),
"type" : (None, self.stop_type),
"witness" : (self.start_witness,self.stop_witness),
"eventref" : (self.start_eventref,self.stop_eventref),
"data_item" : (self.start_data_item, None), "data_item" : (self.start_data_item, None),
"families" : (None, self.stop_families), "families" : (None, self.stop_families),
"family" : (self.start_family, self.stop_family), "family" : (self.start_family, self.stop_family),
"rel" : (self.start_rel, None),
"father" : (self.start_father, None), "father" : (self.start_father, None),
"first" : (None, self.stop_first), "first" : (None, self.stop_first),
"gender" : (None, self.stop_gender), "gender" : (None, self.stop_gender),
@ -380,6 +392,7 @@ class GrampsParser:
"img" : (self.start_photo, self.stop_photo), "img" : (self.start_photo, self.stop_photo),
"objref" : (self.start_objref, self.stop_objref), "objref" : (self.start_objref, self.stop_objref),
"object" : (self.start_object, self.stop_object), "object" : (self.start_object, self.stop_object),
"file" : (self.start_file, self.stop_file),
"place" : (self.start_place, self.stop_place), "place" : (self.start_place, self.stop_place),
"dateval" : (self.start_dateval, None), "dateval" : (self.start_dateval, None),
"daterange" : (self.start_daterange, None), "daterange" : (self.start_daterange, None),
@ -683,20 +696,13 @@ class GrampsParser:
take up quite a bit of time""" take up quite a bit of time"""
loc = RelLib.Location() loc = RelLib.Location()
if attrs.has_key('phone'): loc.phone = attrs.get('phone','')
loc.phone = attrs['phone'] loc.postal = attrs.get('postal','')
if attrs.has_key('postal'): loc.city = attrs.get('city','')
loc.postal = attrs['postal'] loc.parish = attrs.get('parish','')
if attrs.has_key('city'): loc.state = attrs.bet('state','')
loc.city = attrs['city'] loc.county = attrs.get('county','')
if attrs.has_key('parish'): loc.country = attrs.get('country','')
loc.parish = attrs['parish']
if attrs.has_key('state'):
loc.state = attrs['state']
if attrs.has_key('county'):
loc.county =attrs['county']
if attrs.has_key('country'):
loc.country = attrs['country']
if self.locations > 0: if self.locations > 0:
self.placeobj.add_alternate_locations(loc) self.placeobj.add_alternate_locations(loc)
else: else:
@ -704,56 +710,78 @@ class GrampsParser:
self.locations = self.locations + 1 self.locations = self.locations + 1
def start_witness(self,attrs): def start_witness(self,attrs):
return # Parse witnesses created by older gramps
self.in_witness = 1 self.in_witness = 1
self.witness_comment = "" self.witness_comment = ""
print "in start_witness"
if attrs.has_key('name'):
note_text = self.event.get_note() + "\n" + \
_("Witness name: %s") % attrs['name']
self.event.set_note(note_text)
return
if attrs.has_key('hlink'): if attrs.has_key('hlink'):
self.witness = RelLib.Witness(RelLib.Event.ID, person = self.db.find_person_from_handle(
attrs['hlink'].replace('_','')) attrs['hlink'].replace('_',''),self.trans)
elif attrs.has_key('ref'): elif attrs.has_key('ref'):
person = self.find_person_by_gramps_id(self.map_gid(attrs["ref"])) person = self.find_person_by_gramps_id(self.map_gid(attrs["ref"]))
self.witness = RelLib.Witness(RelLib.Event.ID,person.get_handle()) # Add an EventRef from that person
elif attrs.has_key('name'): # to this event using ROLE_WITNESS role
self.witness = RelLib.Witness(RelLib.Event.NAME,attrs['name']) event_ref = RelLib.EventRef()
event_ref.ref = self.event.handle
event_ref.role = (RelLib.EventRef.WITNESS,'')
person.event_ref_list.append(event_ref)
self.db.commit_person(person,self.trans,self.change)
def start_coord(self,attrs): def start_coord(self,attrs):
if attrs.has_key('lat'): #if attrs.has_key('lat'):
self.placeobj.set_latitude(attrs['lat']) self.placeobj.lat = attrs.get('lat','')
if attrs.has_key('long'): #if attrs.has_key('long'):
self.placeobj.set_longitude(attrs['long']) self.placeobj.long = attrs.get('long','')
def start_event(self,attrs): def start_event(self,attrs):
self.event = RelLib.Event() self.event = RelLib.Event()
self.event.set_handle(Utils.create_id()) if self.person or self.family:
# GRAMPS LEGACY: old events that were written inside
# person or family objects.
self.event.handle = Utils.create_id()
self.event.type = _ConstXML.tuple_from_xml(_ConstXML.events,
attrs['type'])
else:
# This is new event, with handle already existing
self.event.handle = attrs['handle'].replace('_','')
self.event.conf = int(attrs.get("conf",2))
self.event.private = bool(attrs.get("priv"))
self.db.add_event(self.event,self.trans) self.db.add_event(self.event,self.trans)
etype = self.save_event.get(attrs["type"],RelLib.Event.CUSTOM)
if etype == RelLib.Event.CUSTOM: def start_eventref(self,attrs):
self.event.set_type((etype,attrs["type"])) self.eventref = RelLib.EventRef()
else: self.eventref.ref = attrs['hlink'].replace('_','')
self.event.set_type((etype,u"")) self.eventref.private = bool(attrs.get('priv'))
if attrs.has_key("conf"): self.eventref.role = _ConstXML.tuple_from_xml(_ConstXML.event_roles,
self.event.conf = int(attrs["conf"]) attrs.get('role',''))
else: if self.family:
self.event.conf = 2 self.family.add_event_ref(self.eventref)
if attrs.has_key("priv"): elif self.person:
self.event.private = int(attrs["priv"]) # We count here on events being already parsed prior
# to parsing people. This will fail if this is not true.
event = self.db.get_event_from_handle(self.eventref.ref)
print self.eventref.ref
print "event", event
if event.type[0] == RelLib.Event.BIRTH:
self.person.birth_ref = self.eventref
elif event.type[0] == RelLib.Event.DEATH:
self.person.death_ref = self.eventref
else:
self.person.add_event_ref(self.eventref)
def start_attribute(self,attrs): def start_attribute(self,attrs):
self.attribute = RelLib.Attribute() self.attribute = RelLib.Attribute()
if attrs.has_key("conf"): self.attribute.conf = int(attrs.get("conf",2))
self.attribute.conf = int(attrs["conf"]) self.attribute.private = bool(attrs.get("priv"))
else: self.attribute.type = _ConstXML.tuple_from_xml(_ConstXML.attributes,
self.attribute.conf = 2 attrs.get("type",''))
if attrs.has_key("priv"): self.attribute.value = attrs.get("value",'')
self.attribute.private = int(attrs["priv"])
atype = self.save_attr.get(attrs["type"],RelLib.Attribute.CUSTOM)
if atype == RelLib.Attribute.CUSTOM:
self.attribute.set_type((atype,attrs["type"]))
else:
self.attribute.set_type((atype,u""))
if attrs.has_key('value'):
self.attribute.set_value(attrs["value"])
if self.photo: if self.photo:
self.photo.add_attribute(self.attribute) self.photo.add_attribute(self.attribute)
elif self.object: elif self.object:
@ -768,12 +796,8 @@ class GrampsParser:
def start_address(self,attrs): def start_address(self,attrs):
self.address = RelLib.Address() self.address = RelLib.Address()
self.person.add_address(self.address) self.person.add_address(self.address)
if attrs.has_key("conf"): self.address.conf = int(attrs.get("conf",2))
self.address.conf = int(attrs["conf"]) self.address.private = bool(attrs.get("priv"))
else:
self.address.conf = 2
if attrs.has_key("priv"):
self.address.private = int(attrs["priv"])
def start_bmark(self,attrs): def start_bmark(self,attrs):
try: try:
@ -794,12 +818,12 @@ class GrampsParser:
except KeyError: except KeyError:
self.person = self.find_person_by_gramps_id(new_id) self.person = self.find_person_by_gramps_id(new_id)
if attrs.has_key('complete'): # Old and new markers: complete=1 and marker=word both have to work
try: if attrs.get('complete'): # this is only true for complete=1
if int(attrs['complete']): self.person.marker = (RelLib.PrimaryObject.MARKER_COMPLETE,"")
self.person.set_marker((RelLib.PrimaryObject.MARKER_COMPLETE, "")) else:
except KeyError: self.person.marker = _ConstXML.tuple_from_xml(
pass _ConstXML.marker_types,attrs.get("marker",''))
def start_people(self,attrs): def start_people(self,attrs):
if attrs.has_key('home'): if attrs.has_key('home'):
@ -834,23 +858,14 @@ class GrampsParser:
def start_url(self,attrs): def start_url(self,attrs):
if not attrs.has_key("href"): if not attrs.has_key("href"):
return return
try: url = RelLib.Url()
desc = attrs["description"] url.path = attrs["href"]
except KeyError: url.description = attrs.get("description",'')
desc = "" url.privacy = bool(attrs.get('priv'))
if self.person:
try: self.person.add_url(url)
url = RelLib.Url() elif self.placeobj:
url.set_path(attrs["href"]) self.placeobj.add_url(url)
url.set_description(desc)
if attrs.has_key("priv"):
url.set_privacy(int(attrs['priv']))
if self.person:
self.person.add_url(url)
elif self.placeobj:
self.placeobj.add_url(url)
except KeyError:
return
def start_family(self,attrs): def start_family(self,attrs):
self.update() self.update()
@ -861,20 +876,26 @@ class GrampsParser:
self.family.set_gramps_id(handle) self.family.set_gramps_id(handle)
except KeyError: except KeyError:
self.family = self.find_family_by_gramps_id(handle) self.family = self.find_family_by_gramps_id(handle)
# GRAMPS LEGACY: the type now belongs to <rel> tag
if attrs.has_key("type"): # Here we need to support old format of <family type="Married">
ftype = _FAMILY_TRANS.get(attrs["type"],RelLib.Family.UNKNOWN) self.family.type = _ConstXML.tuple_from_xml(
if ftype == RelLib.Family.UNKNOWN: _ConstXML.family_relations,attrs.get("type",'Unknown'))
self.family.set_relationship((ftype,attrs['type']))
else:
self.family.set_relationship((ftype,""))
if attrs.has_key('complete'): # Old and new markers: complete=1 and marker=word both have to work
try: if attrs.get('complete'): # this is only true for complete=1
if int(attrs['complete']): self.family.marker = (RelLib.PrimaryObject.MARKER_COMPLETE,"")
self.family.set_marker((RelLib.PrimaryObject.MARKER_COMPLETE, "")) else:
except KeyError: self.family.marker = _ConstXML.tuple_from_xml(
pass _ConstXML.marker_types,attrs.get("marker",''))
def start_rel(self,attrs):
pass
def start_file(self,attrs):
pass
def stop_file(self,tag):
pass
def start_childof(self,attrs): def start_childof(self,attrs):
try: try:
@ -883,19 +904,11 @@ class GrampsParser:
except KeyError: except KeyError:
family = self.find_family_by_gramps_id(self.map_fid(attrs["ref"])) family = self.find_family_by_gramps_id(self.map_fid(attrs["ref"]))
if attrs.has_key("mrel"): mrel = _ConstXML.tuple_from_xml(_ConstXML.child_relations,
mval = attrs.has_key('mrel') attrs.get('mrel','Birth'))
mrel = (self.child_relmap.get(mval,RelLib.Person.CHILD_CUSTOM), frel = _ConstXML.tuple_from_xml(_ConstXML.child_relations,
mval) attrs.get('frel','Birth'))
else: self.person.add_parent_family_handle(family.handle,mrel,frel)
mrel = (RelLib.Person.CHILD_BIRTH,'Birth')
if attrs.has_key("frel"):
fval = attrs.has_key('frel')
frel = (self.child_relmap.get(fval,RelLib.Person.CHILD_CUSTOM),
fval)
else:
frel = (RelLib.Person.CHILD_BIRTH,'Birth')
self.person.add_parent_family_handle(family.get_handle(),mrel,frel)
def start_parentin(self,attrs): def start_parentin(self,attrs):
try: try:
@ -903,43 +916,27 @@ class GrampsParser:
attrs['hlink'].replace('_',''),self.trans) attrs['hlink'].replace('_',''),self.trans)
except KeyError: except KeyError:
family = self.find_family_by_gramps_id(self.map_fid(attrs["ref"])) family = self.find_family_by_gramps_id(self.map_fid(attrs["ref"]))
self.person.add_family_handle(family.get_handle()) self.person.add_family_handle(family.handle)
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()
if attrs.has_key("type"): self.name.type =_ConstXML.tuple_from_xml(
tval = _NAME_TRANS.get(attrs['type'],RelLib.Name.CUSTOM) _ConstXML.name_types,attrs.get('type','Birth Name'))
if tval == RelLib.Name.CUSTOM: self.name.sort_as = int(attrs.get("sort",RelLib.Name.DEF))
self.name.set_type((tval,attrs["type"])) self.name.display_as = int(attrs.get("display",RelLib.Name.DEF))
else: self.name.conf = int(attrs.get("conf",2))
self.name.set_type((tval,Utils.name_types[tval])) self.name.set_private = bool(attrs.get("priv"))
if attrs.has_key("sort"): self.alt_name = bool(attrs.get("alt"))
self.name.set_sort_as(int(attrs["sort"]))
if attrs.has_key("display"):
self.name.set_display_as(int(attrs["display"]))
if attrs.has_key("conf"):
self.name.set_confidence(int(attrs["conf"]))
else:
self.name.conf = 2
if attrs.has_key("priv"):
self.name.set_privacy(int(attrs["priv"]))
if attrs.has_key("alt"):
self.alt_name = int(attrs["alt"])
else:
self.alt_name = 0
def start_last(self,attrs): def start_last(self,attrs):
if attrs.has_key('prefix'): self.name.prefix = attrs.get('prefix','')
self.name.set_surname_prefix(attrs['prefix']) self.name.group_as = attrs.get('group','')
if attrs.has_key('group'):
self.name.set_group_as(attrs['group'])
def start_note(self,attrs): def start_note(self,attrs):
self.in_note = 1 self.in_note = 1
self.note = RelLib.Note() self.note = RelLib.Note()
if attrs.has_key("format"): self.note.format = int(attrs.get('format',0))
self.note.set_format(int(attrs['format']))
def start_sourceref(self,attrs): def start_sourceref(self,attrs):
self.source_ref = RelLib.SourceRef() self.source_ref = RelLib.SourceRef()
@ -949,11 +946,8 @@ class GrampsParser:
except KeyError: except KeyError:
source = self.find_source_by_gramps_id(self.map_sid(attrs["ref"])) source = self.find_source_by_gramps_id(self.map_sid(attrs["ref"]))
if attrs.has_key("conf"): self.source_ref.confidence = int(attrs.get("conf",self.conf))
self.source_ref.confidence = int(attrs["conf"]) self.source_ref.ref = source.handle
else:
self.source_ref.confidence = self.conf
self.source_ref.set_base_handle(source.get_handle())
if self.photo: if self.photo:
self.photo.add_source_reference(self.source_ref) self.photo.add_source_reference(self.source_ref)
elif self.ord: elif self.ord:
@ -995,11 +989,8 @@ class GrampsParser:
except KeyError: except KeyError:
obj = self.find_object_by_gramps_id(self.map_oid(attrs['ref'])) obj = self.find_object_by_gramps_id(self.map_oid(attrs['ref']))
handle = obj.get_handle() self.objref.ref = obj.handle
self.objref.private = bool(attrs.get('priv'))
self.objref.set_reference_handle(handle)
if attrs.has_key('priv'):
self.objref.set_privacy(int(attrs['priv']))
if self.event: if self.event:
self.event.add_media_reference(self.objref) self.event.add_media_reference(self.objref)
elif self.family: elif self.family:
@ -1019,14 +1010,18 @@ class GrampsParser:
self.object.set_gramps_id(handle) self.object.set_gramps_id(handle)
except KeyError: except KeyError:
self.object = self.find_object_by_gramps_id(handle) self.object = self.find_object_by_gramps_id(handle)
self.object.set_mime_type(attrs['mime'])
self.object.set_description(attrs['description']) # GRAMPS LEGACY: src, mime, and description attributes
# now belong to the <file> tag. Here we are supporting
# the old format of <object src="blah"...>
self.object.mime = attrs['mime']
self.object.desc = attrs['description']
src = attrs["src"] src = attrs["src"]
if src: if src:
if src[0] != '/': if src[0] != '/':
fullpath = os.path.abspath(self.filename) fullpath = os.path.abspath(self.filename)
src = os.path.dirname(fullpath) + '/' + src src = os.path.dirname(fullpath) + '/' + src
self.object.set_path(src) self.object.path = src
def stop_people(self,*tag): def stop_people(self,*tag):
pass pass
@ -1235,19 +1230,22 @@ class GrampsParser:
self.attribute = None self.attribute = None
def stop_comment(self,tag): def stop_comment(self,tag):
# Parse witnesses created by older gramps
if tag.strip(): if tag.strip():
self.witness_comment = tag self.witness_comment = tag
else: else:
self.witness_comment = "" self.witness_comment = ""
def stop_witness(self,tag): def stop_witness(self,tag):
# Parse witnesses created by older gramps
if self.witness_comment: if self.witness_comment:
self.witness.set_comment(self.witness_comment) note_text = self.event.get_note() + "\n" + \
_("Witness comment: %s") % self.witness_comment
self.event.set_note(note_text)
elif tag.strip(): elif tag.strip():
self.witness.set_comment(tag) note_text = self.event.get_note() + "\n" + \
else: _("Witness comment: %s") % tag
self.witness.set_comment("") self.event.set_note(note_text)
self.event.add_witness(self.witness)
self.in_witness = 0 self.in_witness = 0
def stop_attr_type(self,tag): def stop_attr_type(self,tag):
@ -1283,59 +1281,41 @@ class GrampsParser:
while gtk.events_pending(): while gtk.events_pending():
gtk.main_iteration() gtk.main_iteration()
def stop_type(self,tag):
# Event type
self.event.type = _ConstXML.tuple_from_xml(_ConstXML.events,tag)
def stop_eventref(self,tag):
self.eventref = None
def stop_event(self,*tag): def stop_event(self,*tag):
if self.family: if self.family:
ref = RelLib.EventRef() ref = RelLib.EventRef()
ref.set_reference_handle(self.event.get_handle()) ref.ref = self.event.handle
ref.private = self.event.private
ref.role = (RelLib.EventRef.FAMILY,'')
self.family.add_event_ref(ref) self.family.add_event_ref(ref)
elif self.person:
descr = self.event.get_description()
if not descr:
(code,val) = self.event.get_type()
if code == RelLib.Event.CUSTOM:
event_name = val
elif code in Utils.family_events:
event_name = Utils.family_events[code]
else:
# FIXME: What do we want to do in that case?
print "Importing unknown event code '%d' value '%s'" % (code,val)
event_name = _("Unknown event code '%d' value '%s'") % (code,val)
text = _("%(event_name)s of %(family)s") % {
'event_name' : event_name,
'family' : Utils.family_name(self.family,self.db),
}
self.event.set_description(text)
else:
ref = RelLib.EventRef() ref = RelLib.EventRef()
ref.set_reference_handle(self.event.get_handle()) ref.ref = self.event.handle
ref.set_role((RelLib.EventRef.PRIMARY,'')) ref.private = self.event.private
if self.event.get_type()[0] == RelLib.Event.BIRTH: ref.role = (RelLib.EventRef.PRIMARY,'')
self.person.set_birth_ref(ref) if self.event.type[0] == RelLib.Event.BIRTH:
elif self.event.get_type()[0] == RelLib.Event.DEATH: self.person.birth_ref = ref
self.person.set_death_ref(ref) elif self.event.type[0] == RelLib.Event.DEATH:
self.person.death_ref = ref
else: else:
self.person.add_event_ref(ref) self.person.add_event_ref(ref)
descr = self.event.get_description()
if not descr:
(code,val) = self.event.get_type()
if code == RelLib.Event.CUSTOM:
event_name = val
else:
event_name = Utils.personal_events[code]
text = _("%(event_name)s of %(person)s") % {
'event_name' : event_name,
'person' : NameDisplay.displayer.display(self.person),
}
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
def stop_name(self,tag): def stop_name(self,tag):
#if self.in_witness: # Parse witnesses created by older gramps
# self.witness = RelLib.Witness(RelLib.Event.NAME,tag) if self.in_witness:
#else: note_text = self.event.get_note() + "\n" + \
if self.alt_name: _("Witness name: %s") % tag
self.event.set_note(note_text)
elif self.alt_name:
# former aka tag -- alternate name # former aka tag -- alternate name
if self.name.get_type() == "": if self.name.get_type() == "":
self.name.set_type("Also Known As") self.name.set_type("Also Known As")
@ -1348,10 +1328,15 @@ class GrampsParser:
self.name = None self.name = None
def stop_ref(self,tag): def stop_ref(self,tag):
## # FIXME: Work this out when Witness is working again # Parse witnesses created by older gramps
## person = self.find_person_by_gramps_id(self.map_gid(tag)) person = self.find_person_by_gramps_id(self.map_gid(tag))
## self.witness = RelLib.Witness(RelLib.Event.ID,person.get_handle()) # Add an EventRef from that person
return # to this event using ROLE_WITNESS role
event_ref = RelLib.EventRef()
event_ref.ref = self.event.handle
event_ref.role = (RelLib.EventRef.WITNESS,'')
person.event_ref_list.append(event_ref)
self.db.commit_person(person,self.trans,self.change)
def stop_place(self,tag): def stop_place(self,tag):
if self.placeobj == None: if self.placeobj == None:
@ -1391,10 +1376,10 @@ class GrampsParser:
gtk.main_iteration() gtk.main_iteration()
def stop_description(self,tag): def stop_description(self,tag):
self.event.set_description(tag) self.event.description = tag
def stop_cause(self,tag): def stop_cause(self,tag):
self.event.set_cause(tag) self.event.cause = tag
def stop_gender(self,tag): def stop_gender(self,tag):
t = tag t = tag
@ -1517,6 +1502,8 @@ class GrampsParser:
self.family.set_note_object(self.note) self.family.set_note_object(self.note)
elif self.placeobj: elif self.placeobj:
self.placeobj.set_note_object(self.note) self.placeobj.set_note_object(self.note)
elif self.eventref:
self.eventref.set_note_object(self.note)
def stop_research(self,tag): def stop_research(self,tag):
self.owner.set(self.resname, self.resaddr, self.rescity, self.resstate, self.owner.set(self.resname, self.resaddr, self.rescity, self.resstate,

26
src/GrampsDb/_WriteXML.py
View File

@ -241,6 +241,18 @@ class XmlWriter:
count = 0 count = 0
delta = max(int(total/50),1) delta = max(int(total/50),1)
if event_len > 0:
self.g.write(" <events>\n")
sorted_keys = self.db.get_gramps_ids(EVENT_KEY)
sorted_keys.sort ()
for gramps_id in sorted_keys:
event = self.db.get_event_from_gramps_id(gramps_id)
self.write_event(event,2)
if self.callback and count % delta == 0:
self.callback(float(count)/float(total))
count = count + 1
self.g.write(" </events>\n")
if person_len > 0: if person_len > 0:
self.g.write(" <people") self.g.write(" <people")
person = self.db.get_default_person() person = self.db.get_default_person()
@ -272,18 +284,6 @@ class XmlWriter:
count = count + 1 count = count + 1
self.g.write(" </families>\n") self.g.write(" </families>\n")
if event_len > 0:
self.g.write(" <events>\n")
sorted_keys = self.db.get_gramps_ids(EVENT_KEY)
sorted_keys.sort ()
for gramps_id in sorted_keys:
event = self.db.get_event_from_gramps_id(gramps_id)
self.write_event(event,2)
if self.callback and count % delta == 0:
self.callback(float(count)/float(total))
count = count + 1
self.g.write(" </events>\n")
if source_len > 0: if source_len > 0:
self.g.write(" <sources>\n") self.g.write(" <sources>\n")
keys = self.db.get_gramps_ids(SOURCE_KEY) keys = self.db.get_gramps_ids(SOURCE_KEY)
@ -531,7 +531,7 @@ class XmlWriter:
self.g.write('%s</eventref>\n' % sp) self.g.write('%s</eventref>\n' % sp)
def write_event(self,event,index=1): def write_event(self,event,index=1):
if not event or event.is_empty(): if not event:
return return
self.write_primary_tag("event",event,2) self.write_primary_tag("event",event,2)