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

Update filters and plugins for new place objects

Browse Source 
svn: r347
This commit is contained in:
Don Allingham
2001-08-19 03:53:02 +00:00
parent 3513293052
commit 49a308952b
12 changed files with 410 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/AncestorChart.py
View File

@@ -102,8 +102,8 @@ class AncestorReport:
N = person.getPrimaryName().getName()
b = person.getBirth().getDate()
d = person.getDeath().getDate()
B = person.getBirth().getPlace()
D = person.getDeath().getPlace()
B = person.getBirth().getPlace().get_title()
D = person.getDeath().getPlace().get_title()
i = "%s" % person.getId()
A = Config.attr_name
a = ""

6
src/plugins/AncestorReport.py
View File

@@ -170,7 +170,7 @@ class AncestorReport:
birth = person.getBirth()
if birth:
date = birth.getDateObj().get_start_date()
place = birth.getPlace()
place = birth.getPlace().get_title()
if place[-1:] == '.':
place = place[:-1]
if date.getDate() != "" or place != "":
@@ -199,7 +199,7 @@ class AncestorReport:
if death:
date = death.getDateObj().get_start_date()
place = death.getPlace()
place = death.getPlace().get_title()
if place[-1:] == '.':
place = place[:-1]
if date.getDate() != "" or place != "":
@@ -240,7 +240,7 @@ class AncestorReport:
if buried:
date = buried.getDateObj().get_start_date()
place = buried.getPlace()
place = buried.getPlace().get_title()
if place[-1:] == '.':
place = place[:-1]
if date.getDate() != "" or place != "":

10
src/plugins/EventCmp.py
View File

@@ -295,7 +295,7 @@ class EventComparison:
added = 0
if first:
tlist = [name,birth.getDate(),death.getDate()]
blist = ["",birth.getPlace(),death.getPlace()]
blist = ["",birth.getPlace().get_title(),death.getPlace().get_title()]
else:
tlist = ["","",""]
blist = ["","",""]
@@ -305,7 +305,7 @@ class EventComparison:
event = mylist[0]
del mylist[0]
tlist.append(event.getDate())
blist.append(event.getPlace())
blist.append(event.getPlace().get_title())
added = 1
else:
tlist.append("")
@@ -396,8 +396,8 @@ class EventComparison:
while done == 0:
added = 0
if first:
tlist = [name,birth.getDate(),death.getDate()]
blist = ["",birth.getPlace(),death.getPlace()]
tlist = [name,birth.getDate(),death.getDate().get_title()]
blist = ["",birth.getPlace(),death.getPlace().get_title()]
else:
tlist = ["","",""]
blist = ["","",""]
@@ -407,7 +407,7 @@ class EventComparison:
event = mylist[0]
del mylist[0]
tlist.append(event.getDate())
blist.append(event.getPlace())
blist.append(event.getPlace().get_title())
added = 1
else:
tlist.append("")

6
src/plugins/FamilyGroup.py
View File

@@ -164,7 +164,7 @@ class FamilyGroup:
self.doc.end_cell()
self.doc.start_cell("TextContentsEnd")
self.doc.start_paragraph('Normal')
self.doc.write_text(birth.getPlace())
self.doc.write_text(birth.getPlace().get_title())
self.doc.end_paragraph()
self.doc.end_cell()
self.doc.end_row()
@@ -182,7 +182,7 @@ class FamilyGroup:
self.doc.end_cell()
self.doc.start_cell("TextContentsEnd")
self.doc.start_paragraph('Normal')
self.doc.write_text(death.getPlace())
self.doc.write_text(death.getPlace().get_title())
self.doc.end_paragraph()
self.doc.end_cell()
self.doc.end_row()
@@ -228,7 +228,7 @@ class FamilyGroup:
def dump_child_event(self,text,name,event):
if event:
date = event.getDate()
place = event.getPlace()
place = event.getPlace().get_title()
else:
date = ""
place = ""

4
src/plugins/HtmlReport.py
View File

@@ -348,7 +348,7 @@ def print_event(html,name,event):
return
date = event.getDate()
place = event.getPlace()
place = event.getPlace().get_title()
if date != "" or place != "":
html.write("<H2>%s</H2>\n" % name)
@@ -465,7 +465,7 @@ def dump_person(person,prefix,templateTop,templateBottom,targetDir):
marriage = family.getMarriage()
if marriage and not alive and not spouse_alive:
place = marriage.getPlace()
place = marriage.getPlace().get_title()
date = marriage.getDate()
if place:
txt = _("Marriage place")

2
src/plugins/IndivSummary.py
View File

@@ -113,7 +113,7 @@ class IndivSummary:
return
name = event.getName()
date = event.getDate()
place = event.getPlace()
place = event.getPlace().get_title()
description = event.getDescription()
if date == "":
if place == "":

8
src/plugins/Merge.py
View File

@@ -479,15 +479,15 @@ class Merge:
name1 = person1.getPrimaryName().getName()
death1 = person1.getDeath().getDate()
dplace1 = person1.getDeath().getPlace()
dplace1 = person1.getDeath().getPlace().get_title()
birth1 = person1.getBirth().getDate()
bplace1 = person1.getBirth().getPlace()
bplace1 = person1.getBirth().getPlace().get_title()
name2 = person2.getPrimaryName().getName()
death2 = person2.getDeath().getDate()
dplace2 = person2.getDeath().getPlace()
dplace2 = person2.getDeath().getPlace().get_title()
birth2 = person2.getBirth().getDate()
bplace2 = person2.getBirth().getPlace()
bplace2 = person2.getBirth().getPlace().get_title()
if f2 and not f1:
self.topDialog.get_widget("bfather2").set_active(1)

4
src/plugins/ReadGedcom.py
View File

@@ -616,7 +616,7 @@ class GedcomParser:
elif matches[1] == "BIRT":
event = Event()
if self.person.getBirth().getDate() != "" or \
self.person.getBirth().getPlace() != "":
self.person.getBirth().getPlace().get_title() != "":
event.setName("Alternate Birth")
self.person.addEvent(event)
else:
@@ -631,7 +631,7 @@ class GedcomParser:
elif matches[1] == "DEAT":
event = Event()
if self.person.getDeath().getDate() != "" or \
self.person.getDeath().getPlace() != "":
self.person.getDeath().getPlace().get_title() != "":
event.setName("Alternate Death")
self.person.addEvent(event)
else:

4
src/plugins/WebPage.py
View File

@@ -300,7 +300,7 @@ class IndividualPage:
continue
name = _(event.getName())
date = event.getDate()
place = event.getPlace()
place = event.getPlace().get_title()
description = event.getDescription()
if date == "":
if place == "":
@@ -346,7 +346,7 @@ class IndividualPage:
return
name = event.getName()
date = event.getDate()
place = event.getPlace()
place = event.getPlace().get_title()
description = event.getDescription()
if date == "":
if place == "":

8
src/plugins/WriteGedcom.py
View File

@@ -262,8 +262,8 @@ def write_long_text(g,tag,level,note):
def dump_event_stats(g,event):
if event.getSaveDate() != "":
g.write("2 DATE %s\n" % cnvtxt(event.getSaveDate()))
if event.getPlace() != "":
g.write("2 PLAC %s\n" % cnvtxt(event.getPlace()))
if event.getPlace().get_title() != "":
g.write("2 PLAC %s\n" % cnvtxt(event.getPlace().get_title()))
if event.getNote() != "":
write_long_text(g,"NOTE",2,event.getNote())
if event.getSourceRef() != None:
@@ -368,13 +368,13 @@ def write_person(g,person):
birth = person.getBirth()
if not (private and birth.getPrivacy()):
if birth.getSaveDate() != "" or birth.getPlace() != "":
if birth.getSaveDate() != "" or birth.getPlace().get_title() != "":
g.write("1 BIRT\n")
dump_event_stats(g,birth)
death = person.getDeath()
if not (private and death.getPrivacy()):
if death.getSaveDate() != "" or death.getPlace() != "":
if death.getSaveDate() != "" or death.getPlace().get_title() != "":
g.write("1 DEAT\n")
dump_event_stats(g,death)