|
|
@@ -323,7 +323,7 @@ def rowValid(df,r,pars):
|
|
|
def updateAndValidateEntry(e,pars):
|
|
|
return True
|
|
|
|
|
|
-def generateEntries(df,r,pars):
|
|
|
+def generateEntries(df,r,getId,pars):
|
|
|
idField=pars.get('idField','ParticipantId')
|
|
|
id=getId(df,r,pars)
|
|
|
entry={}
|
|
|
@@ -462,7 +462,7 @@ def importData(pars,filename,getId=getId,modify=modify,\
|
|
|
for r in idx:
|
|
|
if not rowValid(df,r,pars):
|
|
|
continue
|
|
|
- rowEntries=generateEntries(df,r,pars)
|
|
|
+ rowEntries=generateEntries(df,r,getId,pars)
|
|
|
for e in rowEntries:
|
|
|
e=setEntry(e,df,r,objParse,pMap,pars)
|
|
|
if e==None:
|