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

2006-06-21 Don Allingham <don@gramps-project.org>

Browse Source 
* src/GrampsDb/_ReadXML.py: handle witness ref properly



svn: r6949
This commit is contained in:
Don Allingham 2006-06-22 21:23:00 +00:00
parent 111294b3f0
commit d9f1827ddb
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
2006-06-21 Don Allingham <don@gramps-project.org>
* src/GrampsDb/_ReadXML.py: handle witness ref properly
2006-06-22 Alex Roitman <shura@gramps-project.org> 2006-06-22 Alex Roitman <shura@gramps-project.org>
* src/Filters/Rules/Person/_RelationshipPathBetweenBookmarks.py: * src/Filters/Rules/Person/_RelationshipPathBetweenBookmarks.py:
Add new module. Add new module.

28
src/GrampsDb/_ReadXML.py
View File

@ -308,7 +308,7 @@ class GrampsParser(UpdateCallback):
self.in_note = 0 self.in_note = 0
self.in_stext = 0 self.in_stext = 0
self.in_scomments = 0 self.in_scomments = 0
self.in_witness = 0 self.in_witness = False
self.db = database self.db = database
self.base = base self.base = base
self.photo = None self.photo = None
@ -708,7 +708,7 @@ class GrampsParser(UpdateCallback):
def start_witness(self,attrs): def start_witness(self,attrs):
# Parse witnesses created by older gramps # Parse witnesses created by older gramps
self.in_witness = 1 self.in_witness = True
self.witness_comment = "" self.witness_comment = ""
if attrs.has_key('name'): if attrs.has_key('name'):
note_text = self.event.get_note() + "\n" + \ note_text = self.event.get_note() + "\n" + \
@ -720,14 +720,19 @@ class GrampsParser(UpdateCallback):
handle = attrs['hlink'].replace('_','') handle = attrs['hlink'].replace('_','')
person = self.db.find_person_from_handle(handle,self.trans) person = self.db.find_person_from_handle(handle,self.trans)
except KeyError: except KeyError:
person = self.find_person_by_gramps_id(self.map_gid(attrs["ref"])) if attrs.has_key('ref'):
person = self.find_person_by_gramps_id(self.map_gid(attrs["ref"]))
else:
person = None
# Add an EventRef from that person # Add an EventRef from that person
# to this event using ROLE_WITNESS role # to this event using ROLE_WITNESS role
event_ref = RelLib.EventRef() if person:
event_ref.ref = self.event.handle event_ref = RelLib.EventRef()
event_ref.role.set(RelLib.EventRoleType.WITNESS) event_ref.ref = self.event.handle
person.event_ref_list.append(event_ref) event_ref.role.set(RelLib.EventRoleType.WITNESS)
self.db.commit_person(person,self.trans,self.change) 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):
self.placeobj.lat = attrs.get('lat','') self.placeobj.lat = attrs.get('lat','')
@ -1373,7 +1378,7 @@ class GrampsParser(UpdateCallback):
note_text = self.event.get_note() + "\n" + \ note_text = self.event.get_note() + "\n" + \
_("Witness comment: %s") % tag _("Witness comment: %s") % tag
self.event.set_note(note_text) self.event.set_note(note_text)
self.in_witness = 0 self.in_witness = False
def stop_attr_type(self,tag): def stop_attr_type(self,tag):
self.attribute.set_type(tag) self.attribute.set_type(tag)
@ -1722,9 +1727,8 @@ class GrampsParser(UpdateCallback):
self.name = None self.name = None
def startElement(self,tag,attrs): def startElement(self,tag,attrs):
self.func_list[self.func_index] = (self.func,self.tlist) self.func_list[self.func_index] = (self.func,self.tlist)
self.func_index = self.func_index + 1 self.func_index += 1
self.tlist = [] self.tlist = []
try: try:
@ -1738,7 +1742,7 @@ class GrampsParser(UpdateCallback):
def endElement(self,tag): def endElement(self,tag):
if self.func: if self.func:
self.func(''.join(self.tlist)) self.func(''.join(self.tlist))
self.func_index = self.func_index - 1 self.func_index -= 1
self.func,self.tlist = self.func_list[self.func_index] self.func,self.tlist = self.func_list[self.func_index]
def characters(self, data): def characters(self, data):