Skip to content

Commit 3e7ab7e

Browse files
committed
Add basic date handling to makePersonasFromEvent
1 parent 72754b9 commit 3e7ab7e

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

matching-algorithm/algorithm.py

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
class Persona:
1414
def __init__(
15-
self, eventId, firstName, lastName, meeting, activeDate,
15+
self, eventId, firstName, lastName, meeting, activeDate=None,
1616
middleNames='', birthdate=None, deathdate=None
1717
):
1818
self.eventId = eventId
@@ -92,12 +92,15 @@ def loadCSV(filepath):
9292

9393
return data
9494

95-
def makePersonasFromEvent(event):
95+
def makePersonasFromEvent(event, eventTypeList):
9696
"""Given a dict representing an event, return a list of persona objects
9797
"""
9898
# Initialize list of personas that we'll eventually return
9999
personas = []
100100

101+
# Get the type of event we're handling
102+
eventType = event['event']
103+
101104
# Handle main persona first
102105
# (build up a dict, and then feed it into the obj constructor)
103106
# Basic categories:
@@ -107,7 +110,16 @@ def makePersonasFromEvent(event):
107110
mainPers['lastName'] = event['Last Name']
108111
mainPers['meeting'] = event['Meeting']
109112

110-
113+
# Dates
114+
if eventType in eventTypeList['birthEvents']:
115+
mainPers('birthdate') = event['Date']
116+
elif eventType in eventTypeList['deathEvents']:
117+
mainPers('deathdate') = event['Date']
118+
else:
119+
mainPers(activeDate) = event['Date']
120+
121+
return [1,2] #placeholder return value
122+
111123
# Check the following fields for potential personas:
112124
# Children
113125
# Mother
@@ -132,7 +144,7 @@ def makePersonasFromEvent(event):
132144
if __name__ == "__main__":
133145

134146
# Define which types of events belong to which categories
135-
eventList = {
147+
eventTypeList = {
136148
'birthEvents': ['b', 'b ?', 'bapt', 'B', 'bapt'],
137149
'deathEvents': ['d', 'dec', 'dec ?', 'bur'],
138150
'disciplEvents': ['dis', 'ack', 'relrq', 'com', 'jas', 'con', 'mcd',

0 commit comments

Comments
 (0)