|
@@ -301,7 +301,7 @@ def validate(qv):
|
|
|
def modify(qv,columnName):
|
|
def modify(qv,columnName):
|
|
|
return qv
|
|
return qv
|
|
|
|
|
|
|
|
-def getId(df,r):
|
|
|
|
|
|
|
+def getId(df,r,pars):
|
|
|
try:
|
|
try:
|
|
|
rawId=str(df.at[r,'ID'])
|
|
rawId=str(df.at[r,'ID'])
|
|
|
except KeyError:
|
|
except KeyError:
|
|
@@ -376,7 +376,7 @@ def importData(pars,filename,getId=getId,modify=modify,\
|
|
|
for r in idx:
|
|
for r in idx:
|
|
|
if not rowValid(df,r,pars):
|
|
if not rowValid(df,r,pars):
|
|
|
continue
|
|
continue
|
|
|
- id=getId(df,r)
|
|
|
|
|
|
|
+ id=getId(df,r,pars)
|
|
|
entry={}
|
|
entry={}
|
|
|
entry[idField]=id
|
|
entry[idField]=id
|
|
|
|
|
|
