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

Update

Browse Source 
svn: r3106
This commit is contained in:
Alex Roitman 2004-04-25 05:37:51 +00:00
parent 92340bcc1a
commit 43c7b52b3d
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gramps2/src/plugins/Ancestors.py
View File

@ -337,13 +337,14 @@ class ComprehensiveAncestorsReport (Report.Report):
for partner_id in [family.get_father_id (), for partner_id in [family.get_father_id (),
family.get_mother_id ()]: family.get_mother_id ()]:
partner = self.database.find_person_from_id(partner_id) partner = self.database.find_person_from_id(partner_id)
if partner == person or not partner: if partner_id == person_id or not partner:
continue continue
if (suppress_children or if (suppress_children or
(partner != from_family_father and (partner != from_family_father and
partner != from_family_mother)): partner != from_family_mother)):
for object_id in partner.get_media_list ()[:1]: for media_ref in partner.get_media_list ()[:1]:
object_id = media_ref.get_reference_id()
mobject = self.database.find_object_from_id(object_id) mobject = self.database.find_object_from_id(object_id)
if mobject.get_mime_type()[0:5] == "image": if mobject.get_mime_type()[0:5] == "image":
spouse.append ((self.doc.add_media_object, spouse.append ((self.doc.add_media_object,
@ -375,7 +376,8 @@ class ComprehensiveAncestorsReport (Report.Report):
ret.append ((self.doc.end_cell, [])) ret.append ((self.doc.end_cell, []))
else: else:
ret.append ((self.doc.start_cell, ["AR-Photo"])) ret.append ((self.doc.start_cell, ["AR-Photo"]))
for object_id in photos[:1]: for media_ref in photos[:1]:
object_id = media_ref.get_reference_id()
mobject = self.database.find_object_from_id(object_id) mobject = self.database.find_object_from_id(object_id)
if mobject.get_mime_type()[0:5] == "image": if mobject.get_mime_type()[0:5] == "image":
ret.append ((self.doc.add_media_object, ret.append ((self.doc.add_media_object,
@ -617,7 +619,13 @@ class ComprehensiveAncestorsReport (Report.Report):
citation += "[%d" % ind citation += "[%d" % ind
comments = ref.get_comments () comments = ref.get_comments ()
if comments and comments.find ('\n') == -1: if comments and comments.find ('\n') == -1:
citation += " - %s" % comments.rstrip ('.') # Work around rstrip('.') which is not working
# with python2.2.1 and earlier
#citation += " - %s" % comments.rstrip ('.')
comments = comments.rstrip()
if comments[-1] == '.':
comments = comments[:-1]
citation += " - %s" % comments
citation += "]" citation += "]"
@ -641,8 +649,15 @@ class ComprehensiveAncestorsReport (Report.Report):
nick = person.get_nick_name () nick = person.get_nick_name ()
if nick: if nick:
nick.strip ('"') #nick = nick.strip ('"')
name += ' ("%s")' % nick # Work around strip('"') which is not working
# with python2.2.1 and earlier
nick = nick.strip()
if nick[0] == '"':
nick = nick[1:]
if nick[-1] == '"':
nick = nick[:-1]
name += ' ("%s")' % nick
if last.replace ('?', '') == '': if last.replace ('?', '') == '':
if first_replaced == '': if first_replaced == '':
@ -721,8 +736,8 @@ class ComprehensiveAncestorsReport (Report.Report):
ret += self.event_info (marriage) ret += self.event_info (marriage)
ret += children + '.' ret += children + '.'
elif (listing_children or elif (listing_children or
spouse == mother or spouse_id == mother_id or
family != from_family): family_id != from_family.get_id()):
if gender == RelLib.Person.female: if gender == RelLib.Person.female:
ret += _(' She married %(name)s') % \ ret += _(' She married %(name)s') % \
{'name': self.person_name (spouse_id)} {'name': self.person_name (spouse_id)}