* src/RelLib.py: documentation improvements, move family
relations constants from const.py.in * src/AddSpouse.py: relationship constant changes * src/BaseDoc.py: documentation improvements * src/ChooseParents.py: relationship constant changes * src/Date.py: documentation changes * src/ReadGedcom.py: relationship constant changes, remove unused global * src/ReadXML.py: relationship constant changes * src/SelectChild.py: has_family to get_parent_family * src/const.py.in: moved family relation constants to RelLib * src/plugins/Check.py: relationship constant changes * src/plugins/ImportGeneWeb.py: relationship constant changes * src/plugins/WriteGeneWeb.py: relationship constant changes svn: r3836
This commit is contained in:
@@ -272,9 +272,9 @@ class CheckIntegrity:
|
||||
else:
|
||||
fgender = father.get_gender()
|
||||
mgender = mother.get_gender()
|
||||
if type != const.FAMILY_CIVIL_UNION:
|
||||
if type != RelLib.Family._CIVIL_UNION:
|
||||
if fgender == mgender and fgender != RelLib.Person.unknown:
|
||||
family.set_relationship(const.FAMILY_CIVIL_UNION)
|
||||
family.set_relationship(RelLib.Family._CIVIL_UNION)
|
||||
self.fam_rel.append(family_handle)
|
||||
self.db.commit_family(family,self.trans)
|
||||
elif fgender == RelLib.Person.female or mgender == RelLib.Person.male:
|
||||
@@ -283,7 +283,7 @@ class CheckIntegrity:
|
||||
self.fam_rel.append(family_handle)
|
||||
self.db.commit_family(family,self.trans)
|
||||
elif fgender != mgender:
|
||||
family.set_relationship(const.FAMILY_UNKNOWN)
|
||||
family.set_relationship(RelLib.Family._UNKNOWN)
|
||||
self.fam_rel.append(family_handle)
|
||||
if fgender == RelLib.Person.female or mgender == RelLib.Person.male:
|
||||
family.set_father_handle(mother_handle)
|
||||
|
||||
@@ -353,7 +353,7 @@ class GeneWebParser:
|
||||
self.current_family.add_event_handle(sep.get_handle())
|
||||
|
||||
if not married:
|
||||
self.current_family.set_relationship(const.FAMILY_UNMARRIED)
|
||||
self.current_family.set_relationship(RelLib.Family.UNMARRIED)
|
||||
|
||||
self.db.commit_family(self.current_family,self.trans)
|
||||
return idx
|
||||
|
||||
@@ -482,7 +482,7 @@ class GeneWebWriter:
|
||||
if eng_source != "":
|
||||
ret = ret + "#ms %s " % self.rem_spaces( m_source)
|
||||
else:
|
||||
if family.get_relationship() != const.FAMILY_MARRIED:
|
||||
if family.get_relationship() != RelLib.Family.MARRIED:
|
||||
"""Not married or engaged"""
|
||||
ret = ret + " #nm "
|
||||
|
||||
|
||||
Reference in New Issue
Block a user