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

2007-09-26 James G. Sack <jgsack@san.rr.com>

Browse Source 
* src/plugins/Check.py: same sex marriage need not be CIVIL_UNION, bug #1245
	This includes the 8374 commit which was not present in trunk (??)


svn: r9011
This commit is contained in:
Benny Malengier 2007-09-26 08:10:19 +00:00
parent bb2350ce9a
commit 1bcc55c733
2 changed files with 28 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2007-09-26 James G. Sack <jgsack@san.rr.com>
* src/plugins/Check.py: same sex marriage need not be CIVIL_UNION, bug #1245
This includes the 8374 commit which was not present in trunk (??)
2007-09-26 Benny Malengier <benny.malengier@gramps-project.org> 2007-09-26 Benny Malengier <benny.malengier@gramps-project.org>
* src/Selectors/_SelectNote.py:a note selector for the reports * src/Selectors/_SelectNote.py:a note selector for the reports
* src/Selectors/Makefile.am: add selectNote * src/Selectors/Makefile.am: add selectNote

59
src/plugins/Check.py
View File

@ -574,6 +574,8 @@ class CheckIntegrity:
self.db.remove_family(family_handle,self.trans) self.db.remove_family(family_handle,self.trans)
def check_parent_relationships(self): def check_parent_relationships(self):
"""Repair father=female or mother=male in hetero families
"""
fhandle_list = self.db.get_family_handles() fhandle_list = self.db.get_family_handles()
self.progress.set_pass(_('Looking for broken parent relationships'), self.progress.set_pass(_('Looking for broken parent relationships'),
@ -582,50 +584,29 @@ class CheckIntegrity:
for family_handle in fhandle_list: for family_handle in fhandle_list:
self.progress.step() self.progress.step()
family = self.db.get_family_from_handle(family_handle) family = self.db.get_family_from_handle(family_handle)
mother_handle = family.get_mother_handle()
father_handle = family.get_father_handle()
father = None
if father_handle:
father = self.db.get_person_from_handle(father_handle)
mother = None
if mother_handle:
mother = self.db.get_person_from_handle(mother_handle)
rel_type = family.get_relationship()
if not father_handle and not mother_handle: father_handle = family.get_father_handle()
continue if father_handle:
elif not father_handle: fgender = self.db.get_person_from_handle(father_handle
if mother and mother.get_gender() == RelLib.Person.MALE: ).get_gender()
# No father set and mother is male
family.set_father_handle(mother_handle)
family.set_mother_handle(None)
self.db.commit_family(family,self.trans)
elif not mother_handle:
if father and father.get_gender() == RelLib.Person.FEMALE:
# No mother set and father is female
family.set_mother_handle(father_handle)
family.set_father_handle(None)
self.db.commit_family(family,self.trans)
else: else:
fgender = father.get_gender() fgender = None
mgender = mother.get_gender()
if rel_type != RelLib.FamilyRelType.CIVIL_UNION: mother_handle = family.get_mother_handle()
if fgender == mgender and fgender != RelLib.Person.UNKNOWN: if mother_handle:
family.set_relationship(RelLib.FamilyRelType.CIVIL_UNION) mgender = self.db.get_person_from_handle(mother_handle
self.fam_rel.append(family_handle) ).get_gender()
self.db.commit_family(family,self.trans) else:
elif fgender == RelLib.Person.FEMALE or mgender == RelLib.Person.MALE: mgender = None
family.set_father_handle(mother_handle)
family.set_mother_handle(father_handle) if (fgender == RelLib.Person.FEMALE \
self.fam_rel.append(family_handle) or mgender == RelLib.Person.MALE) \
self.db.commit_family(family,self.trans) and fgender != mgender:
elif fgender != mgender: # swap. note: (at most) one handle may be None
family.set_relationship(RelLib.FamilyRelType.UNKNOWN)
self.fam_rel.append(family_handle)
if fgender == RelLib.Person.FEMALE or mgender == RelLib.Person.MALE:
family.set_father_handle(mother_handle) family.set_father_handle(mother_handle)
family.set_mother_handle(father_handle) family.set_mother_handle(father_handle)
self.db.commit_family(family,self.trans) self.db.commit_family(family,self.trans)
self.fam_rel.append(family_handle)
def check_events(self): def check_events(self):
self.progress.set_pass(_('Looking for event problems'), self.progress.set_pass(_('Looking for event problems'),