Merge branch 'hotfix/gzipped'

rowers/dataprep.py

@@ -117,6 +117,9 @@ def repair_data(verbose=False):
 def rdata(file,rower=rrower()):
     try:
 	res = rrdata(file,rower=rower)
+    except IOError:
+        try:
+            res = rrdata(file+'.gz',rower=rower)
         except IOError:
 	    res = 0
 
@@ -271,6 +274,17 @@ def smalldataprep(therows,xparam,yparam1,yparam2):
         try:
             rowdata = dataprep(rrdata(f1).df)
         
+            rowdata = pd.DataFrame({xparam: rowdata[xparam],
+                                    yparam1: rowdata[yparam1],
+                                    yparam2: rowdata[yparam2],
+                                    'distance': rowdata['distance'],
+                                    'spm': rowdata['spm'],
+            }
+            )
+            df = pd.concat([df,rowdata],ignore_index=True)
+        except IOError:
+            try:
+                rowdata = dataprep(rrdata(f1+'.gz').df)
                 rowdata = pd.DataFrame({xparam: rowdata[xparam],
                                         yparam1: rowdata[yparam1],
                                         yparam2: rowdata[yparam2],

rowers/dataprepnodjango.py

@@ -81,6 +81,9 @@ def timedeltaconv(x):
 def rdata(file,rower=rrower()):
     try:
 	res = rrdata(file,rower=rower)
+    except IOError:
+        try:
+            res = rrdata(file+'.gz',rower=rower)
         except IOError:
 	    res = 0
 
@@ -211,6 +214,17 @@ def smalldataprep(therows,xparam,yparam1,yparam2):
         try:
             rowdata = dataprep(rrdata(f1).df)
         
+            rowdata = pd.DataFrame({xparam: rowdata[xparam],
+                                    yparam1: rowdata[yparam1],
+                                    yparam2: rowdata[yparam2],
+                                    'distance': rowdata['distance'],
+                                    'spm': rowdata['spm'],
+            }
+            )
+            df = pd.concat([df,rowdata],ignore_index=True)
+        except IOError:
+            try:
+                rowdata = dataprep(rrdata(f1+'.gz').df)
                 rowdata = pd.DataFrame({xparam: rowdata[xparam],
                                         yparam1: rowdata[yparam1],
                                         yparam2: rowdata[yparam2],

rowers/mailprocessing.py

@@ -38,6 +38,9 @@ def send_confirm(u,name,link):
 def rdata(file,rower=rrower()):
     try:
 	res = rrdata(file,rower=rower)
+    except IOError:
+        try:
+            res = rrdata(file+'.gz',rower=rower)
         except IOError:
 	    res = 0
 

rowers/tasks.py

@@ -98,7 +98,11 @@ def handle_sendemailcsv(first_name,last_name,email,csvfile):
 def handle_otwsetpower(f1,boattype,weightvalue,
                        first_name,last_name,email,workoutid,
                        debug=False):
+    try:
         rowdata = rdata(f1)
+    except IOError:
+        rowdata = rdata(f1+'.csv')
+        
     weightvalue = float(weightvalue)
 
     # do something with boat type
@@ -165,7 +169,11 @@ def handle_makeplot(f1,f2,t,hrdata,plotnr,imagename):
     rr = rowingdata.rower(hrmax=hrmax,hrut2=hrut2,
 			  hrut1=hrut1,hrat=hrat,
 			  hrtr=hrtr,hran=hran)
+    try:
         row = rdata(f2,rower=rr)
+    except IOError:
+        row = rdata(f2+'.gz',rower=rr)
+        
     nr_rows = len(row.df)
     if (plotnr in [1,2,4,5,8,11,9,12]) and (nr_rows > 1200):
 	bin = int(nr_rows/1200.)

rowers/views.py

@@ -130,6 +130,9 @@ def error403_view(request):
 def rdata(file,rower=rrower()):
     try:
 	res = rrdata(file,rower=rower)
+    except IOError:
+        try:
+            res = rrdata(file+'.gz',rower=rower)
         except IOError:
             res = 0