diff --git a/rowers/dataprepnodjango.py b/rowers/dataprepnodjango.py index f41498fb..15f66293 100644 --- a/rowers/dataprepnodjango.py +++ b/rowers/dataprepnodjango.py @@ -140,10 +140,10 @@ def timedeltaconv(x): def rdata(file,rower=rrower()): try: - res = rrdata(file,rower=rower) + res = rrdata(csvfile=file,rower=rower) except IOError: try: - res = rrdata(file+'.gz',rower=rower) + res = rrdata(csvfile=file+'.gz',rower=rower) except IOError: res = 0 @@ -948,7 +948,7 @@ def smalldataprep(therows,xparam,yparam1,yparam2): f1 = workout.csvfilename try: - rowdata = dataprep(rrdata(f1).df) + rowdata = dataprep(rrdata(csvfile=f1).df) rowdata = pd.DataFrame({xparam: rowdata[xparam], yparam1: rowdata[yparam1], @@ -960,7 +960,7 @@ def smalldataprep(therows,xparam,yparam1,yparam2): df = pd.concat([df,rowdata],ignore_index=True) except IOError: try: - rowdata = dataprep(rrdata(f1+'.gz').df) + rowdata = dataprep(rrdata(csvfile=f1+'.gz').df) rowdata = pd.DataFrame({xparam: rowdata[xparam], yparam1: rowdata[yparam1], yparam2: rowdata[yparam2], diff --git a/rowers/mailprocessing.py b/rowers/mailprocessing.py index 37017602..fb275a11 100644 --- a/rowers/mailprocessing.py +++ b/rowers/mailprocessing.py @@ -64,18 +64,18 @@ def send_confirm(user, name, link, options): def rdata(file, rower=rrower()): """ Reads rowingdata data or returns 0 on Error """ try: - result = rrdata(file, rower=rower) + result = rrdata(csvfile=file, rower=rower) except IOError: try: - result = rrdata(file + '.gz', rower=rower) + result = rrdata(csvfile=file + '.gz', rower=rower) except IOError: result = 0 except TypeError: try: - result = rrdata(file) + result = rrdata(csvfile=file) except IOError: try: - result = rrdata(file+'.gz', rower=rower) + result = rrdata(csvfile=file+'.gz', rower=rower) except IOError: result = 0