From c01f2f714ead0fb3c901aaf3fb9e87735199e646 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Fri, 10 Feb 2006 19:58:41 +0000 Subject: [PATCH] * src/plugins/DetDescendantReport.py (DetDescendantReport.write_endnotes): Disable writing reference details. * src/plugins/DetAncestralReport.py (DetAncestorReport.write_endnotes): Disable writing reference details. svn: r5920 --- gramps2/ChangeLog | 5 +++ gramps2/src/plugins/DetAncestralReport.py | 48 ++++++++++++---------- gramps2/src/plugins/DetDescendantReport.py | 42 ++++++++++--------- 3 files changed, 54 insertions(+), 41 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 674414616..2cb9143a2 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,4 +1,9 @@ 2006-02-10 Alex Roitman + * src/plugins/DetDescendantReport.py + (DetDescendantReport.write_endnotes): Disable writing reference + details. + * src/plugins/DetAncestralReport.py + (DetAncestorReport.write_endnotes): Disable writing reference details. * src/docgen/ODFDoc.py: Typo. 2006-02-09 Alex Roitman diff --git a/gramps2/src/plugins/DetAncestralReport.py b/gramps2/src/plugins/DetAncestralReport.py index 9fa9243a0..1d54b415c 100644 --- a/gramps2/src/plugins/DetAncestralReport.py +++ b/gramps2/src/plugins/DetAncestralReport.py @@ -2,7 +2,7 @@ # Gramps - a GTK+/GNOME based genealogy program # # Copyright (C) 2000-2002 Bruce J. DeGrasse -# Copyright (C) 2000-2005 Donald N. Allingham +# Copyright (C) 2000-2006 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -504,25 +504,29 @@ class DetAncestorReport(Report.Report): self.doc.start_paragraph('DAR-Endnotes',"%d." % key) self.doc.write_text(base.get_title()) - for item in [ base.get_author(), base.get_publication_info(), - base.get_abbreviation(), - _dd.display(srcref.get_date_object()),]: - if item: - self.doc.write_text('; %s' % item) - - item = srcref.get_text() - if item: - self.doc.write_text('; ') - self.doc.write_text(_('Text:')) - self.doc.write_text(' ') - self.doc.write_text(item) - - item = srcref.get_note() - if item: - self.doc.write_text('; ') - self.doc.write_text(_('Comments:')) - self.doc.write_text(' ') - self.doc.write_text(item) + # Disable writing reference details, because only the details + # the first reference to this source will appear. + # FIXME: need to properly change self.endnotes() to put + # this feature back correclty. +## for item in [ base.get_author(), base.get_publication_info(), +## base.get_abbreviation(), +## _dd.display(srcref.get_date_object()),]: +## if item: +## self.doc.write_text('; %s' % item) +## +## item = srcref.get_text() +## if item: +## self.doc.write_text('; ') +## self.doc.write_text(_('Text:')) +## self.doc.write_text(' ') +## self.doc.write_text(item) +## +## item = srcref.get_note() +## if item: +## self.doc.write_text('; ') +## self.doc.write_text(_('Comments:')) +## self.doc.write_text(' ') +## self.doc.write_text(item) self.doc.write_text('.') self.doc.end_paragraph() @@ -552,9 +556,9 @@ class DetAncestorReport(Report.Report): self.sref_map[self.sref_index] = ref msg.write("%d" % self.sref_index) msg.write('') - str = msg.getvalue() + the_str = msg.getvalue() msg.close() - return str + return the_str #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/DetDescendantReport.py b/gramps2/src/plugins/DetDescendantReport.py index cc1ba7f43..ae1649ed9 100644 --- a/gramps2/src/plugins/DetDescendantReport.py +++ b/gramps2/src/plugins/DetDescendantReport.py @@ -2,7 +2,7 @@ # Gramps - a GTK+/GNOME based genealogy program # # Copyright (C) 2000-2002 Bruce J. DeGrasse -# Copyright (C) 2000-2005 Donald N. Allingham +# Copyright (C) 2000-2006 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -531,24 +531,28 @@ class DetDescendantReport(Report.Report): self.doc.start_paragraph('DDR-Endnotes',"%d." % key) self.doc.write_text(base.get_title()) - for item in [ base.get_author(), base.get_publication_info(), base.get_abbreviation(), - _dd.display(srcref.get_date_object()),]: - if item: - self.doc.write_text('; %s' % item) - - item = srcref.get_text() - if item: - self.doc.write_text('; ') - self.doc.write_text(_('Text:')) - self.doc.write_text(' ') - self.doc.write_text(item) - - item = srcref.get_note() - if item: - self.doc.write_text('; ') - self.doc.write_text(_('Comments:')) - self.doc.write_text(' ') - self.doc.write_text(item) + # Disable writing reference details, because only the details + # the first reference to this source will appear. + # FIXME: need to properly change self.endnotes() to put + # this feature back correclty. +## for item in [ base.get_author(), base.get_publication_info(), base.get_abbreviation(), +## _dd.display(srcref.get_date_object()),]: +## if item: +## self.doc.write_text('; %s' % item) +## +## item = srcref.get_text() +## if item: +## self.doc.write_text('; ') +## self.doc.write_text(_('Text:')) +## self.doc.write_text(' ') +## self.doc.write_text(item) +## +## item = srcref.get_note() +## if item: +## self.doc.write_text('; ') +## self.doc.write_text(_('Comments:')) +## self.doc.write_text(' ') +## self.doc.write_text(item) self.doc.write_text('.') self.doc.end_paragraph()