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

2007-08-15 Don Allingham <don@gramps-project.org>

Browse Source 
* src/GrampsDbUtils/_WriteGedcom.py: Match parser and writer
	* src/GrampsDbUtils/_GedcomParser.py: Match parser and writer

	* src/GrampsDbUtils/_WriteGedcom.py: write adoption records

2007-08-14  Don Allingham  <don@gramps-project.org>


svn: r8821
This commit is contained in:
Don Allingham
2007-08-16 04:30:49 +00:00
parent d40c492f3a
commit 4d04c83327
3 changed files with 38 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,6 +1,13 @@
2007-08-15 Don Allingham <don@gramps-project.org>
* src/GrampsDbUtils/_WriteGedcom.py: Match parser and writer
* src/GrampsDbUtils/_GedcomParser.py: Match parser and writer
2007-08-15 Brian Matherly <brian@gramps-project.org> 2007-08-15 Brian Matherly <brian@gramps-project.org>
* src/DateHandler/_DateHandler.py: map English_United States to english * src/DateHandler/_DateHandler.py: map English_United States to english
2007-08-14 Don Allingham <don@gramps-project.org>
* src/GrampsDbUtils/_WriteGedcom.py: write adoption records
2007-08-14 Don Allingham <don@gramps-project.org> 2007-08-14 Don Allingham <don@gramps-project.org>
* src/GrampsDbUtils/_WriteGedcom.py: fix problems identified by gedchk * src/GrampsDbUtils/_WriteGedcom.py: fix problems identified by gedchk

6
src/GrampsDbUtils/_GedcomParse.py
View File

@@ -4504,9 +4504,11 @@ class GedcomParser(UpdateCallback):
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
def person_event_name(event, person): def person_event_name(event, person):
if not event.get_description(): ename = str(event.get_type())
if not event.get_description() and ename:
text = EVENT_PERSON_STR % { text = EVENT_PERSON_STR % {
'event_name' : str(event.get_type()), 'event_name' : ename,
'person' : name_displayer.display(person), 'person' : name_displayer.display(person),
} }
event.set_description(text) event.set_description(text)

58
src/GrampsDbUtils/_WriteGedcom.py
View File

@@ -614,7 +614,6 @@ class GedcomWriter(UpdateCallback):
""" """
self.__writeln(0, "@%s@" % person.get_gramps_id(), "INDI") self.__writeln(0, "@%s@" % person.get_gramps_id(), "INDI")
self.__write_refn(person)
self.__write_names(person) self.__write_names(person)
self.__write_gender(person) self.__write_gender(person)
self.__write_person_event_ref('BIRT', person.get_birth_ref()) self.__write_person_event_ref('BIRT', person.get_birth_ref())
@@ -653,11 +652,6 @@ class GedcomWriter(UpdateCallback):
self.__writeln(level, 'NOTE', '@%s@' % note.get_gramps_id()) self.__writeln(level, 'NOTE', '@%s@' % note.get_gramps_id())
self.nlist.add(note_handle) self.nlist.add(note_handle)
def __write_refn(self, person):
match = _get_int.search(person.get_gramps_id())
if match:
self.__writeln(1, 'REFN', match.groups()[0])
def __write_names(self, person): def __write_names(self, person):
nicknames = [ attr.get_value() for attr in person.get_attribute_list() nicknames = [ attr.get_value() for attr in person.get_attribute_list()
if int(attr.get_type()) == RelLib.AttributeType.NICKNAME ] if int(attr.get_type()) == RelLib.AttributeType.NICKNAME ]
@@ -755,7 +749,7 @@ class GedcomWriter(UpdateCallback):
key = str(attr.get_type()) key = str(attr.get_type())
value = attr.get_value().strip().replace('\r', ' ') value = attr.get_value().strip().replace('\r', ' ')
if key in ("AFN", "RFN", "_UID"): if key in ("AFN", "RFN", "REFN", "_UID"):
self.__writeln(1, name, value) self.__writeln(1, name, value)
continue continue
@@ -872,7 +866,6 @@ class GedcomWriter(UpdateCallback):
family_handle = family.get_handle() family_handle = family.get_handle()
self.__writeln(0, '@%s@' % gramps_id, 'FAM' ) self.__writeln(0, '@%s@' % gramps_id, 'FAM' )
self.frefn(family)
self.__write_family_reference('HUSB', family.get_father_handle()) self.__write_family_reference('HUSB', family.get_father_handle())
self.__write_family_reference('WIFE', family.get_mother_handle()) self.__write_family_reference('WIFE', family.get_mother_handle())
@@ -881,12 +874,15 @@ class GedcomWriter(UpdateCallback):
self.__write_family_events(family) self.__write_family_events(family)
self.__write_family_attributes(family.get_attribute_list(), 1) self.__write_family_attributes(family.get_attribute_list(), 1)
for child_ref in [cref.ref for cref in family.get_child_ref_list()
if cref.ref in self.plist]: child_list = [ self.db.get_person_from_handle(cref.ref).get_gramps_id()
person = self.db.get_person_from_handle(child_ref) for cref in family.get_child_ref_list()
if person: if cref.ref in self.plist]
self.__writeln(1, 'CHIL', '@%s@' % person.get_gramps_id()) child_list.sort()
for gid in child_list:
self.__writeln(1, 'CHIL', '@%s@' % gid)
self.__write_source_references(family.get_source_references(), 1) self.__write_source_references(family.get_source_references(), 1)
self.__write_photos(family.get_media_list(), 1) self.__write_photos(family.get_media_list(), 1)
@@ -947,6 +943,10 @@ class GedcomWriter(UpdateCallback):
t = int(attr.get_type()) t = int(attr.get_type())
name = GedcomInfo.familyConstantAttributes.get(t) name = GedcomInfo.familyConstantAttributes.get(t)
value = attr.get_value().replace('\r', ' ') value = attr.get_value().replace('\r', ' ')
if t in ("AFN", "RFN", "REFN", "_UID"):
self.__writeln(1, t, value)
continue
if name and name.strip(): if name and name.strip():
self.__writeln(1, name, value) self.__writeln(1, name, value)
@@ -962,22 +962,18 @@ class GedcomWriter(UpdateCallback):
self.__write_note_references(attr.get_note_list(), level+1) self.__write_note_references(attr.get_note_list(), level+1)
self.__write_source_references(attr.get_source_references(), level+1) self.__write_source_references(attr.get_source_references(), level+1)
def write_note(self, level, handle, skip=[]):
note = self.db.get_note_from_handle(handle)
if note.get_type() not in skip:
self.__writeln(level, "NOTE", note.get())
def __write_sources(self): def __write_sources(self):
sorted = [] sorted = []
for handle in self.slist: for handle in self.slist:
source = self.db.get_source_from_handle(handle) source = self.db.get_source_from_handle(handle)
if not source: if not source:
continue continue
data = (source.get_gramps_id(), source) data = (source.get_gramps_id(), handle)
sorted.append (data) sorted.append (data)
sorted.sort () sorted.sort ()
for (source_id, source) in sorted: for (source_id, handle) in sorted:
source = self.db.get_source_from_handle(handle)
self.__writeln(0, '@%s@' % source_id, 'SOUR') self.__writeln(0, '@%s@' % source_id, 'SOUR')
if source.get_title(): if source.get_title():
self.__writeln(1, 'TITL', source.get_title()) self.__writeln(1, 'TITL', source.get_title())
@@ -1001,10 +997,14 @@ class GedcomWriter(UpdateCallback):
self.__write_change(source.get_change_time(), 1) self.__write_change(source.get_change_time(), 1)
def __write_notes(self): def __write_notes(self):
sorted = []
note_list = self.nlist for handle in self.nlist:
note = self.db.get_note_from_handle(handle)
data = (note.get_gramps_id(), handle)
sorted.append (data)
sorted.sort ()
for note_handle in note_list: for (node_id, note_handle) in sorted:
note = self.db.get_note_from_handle(note_handle) note = self.db.get_note_from_handle(note_handle)
self.__write_note_record(note) self.__write_note_record(note)
@@ -1026,7 +1026,7 @@ class GedcomWriter(UpdateCallback):
for handle in self.rlist: for handle in self.rlist:
repo = self.db.get_repository_from_handle(handle) repo = self.db.get_repository_from_handle(handle)
repo_id = repo.get_gramps_id() repo_id = repo.get_gramps_id()
sorted.append((repo_id, repo)) sorted.append((repo_id, handle))
sorted.sort() sorted.sort()
@@ -1034,7 +1034,8 @@ class GedcomWriter(UpdateCallback):
# GEDCOM only allows for a single repository per source # GEDCOM only allows for a single repository per source
for (repo_id, repo) in sorted: for (repo_id, handle) in sorted:
repo = self.db.get_repository_from_handle(handle)
self.__writeln(0, '@%s@' % repo_id, 'REPO' ) self.__writeln(0, '@%s@' % repo_id, 'REPO' )
if repo.get_name(): if repo.get_name():
self.__writeln(1, 'NAME', repo.get_name()) self.__writeln(1, 'NAME', repo.get_name())
@@ -1315,11 +1316,6 @@ class GedcomWriter(UpdateCallback):
place_name = place.get_title() place_name = place.get_title()
self.__writeln(level, "PLAC", place_name.replace('\r', ' ')) self.__writeln(level, "PLAC", place_name.replace('\r', ' '))
def frefn(self, family):
match = _get_int.search(family.get_gramps_id())
if match:
self.__writeln(1, 'REFN', match.groups()[0])
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# #