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

Clean up ReportUtils: Move text strings into "Narrator" class in libnarrate. Remove unused functions. Move functions out that are only used once.

Browse Source 
svn: r13474
This commit is contained in:
Brian Matherly
2009-10-31 21:36:57 +00:00
parent e0bef1b8ac
commit c43c3beba0
7 changed files with 2584 additions and 2937 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/textreport/AncestorReport.py
+11 -8
View File
@@ -45,6 +45,7 @@ from gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle,
PARA_ALIGN_CENTER)
from ReportBase import Report, ReportUtils, MenuReportOptions
from libnarrate import Narrator
#------------------------------------------------------------------------
#
@@ -57,6 +58,11 @@ def log2(val):
"""
return int(math.log10(val)/math.log10(2))
#------------------------------------------------------------------------
#
# AncestorReport
#
#------------------------------------------------------------------------
class AncestorReport(Report):
"""
Ancestor Report class
@@ -91,6 +97,7 @@ class AncestorReport(Report):
self.center_person = database.get_person_from_gramps_id(pid)
if (self.center_person == None) :
raise ReportError(_("Person %s is not in the Database") % pid )
self.__narrator = Narrator(self.database)
def apply_filter(self, person_handle, index, generation=1):
"""
@@ -217,14 +224,10 @@ class AncestorReport(Report):
primary_name = person.get_primary_name()
first = primary_name.get_first_name()
self.doc.write_text(
ReportUtils.born_str(self.database, person, first))
self.doc.write_text(
ReportUtils.baptised_str(self.database, person, 0))
self.doc.write_text(
ReportUtils.died_str(self.database, person, 0))
self.doc.write_text(
ReportUtils.buried_str(self.database, person, 0))
self.doc.write_text(self.__narrator.born_str(person, first))
self.doc.write_text(self.__narrator.baptised_str( person, 0))
self.doc.write_text(self.__narrator.died_str(person, 0))
self.doc.write_text(self.__narrator.buried_str(person, 0))
self.doc.end_paragraph()
src/plugins/textreport/DetAncestralReport.py
+31 -46
View File
@@ -48,7 +48,8 @@ from gen.plug.menu import BooleanOption, NumberOption, PersonOption
from ReportBase import (Report, ReportUtils, MenuReportOptions,
Bibliography, Endnotes)
import DateHandler
import Utils
from libnarrate import Narrator
#------------------------------------------------------------------------
#
@@ -126,14 +127,17 @@ class DetAncestorReport(Report):
self.prev_gen_handles = {}
if blankdate:
self.EMPTY_DATE = EMPTY_ENTRY
empty_date = EMPTY_ENTRY
else:
self.EMPTY_DATE = ""
empty_date = ""
if blankplace:
self.EMPTY_PLACE = EMPTY_ENTRY
empty_place = EMPTY_ENTRY
else:
self.EMPTY_PLACE = ""
empty_place = ""
self.__narrator = Narrator(self.database, self.verbose,
empty_date, empty_place)
self.bibli = Bibliography(Bibliography.MODE_PAGE)
@@ -242,8 +246,7 @@ class DetAncestorReport(Report):
if not self.verbose:
self.write_parents(person, first)
text = ReportUtils.born_str(self.database, person, first, self.verbose,
self.EMPTY_DATE, self.EMPTY_PLACE)
text = self.__narrator.born_str(person, first)
if text:
birth_ref = person.get_birth_ref()
if birth_ref:
@@ -253,19 +256,16 @@ class DetAncestorReport(Report):
self.doc.write_text_citation(text)
first = 0
text = ReportUtils.baptised_str(self.database, person, first, self.verbose,
self.endnotes, self.EMPTY_DATE, self.EMPTY_PLACE)
text = self.__narrator.baptised_str(person, first, self.endnotes)
if text:
self.doc.write_text_citation(text)
text = ReportUtils.christened_str(self.database, person, first, self.verbose,
self.endnotes, self.EMPTY_DATE, self.EMPTY_PLACE)
text = self.__narrator.christened_str(person, first, self.endnotes)
if text:
self.doc.write_text_citation(text)
span = self.calc_age(person)
text = ReportUtils.died_str(self.database, person, first, self.verbose,
self.EMPTY_DATE, self.EMPTY_PLACE, span)
text = self.__narrator.died_str(person, first, span)
if text:
death_ref = person.get_death_ref()
if death_ref:
@@ -275,12 +275,11 @@ class DetAncestorReport(Report):
self.doc.write_text_citation(text)
first = 0
text = ReportUtils.buried_str(self.database, person, first, self.verbose,
self.endnotes, self.EMPTY_DATE, self.EMPTY_PLACE)
text = self.__narrator.buried_str(person, first, self.endnotes)
if text:
self.doc.write_text_citation(text)
first = ReportUtils.common_name(person,self.usecall)
first = ReportUtils.common_name(person, self.usecall)
if self.verbose:
self.write_parents(person, first)
@@ -458,10 +457,9 @@ class DetAncestorReport(Report):
else:
father_name = ""
father_mark = ""
alive = Utils.probably_alive(person, self.database)
text = ReportUtils.child_str(person, father_name, mother_name,
not alive,
firstName,self.verbose)
text = self.__narrator.child_str(person, father_name, mother_name,
firstName)
if text:
self.doc.write_text(text)
if father_mark:
@@ -481,14 +479,11 @@ class DetAncestorReport(Report):
text = ""
spouse_mark = ReportUtils.get_person_mark(self.database, spouse)
text = ReportUtils.married_str(self.database,person,family,
self.verbose,
self.endnotes,
self.EMPTY_DATE,self.EMPTY_PLACE,
is_first)
text = self.__narrator.married_str(person, family, self.endnotes,
is_first)
if text:
self.doc.write_text_citation(text,spouse_mark)
self.doc.write_text_citation(text, spouse_mark)
is_first = False
def write_children(self, family):
@@ -534,12 +529,8 @@ class DetAncestorReport(Report):
cnt += 1
self.doc.write_text("%s. " % child_name,child_mark)
self.doc.write_text(
ReportUtils.born_str(self.database, child, 0,
self.verbose, self.EMPTY_DATE, self.EMPTY_PLACE))
self.doc.write_text(
ReportUtils.died_str(self.database, child, 0,
self.verbose, self.EMPTY_DATE, self.EMPTY_PLACE))
self.doc.write_text(self.__narrator.born_str(child))
self.doc.write_text(self.__narrator.died_str(child))
self.doc.end_paragraph()
@@ -632,37 +623,31 @@ class DetAncestorReport(Report):
first_name = ReportUtils.common_name(ind, self.usecall)
print_name = first_name
text = ReportUtils.born_str(self.database, ind, print_name,
self.verbose, self.EMPTY_DATE, self.EMPTY_PLACE)
text = self.__narrator.born_str(ind, print_name)
if text:
self.doc.write_text(text)
print_name = 0
text = ReportUtils.baptised_str(self.database, ind, print_name,
self.verbose, self.endnotes, self.EMPTY_DATE,
self.EMPTY_PLACE)
text = self.__narrator.baptised_str(ind, print_name,
self.endnotes)
if text:
self.doc.write_text_citation(text)
print_name = 0
text = ReportUtils.christened_str(self.database, ind, print_name,
self.verbose, self.endnotes, self.EMPTY_DATE,
self.EMPTY_PLACE)
text = self.__narrator.christened_str(ind, print_name,
self.endnotes)
if text:
self.doc.write_text_citation(text)
print_name = 0
span = self.calc_age(ind)
text = ReportUtils.died_str(self.database, ind, print_name,
self.verbose, self.EMPTY_DATE, self.EMPTY_PLACE,
span)
text = self.__narrator.died_str(ind, print_name, span)
if text:
self.doc.write_text(text)
print_name = 0
text = ReportUtils.buried_str(self.database, ind, print_name,
self.verbose, self.endnotes, self.EMPTY_DATE,
self.EMPTY_PLACE)
text = self.__narrator.buried_str(ind, print_name,
self.endnotes)
if text:
self.doc.write_text_citation(text)
src/plugins/textreport/DetDescendantReport.py
+23 -33
View File
@@ -52,6 +52,8 @@ from ReportBase import (Report, ReportUtils, MenuReportOptions,
import DateHandler
import Utils
from libnarrate import Narrator
#------------------------------------------------------------------------
#
# Constants
@@ -85,9 +87,9 @@ class DetDescendantReport(Report):
firstName - Whether to use first names instead of pronouns.
fulldate - Whether to use full dates instead of just year.
listchildren - Whether to list children.
inc_mates - Whether to include information about spouses
inc_notes - Whether to include notes.
inc_attrs - Whether to include attributes
inc_mates - Whether to include information about spouses
inc_notes - Whether to include notes.
inc_attrs - Whether to include attributes
blankPlace - Whether to replace missing Places with ___________.
blankDate - Whether to replace missing Dates with ___________.
calcageflag - Whether to compute age.
@@ -136,14 +138,17 @@ class DetDescendantReport(Report):
self.dnumber = {}
if blankdate:
self.EMPTY_DATE = EMPTY_ENTRY
empty_date = EMPTY_ENTRY
else:
self.EMPTY_DATE = ""
empty_date = ""
if blankplace:
self.EMPTY_PLACE = EMPTY_ENTRY
empty_place = EMPTY_ENTRY
else:
self.EMPTY_PLACE = ""
empty_place = ""
self.__narrator = Narrator(self.database, self.verbose,
empty_date, empty_place)
self.bibli = Bibliography(Bibliography.MODE_PAGE)
@@ -429,10 +434,8 @@ class DetDescendantReport(Report):
else:
father_name = ""
father_mark = ""
alive = Utils.probably_alive(person, self.database)
text = ReportUtils.child_str(person, father_name, mother_name,
not alive,
firstName,self.verbose)
text = self.__narrator.child_str(person, father_name, mother_name,
firstName)
if text:
self.doc.write_text(text)
if father_mark:
@@ -452,11 +455,8 @@ class DetDescendantReport(Report):
text = ""
spouse_mark = ReportUtils.get_person_mark(self.database, spouse)
text = ReportUtils.married_str(self.database, person, family,
self.verbose,
self.endnotes,
self.EMPTY_DATE,self.EMPTY_PLACE,
is_first)
text = self.__narrator.married_str(person, family, self.endnotes,
is_first)
if text:
self.doc.write_text_citation(text, spouse_mark)
@@ -541,10 +541,8 @@ class DetDescendantReport(Report):
self.doc.write_text("%s. " % child_name, child_mark)
self.doc.write_text(ReportUtils.born_str( self.database, child, 0,
self.verbose, self.EMPTY_DATE, self.EMPTY_PLACE))
self.doc.write_text(ReportUtils.died_str( self.database, child, 0,
self.verbose, self.EMPTY_DATE, self.EMPTY_PLACE))
self.doc.write_text(self.__narrator.born_str(child, 0))
self.doc.write_text(self.__narrator.died_str(child, 0))
self.doc.end_paragraph()
def __write_family_events(self, family):
@@ -595,8 +593,7 @@ class DetDescendantReport(Report):
if not self.verbose:
self.write_parents(person, first)
text = ReportUtils.born_str(self.database, person, first, self.verbose,
self.EMPTY_DATE, self.EMPTY_PLACE)
text = self.__narrator.born_str(person, first)
if text:
birth_ref = person.get_birth_ref()
if birth_ref:
@@ -606,21 +603,16 @@ class DetDescendantReport(Report):
self.doc.write_text_citation(text)
first = 0
text = ReportUtils.baptised_str(self.database, person, first,
self.verbose, self.endnotes,
self.EMPTY_DATE, self.EMPTY_PLACE)
text = self.__narrator.baptised_str(person, first, self.endnotes)
if text:
self.doc.write_text_citation(text)
text = ReportUtils.christened_str(self.database, person, first,
self.verbose, self.endnotes,
self.EMPTY_DATE, self.EMPTY_PLACE)
text = self.__narrator.christened_str(person, first, self.endnotes)
if text:
self.doc.write_text_citation(text)
span = self.calc_age(person)
text = ReportUtils.died_str(self.database, person, first, self.verbose,
self.EMPTY_DATE, self.EMPTY_PLACE, span)
text = self.__narrator.died_str(person, first, span)
if text:
death_ref = person.get_death_ref()
if death_ref:
@@ -630,9 +622,7 @@ class DetDescendantReport(Report):
self.doc.write_text_citation(text)
first = 0
text = ReportUtils.buried_str(self.database, person, first,
self.verbose, self.endnotes,
self.EMPTY_DATE, self.EMPTY_PLACE)
text = self.__narrator.buried_str(person, first, self.endnotes)
if text:
self.doc.write_text_citation(text)