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

Move from object references to IDs

Browse Source 
svn: r2822
This commit is contained in:
Don Allingham
2004-02-14 05:40:30 +00:00
parent 0c30564388
commit 015973462a
110 changed files with 5349 additions and 5292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

242
src/plugins/DetDescendantReport.py
View File

@@ -85,8 +85,8 @@ class DetDescendantReport(Report.Report):
else:
self.genKeys[cur_gen-1].append(index)
for family in person.getFamilyList():
for child in family.getChildList():
for family in person.get_family_id_list():
for child in family.get_child_id_list():
ix = max(self.map.keys())
self.apply_filter(child, ix+1, cur_gen+1)
@@ -114,14 +114,14 @@ class DetDescendantReport(Report.Report):
NAME 0
"""
num_children= len(family.getChildList())
num_children= len(family.get_child_id_list())
if num_children > 0:
self.doc.start_paragraph("DDR-ChildTitle")
if family.getMother() != None:
mother= family.getMother().getPrimaryName().getRegularName()
if family.get_mother_id() != None:
mother= family.get_mother_id().get_primary_name().get_regular_name()
else: mother= "unknown"
if family.getFather() != None:
father= family.getFather().getPrimaryName().getRegularName()
if family.get_father_id() != None:
father= family.get_father_id().get_primary_name().get_regular_name()
else: father= "unknown"
self.doc.start_bold()
if num_children == 1:
@@ -130,74 +130,74 @@ class DetDescendantReport(Report.Report):
self.doc.end_bold()
self.doc.end_paragraph()
for child in family.getChildList():
for child in family.get_child_id_list():
self.doc.start_paragraph("DDR-ChildList")
name= child.getPrimaryName().getRegularName()
birth= child.getBirth()
death= child.getDeath()
name= child.get_primary_name().get_regular_name()
birth= child.get_birth()
death= child.get_death()
if rptOptions.childRef == reportOptions.Yes:
childID= child.getId()
childID= child.get_id()
if self.prevGenIDs.get(childID) != None:
name= "[" + str(self.prevGenIDs.get(childID)) + "] "+ name
#print "Child List: <", birth.getDate(), ">", birth.getPlaceName()
if birth.getDate() != "":
#print birth.getPlaceName()
if birth.getPlaceName() != "":
if death.getDate() != "":
if death.getPlaceName() != "":
#print "Child List: <", birth.get_date(), ">", birth.get_place_name()
if birth.get_date() != "":
#print birth.get_place_name()
if birth.get_place_name() != "":
if death.get_date() != "":
if death.get_place_name() != "":
self.doc.write_text(_("- %s Born: %s %s Died: %s %s") % \
(name, birth.getDate(), birth.getPlaceName(),
death.getDate(), death.getPlaceName())) # f
(name, birth.get_date(), birth.get_place_name(),
death.get_date(), death.get_place_name())) # f
else:
self.doc.write_text(_("- %s Born: %s %s Died: %s") % \
(name, birth.getDate(), birth.getPlaceName(),
death.getDate())) # e
elif death.getPlaceName() != "":
(name, birth.get_date(), birth.get_place_name(),
death.get_date())) # e
elif death.get_place_name() != "":
self.doc.write_text(_("- %s Born: %s %s Died: %s") % \
(name, birth.getDate(), birth.getPlaceName(),
death.getPlaceName())) # d
(name, birth.get_date(), birth.get_place_name(),
death.get_place_name())) # d
else: self.doc.write_text(_("- %s Born: %s %s") % \
(name, birth.getDate(), birth.getPlaceName())) # c
(name, birth.get_date(), birth.get_place_name())) # c
else:
if death.getDate() != "":
if death.getPlaceName() != "":
if death.get_date() != "":
if death.get_place_name() != "":
self.doc.write_text(_("- %s Born: %s Died: %s %s") % \
(name, birth.getDate(), death.getDate(), \
death.getPlaceName())) # b
(name, birth.get_date(), death.get_date(), \
death.get_place_name())) # b
else:
self.doc.write_text(_("- %s Born: %s Died: %s") % \
(name, birth.getDate(), death.getDate())) # a
elif death.getPlaceName() != "":
(name, birth.get_date(), death.get_date())) # a
elif death.get_place_name() != "":
self.doc.write_text(_("- %s Born: %s Died: %s") % \
(name, birth.getDate(), death.getPlaceName())) # 9
(name, birth.get_date(), death.get_place_name())) # 9
else: self.doc.write_text(_("- %s Born: %s") % \
(name, birth.getDate())) # 8
(name, birth.get_date())) # 8
else:
if birth.getPlaceName() != "":
if death.getDate() != "":
if death.getPlaceName() != "":
if birth.get_place_name() != "":
if death.get_date() != "":
if death.get_place_name() != "":
self.doc.write_text(_("- %s Born: %s Died: %s %s") % \
(name, birth.getPlaceName(), \
death.getDate(), death.getPlaceName())) # 7
(name, birth.get_place_name(), \
death.get_date(), death.get_place_name())) # 7
else:
self.doc.write_text(_("- %s Born: %s Died: %s") % \
(name, birth.getPlaceName(), death.getDate())) # 6
elif death.getPlaceName() != "":
(name, birth.get_place_name(), death.get_date())) # 6
elif death.get_place_name() != "":
self.doc.write_text(_("- %s Born: %s Died: %s") % \
(name, birth.getPlaceName(), death.getPlaceName())) # 5
(name, birth.get_place_name(), death.get_place_name())) # 5
else: self.doc.write_text(_("- %s Born: %s") % \
(name, birth.getPlaceName())) # 4
(name, birth.get_place_name())) # 4
else:
if death.getDate() != "":
if death.getPlaceName() != "":
if death.get_date() != "":
if death.get_place_name() != "":
self.doc.write_text(_("- %s Died: %s %s") % \
(name, death.getDate(), death.getPlaceName())) # 3
(name, death.get_date(), death.get_place_name())) # 3
else:
self.doc.write_text(_("- %s Died: %s") % \
(name, death.getDate())) # 2
elif death.getPlaceName() != "":
(name, death.get_date())) # 2
elif death.get_place_name() != "":
self.doc.write_text(_("- %s Died: %s") % \
(name, death.getPlaceName())) # 1
(name, death.get_place_name())) # 1
else: self.doc.write_text(_("- %s") % name) # 0
self.doc.end_paragraph()
@@ -211,11 +211,11 @@ class DetDescendantReport(Report.Report):
if rptOptions.addImages == reportOptions.Yes:
self.insert_images(person)
name = person.getPrimaryName().getRegularName()
name = person.get_primary_name().get_regular_name()
if rptOptions.firstName == reportOptions.Yes:
firstName= person.getPrimaryName().getFirstName()
elif person.getGender() == RelLib.Person.male:
firstName= person.get_primary_name().get_first_name()
elif person.get_gender() == RelLib.Person.male:
firstName= _("He")
else:
firstName= _("She")
@@ -230,13 +230,13 @@ class DetDescendantReport(Report.Report):
keys.sort()
for dkey in keys:
if dkey >= key: break
if self.map[key].getId() == self.map[dkey].getId():
if self.map[key].get_id() == self.map[dkey].get_id():
self.doc.write_text(_(" is the same person as [%s].") % str(dkey))
self.doc.end_paragraph()
return 1 # Duplicate person
# Check birth record
birth = person.getBirth()
birth = person.get_birth()
if birth:
self.write_birth(person, rptOptions)
self.write_death(person, firstName, rptOptions)
@@ -246,13 +246,13 @@ class DetDescendantReport(Report.Report):
self.write_mate(person, rptOptions)
if person.getNote() != "" and rptOptions.includeNotes == reportOptions.Yes:
if person.get_note() != "" and rptOptions.includeNotes == reportOptions.Yes:
self.doc.start_paragraph("DDR-NoteHeader")
self.doc.start_bold()
self.doc.write_text(_("Notes for %s" % name))
self.doc.end_bold()
self.doc.end_paragraph()
self.doc.write_note(person.getNote(),person.getNoteFormat(),"DDR-Entry")
self.doc.write_note(person.get_note(),person.get_note_format(),"DDR-Entry")
return 0 # Not duplicate person
@@ -269,24 +269,24 @@ class DetDescendantReport(Report.Report):
was born in ____________.
"""
birth = person.getBirth()
birth = person.get_birth()
if birth:
date = birth.getDateObj().get_start_date()
if birth.getPlaceName() != "":
place = birth.getPlaceName()
date = birth.get_date_object().get_start_date()
if birth.get_place_name() != "":
place = birth.get_place_name()
if place[-1:] == '.':
place = place[:-1]
elif rptOptions.blankDate == reportOptions.Yes:
place= "______________"
else: place= ""
if date.getDate() != "":
if date.get_date() != "":
if date.getDayValid() and date.getMonthValid() and \
rptOptions.fullDate == reportOptions.Yes:
if place != "":
self.doc.write_text(_(" was born on %s in %s.") % (date.getDate(), place))
self.doc.write_text(_(" was born on %s in %s.") % (date.get_date(), place))
else:
self.doc.write_text(_(" was born on %s.") % date.getDate())
self.doc.write_text(_(" was born on %s.") % date.get_date())
elif place != "":
self.doc.write_text(_(" was born in the year %s in %s.") % \
(date.getYear(), place))
@@ -327,19 +327,19 @@ class DetDescendantReport(Report.Report):
.
"""
t= ""
death = person.getDeath()
death = person.get_death()
if death != None:
date = death.getDateObj().get_start_date()
place = death.getPlaceName()
date = death.get_date_object().get_start_date()
place = death.get_place_name()
if place[-1:] == '.':
place = place[:-1]
elif place == "" and rptOptions.blankPlace == reportOptions.Yes:
place= "_____________"
if date.getDate() != "":
if date.get_date() != "":
if date.getDay() and date.getMonth() and \
rptOptions.fullDate == reportOptions.Yes:
fulldate= date.getDate()
fulldate= date.get_date()
elif date.getMonth() and rptOptions.fullDate == reportOptions.Yes:
fulldate= "%s %s" % (date.getMonth(), date.getYear())
else: fulldate= ""
@@ -366,20 +366,20 @@ class DetDescendantReport(Report.Report):
else: return
t= ""
famList= person.getFamilyList()
famList= person.get_family_id_list()
if len(famList) > 0:
for fam in famList:
buried= None
if buried:
date = buried.getDateObj().get_start_date()
place = buried.getPlaceName()
date = buried.get_date_object().get_start_date()
place = buried.get_place_name()
if place[-1:] == '.':
place = place[:-1]
fulldate= ""
if date.getDate() != "":
if date.get_date() != "":
if date.getDayValid() and date.getMonthValid() and \
rptOptions.fullDate == reportOptions.Yes:
fulldate= date.getDate()
fulldate= date.get_date()
elif rptOptions.blankDate == reportOptions.Yes:
fulldate= "___________"
@@ -405,17 +405,17 @@ class DetDescendantReport(Report.Report):
FIRSTNAME was the daughter of FATHER.
FIRSTNAME was the daughter of MOTHER.
"""
ext_family= person.getMainParents()
ext_family= person.get_main_parents_family_id()
if ext_family != None:
if ext_family.getFather() != None:
father= ext_family.getFather().getPrimaryName().getRegularName()
if ext_family.get_father_id() != None:
father= ext_family.get_father_id().get_primary_name().get_regular_name()
else: father= ""
if ext_family.getMother() != None:
mother= ext_family.getMother().getPrimaryName().getRegularName()
if ext_family.get_mother_id() != None:
mother= ext_family.get_mother_id().get_primary_name().get_regular_name()
else: mother= ""
if father != "" or mother != "":
if person.getGender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.male:
if father != "":
if mother != "":
self.doc.write_text(_(" %s was the son of %s and %s.") % \
@@ -446,15 +446,15 @@ class DetDescendantReport(Report.Report):
HE/SHE married SPOUSE in PLACE.
HE/SHE married SPOUSE
"""
famList= person.getFamilyList()
famList= person.get_family_id_list()
if len(famList) > 0:
fam_num= 0
for fam in famList:
fam_num= fam_num + 1
spouse= ""
if person.getGender() == RelLib.Person.male:
if fam.getMother() != None:
spouse= fam.getMother().getPrimaryName().getRegularName()
if person.get_gender() == RelLib.Person.male:
if fam.get_mother_id() != None:
spouse= fam.get_mother_id().get_primary_name().get_regular_name()
if fam_num == 1:
heshe= _("He")
elif fam_num < len(famList):
@@ -467,25 +467,25 @@ class DetDescendantReport(Report.Report):
heshe= _(",")
else: heshe= _("and she")
if fam.getFather() != None:
spouse= fam.getFather().getPrimaryName().getRegularName()
if fam.get_father_id() != None:
spouse= fam.get_father_id().get_primary_name().get_regular_name()
marriage= fam.getMarriage()
marriage= fam.get_marriage()
fulldate= ""
place= ""
if marriage != None:
if marriage.getPlace() != None and \
marriage.getPlaceName() != "":
place= marriage.getPlaceName()
if marriage.get_place_id() != None and \
marriage.get_place_name() != "":
place= marriage.get_place_name()
elif rptOptions.blankPlace == reportOptions.Yes:
place= "____________"
date= marriage.getDateObj()
date= marriage.get_date_object()
if date != None:
if date.getYearValid():
if date.getDayValid() and date.getMonthValid() and \
rptOptions.fullDate == reportOptions.Yes:
fulldate= date.getDate()
fulldate= date.get_date()
elif rptOptions.blankDate == reportOptions.Yes:
fulldate= "__________"
@@ -514,20 +514,20 @@ class DetDescendantReport(Report.Report):
def write_mate(self, person, rptOptions):
"""Output birth, death, parentage, marriage and notes information """
for fam in person.getFamilyList():
for fam in person.get_family_id_list():
mate = ""
if person.getGender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.male:
heshe = _("She")
if fam.getMother():
mate = fam.getMother()
mateName = mate.getPrimaryName().getRegularName()
mateFirstName = mate.getPrimaryName().getFirstName()
if fam.get_mother_id():
mate = fam.get_mother_id()
mateName = mate.get_primary_name().get_regular_name()
mateFirstName = mate.get_primary_name().get_first_name()
else:
heshe = _("He")
if fam.getFather():
mate = fam.getFather()
mateName = mate.getPrimaryName().getRegularName()
mateFirstName = mate.getPrimaryName().getFirstName()
if fam.get_father_id():
mate = fam.get_father_id()
mateName = mate.get_primary_name().get_regular_name()
mateFirstName = mate.get_primary_name().get_first_name()
if mate:
self.doc.start_paragraph("DDR-Entry")
@@ -545,7 +545,7 @@ class DetDescendantReport(Report.Report):
self.doc.end_paragraph()
#if rptOptions.listChildren == reportOptions.Yes \
# and mate.getGender() == RelLib.Person.male:
# and mate.get_gender() == RelLib.Person.male:
# self.write_children(fam, rptOptions)
#--------------------------------------------------------------------
@@ -555,12 +555,12 @@ class DetDescendantReport(Report.Report):
#--------------------------------------------------------------------
def insert_images(self, person):
photos = person.getPhotoList()
photos = person.get_photo_list()
paragraph_started = 0
for photo in photos :
object = photo.getReference()
if object.getMimeType()[0:5] == "image":
file = object.getPath()
object = photo.get_reference()
if object.get_mime_type()[0:5] == "image":
file = object.get_path()
if not paragraph_started:
self.doc.start_paragraph("DDR-Entry")
paragraph_started = 1
@@ -581,18 +581,18 @@ class DetDescendantReport(Report.Report):
self.cur_gen= 1
self.apply_filter(self.start,1)
name = self.start.getPrimaryName().getRegularName()
name = self.start.get_primary_name().get_regular_name()
famList= self.start.getFamilyList()
famList= self.start.get_family_id_list()
spouseName= ""
if len(famList) > 0:
for fam in famList:
if self.start.getGender() == RelLib.Person.male:
if fam.getMother() != None:
spouseName= fam.getMother().getPrimaryName().getFirstName()
if self.start.get_gender() == RelLib.Person.male:
if fam.get_mother_id() != None:
spouseName= fam.get_mother_id().get_primary_name().get_first_name()
else:
if fam.getFather() != None:
spouseName= fam.getFather().getPrimaryName().getFirstName()
if fam.get_father_id() != None:
spouseName= fam.get_father_id().get_primary_name().get_first_name()
self.doc.start_paragraph("DDR-Title")
if spouseName != "":
@@ -621,12 +621,12 @@ class DetDescendantReport(Report.Report):
for key in self.genKeys[generation]:
person = self.map[key]
self.genIDs[person.getId()]= key
self.genIDs[person.get_id()]= key
dupPerson= self.write_person(key, rptOpt)
if dupPerson == 0: # Is this a duplicate ind record
if rptOpt.listChildren == reportOptions.Yes and \
len(person.getFamilyList()) > 0:
family= person.getFamilyList()[0]
len(person.get_family_id_list()) > 0:
family= person.get_family_id_list()[0]
self.write_children(family, rptOpt)
#if rptOpt.addImages == reportOptions.Yes:
@@ -931,7 +931,7 @@ class DetDescendantBareReportDialog(Report.BareReportDialog):
self.options = opt
self.db = database
if self.options[0]:
self.person = self.db.getPerson(self.options[0])
self.person = self.db.get_person(self.options[0])
else:
self.person = person
@@ -1104,7 +1104,7 @@ class DetDescendantBareReportDialog(Report.BareReportDialog):
if self.new_person:
self.person = self.new_person
self.options = ( self.person.getId(), self.max_gen, self.pg_brk,
self.options = ( self.person.get_id(), self.max_gen, self.pg_brk,
self.first_name, self.full_date, self.list_children,
self.include_notes, self.place, self.date, self.age,
self.dup_persons, self.child_ref, self.images )
@@ -1120,7 +1120,7 @@ def write_book_item(database,person,doc,options,newpage=0):
All user dialog has already been handled and the output file opened."""
try:
if options[0]:
person = database.getPerson(options[0])
person = database.get_person(options[0])
max_gen = int(options[1])
pg_brk = int(options[2])
rptOpt = reportOptions()
@@ -1311,8 +1311,8 @@ class reportOptions:
null
"""
birth= ind.getBirth().getDateObj().get_start_date()
death= ind.getDeath().getDateObj().get_start_date()
birth= ind.get_birth().get_date_object().get_start_date()
death= ind.get_death().get_date_object().get_start_date()
#print "birth=", birth.__dict__
#print "death=", death.__dict__
self.t= ""