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

bugs 2488 and 4251: spacing on families

Browse Source 
svn: r15935
This commit is contained in:
Jérôme Rapinat
2010-09-28 16:54:07 +00:00
parent f08d4825e7
commit c5e1ee690d
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/plugins/export/ExportGeneWeb.py
View File

@@ -245,7 +245,7 @@ class GeneWebWriter(object):
mother_handle = family.get_mother_handle() mother_handle = family.get_mother_handle()
if mother_handle: if mother_handle:
mother = self.db.get_person_from_handle(mother_handle) mother = self.db.get_person_from_handle(mother_handle)
self.writeln("fam %s %s +%s %s %s" % self.writeln("fam %s %s+%s %s %s" %
(self.get_ref_name(father), (self.get_ref_name(father),
self.get_full_person_info_fam(father), self.get_full_person_info_fam(father),
self.get_wedding_data(family), self.get_wedding_data(family),
@@ -511,34 +511,36 @@ class GeneWebWriter(object):
if married == 1: if married == 1:
if m_date != "": if m_date != "":
ret = ret + m_date ret = ret + m_date
ret = ret + " " if m_place != "" and m_source != "":
ret = ret + " #mp %s #ms %s" % (self.rem_spaces( m_place), self.rem_spaces( m_source))
if m_place != "":
ret = ret + "#mp %s " % self.rem_spaces( m_place) if m_place != "" and m_source == "":
ret = ret + " #mp %s" % self.rem_spaces( m_place)
if m_source != "":
ret = ret + "#ms %s " % self.rem_spaces( m_source) if m_source != "" and m_place == "":
ret = ret + " #ms %s" % self.rem_spaces( m_source)
elif engaged == 1: elif engaged == 1:
"""Geneweb only supports either Marriage or engagement""" """Geneweb only supports either Marriage or engagement"""
if eng_date != "": if eng_date != "":
ret = ret + eng_date ret = ret + eng_date
ret = ret + " " if m_place != "" and m_source != "":
ret = ret + " #mp %s #ms %s" % (self.rem_spaces( m_place), self.rem_spaces( m_source))
if eng_place != "":
ret = ret + "#mp %s " % self.rem_spaces( m_place) if eng_place != "" and m_source == "":
ret = ret + " #mp %s" % self.rem_spaces( m_place)
if eng_source != "":
ret = ret + "#ms %s " % self.rem_spaces( m_source) if eng_source != "" and m_place == "":
ret = ret + " #ms %s" % self.rem_spaces( m_source)
else: else:
if family.get_relationship() != gen.lib.FamilyRelType.MARRIED: if family.get_relationship() != gen.lib.FamilyRelType.MARRIED:
"""Not married or engaged""" """Not married or engaged"""
ret = ret + " #nm " ret = ret + " #nm"
if divorced == 1: if divorced == 1:
if div_date != "": if div_date != "":
ret = ret + "-%s " %div_date ret = ret + " -%s" %div_date
else: else:
ret = ret + "-0 " ret = ret + " -0"
return ret return ret