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

GrampsType support for FamilyRelations, Events

Browse Source 
svn: r6371
This commit is contained in:
Don Allingham
2006-04-19 22:59:33 +00:00
parent 41b4119796
commit 41a9e9205c
28 changed files with 359 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/Check.py
View File

@@ -552,9 +552,9 @@ class CheckIntegrity:
self.db.commit_person(person,self.trans)
self.invalid_events.append(key)
else:
if not birth.get_type()[0] == RelLib.Event.BIRTH:
if int(birth.get_type()) != RelLib.EventType.BIRTH:
# Birth event was not of the type "Birth"
birth.set_type((RelLib.Event.BIRTH,""))
birth.set_type(RelLib.EventType(RelLib.EventType.BIRTH))
self.db.commit_event(birth,self.trans)
self.invalid_birth_events.append(key)
death_ref = person.get_death_ref()
@@ -568,9 +568,9 @@ class CheckIntegrity:
self.db.commit_person(person,self.trans)
self.invalid_events.append(key)
else:
if not death.get_type()[0] == RelLib.Event.DEATH:
if int(death.get_type()) != RelLib.EventType.DEATH:
# Death event was not of the type "Death"
death.set_type((RelLib.Event.DEATH,""))
death.set_type(RelLib.EventType(RelLib.EventType.DEATH))
self.db.commit_event(death,self.trans)
self.invalid_death_events.append(key)

2
src/plugins/ExportVCalendar.py
View File

@@ -208,7 +208,7 @@ class CalendarWriter:
if family:
for event_ref in family.get_event_ref_list():
event = self.db.get_event_from_handle(event_ref.ref)
if event.get_type()[0] == RelLib.Event.MARRIAGE:
if int(event.get_type()) == RelLib.EventType.MARRIAGE:
m_date = event.get_date_object()
place_handle = event.get_place_handle()
text = _("Marriage of %s") % Utils.family_name(family,self.db)

14
src/plugins/FamilyGroup.py
View File

@@ -223,7 +223,7 @@ class FamilyGroup(Report.Report):
birth_ref = person.get_birth_ref()
birth = None
evtName = Utils.personal_events[RelLib.Event.BIRTH]
evtName = str(RelLib.EventType())
if birth_ref:
birth = self.database.get_event_from_handle(birth_ref.ref)
if birth or self.missingInfo:
@@ -231,7 +231,7 @@ class FamilyGroup(Report.Report):
death_ref = person.get_death_ref()
death = None
evtName = Utils.personal_events[RelLib.Event.DEATH]
evtName = str(RelLib.EventType(RelLib.EventType.DEATH))
if death_ref:
death = self.database.get_event_from_handle(death_ref.ref)
if death or self.missingInfo:
@@ -334,7 +334,7 @@ class FamilyGroup(Report.Report):
for event_ref in family_ref_list:
if event_ref:
event = self.database.get_event_from_handle(event_ref.ref)
if event.get_type()[0] == RelLib.Event.MARRIAGE:
if int(event.get_type()) == RelLib.EventType.MARRIAGE:
m = event
break
@@ -348,14 +348,14 @@ class FamilyGroup(Report.Report):
self.doc.end_cell()
self.doc.end_row()
evtName = Utils.family_events[RelLib.Event.MARRIAGE]
evtName = str(RelLib.EventType(RelLib.EventType.MARRIAGE))
self.dump_parent_event(evtName,m)
for event_ref in family_ref_list:
if event_ref:
event = self.database.get_event_from_handle(event_ref.ref)
evtType = event.get_type()
if evtType[0] != RelLib.Event.MARRIAGE:
if int(evtType) != RelLib.EventType.MARRIAGE:
name = Utils.format_event( evtType )
self.dump_parent_event(name,event)
@@ -462,7 +462,7 @@ class FamilyGroup(Report.Report):
for event_ref in family.get_event_ref_list():
if event_ref:
event = self.database.get_event_from_handle(event_ref.ref)
if event.get_type()[0] == RelLib.Event.MARRIAGE:
if int(event.get_type()) == RelLib.EventType.MARRIAGE:
m = event
break
@@ -511,7 +511,7 @@ class FamilyGroup(Report.Report):
self.doc.end_row()
if m:
evtName = Utils.family_events[RelLib.Event.MARRIAGE]
evtName = str(RelLib.EventType(RelLib.EventType.MARRIAGE))
if index == families:
self.dump_child_event('FGR-TextChild2',evtName,m)
else:

2
src/plugins/GraphViz.py
View File

@@ -351,7 +351,7 @@ class GraphViz:
for event_ref in fam.get_event_ref_list():
if event_ref:
event = self.database.get_event_from_handle(event_ref.ref)
if event.get_type() == RelLib.Event.MARRIAGE:
if int(event.get_type()) == RelLib.EventType.MARRIAGE:
m = event
break
else:

6
src/plugins/ImportvCard.py
View File

@@ -173,7 +173,7 @@ class VCardParser:
def add_name(self, fields, data):
data_fields = data.split(";")
name = RelLib.Name()
name.set_type("Also Known As")
name.set_type(RelLib.NameType(RelLib.NameType.AKA))
name.set_surname(data_fields[0])
name.set_first_name(data_fields[1])
if data_fields[2]:
@@ -185,7 +185,7 @@ class VCardParser:
def add_title(self, fields, data):
name = RelLib.Name()
name.set_type("Also Known As")
name.set_type(RelLib.NameType(RelLib.NameType.AKA))
name.set_title(data)
self.person.add_alternate_name(name)
@@ -206,7 +206,7 @@ class VCardParser:
def add_birthday(self, fields, data):
event = RelLib.Event()
event.set_name("Birth")
event.set_type(RelLib.EventType(RelLib.EventType.BIRTH))
self.db.add_event(event,self.trans)
self.person.set_birth_handle(event.get_handle())

5
src/plugins/Verify.py
View File

@@ -244,10 +244,9 @@ class Verify(Tool.Tool, ManagedWindow.ManagedWindow):
if event_ref:
event_handle = event_ref.ref
event = self.db.get_event_from_handle(event_handle)
event_name = event.get_type()[0]
if event_name == RelLib.Event.BURIAL:
if int(event.get_type()) == RelLib.EventType.BURIAL:
buryear = self.get_year( event.get_handle() )
elif event_name == RelLib.Event.BAPTISM:
elif int(event.get_type()) == RelLib.EventType.BAPTISM:
bapyear = self.get_year( event.get_handle() )
if byear>0 and bapyear>0: