diff --git a/rowers/models.py b/rowers/models.py index 57b8aaee..b8cb3562 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -335,12 +335,13 @@ class PowerZonesField(models.TextField): #c2url = 'http://www.concept2.com/indoor-rowers/racing/records/world?machine=1&event=All&gender=All&age=All&weight=All' -c2url = 'https://www.concept2.com/indoor-rowers/racing/records/world?machine=rower&event=&gender=&age_category=&weight_class=&adaptive=0&op=Search&form_id=concept2_record_search_form#results' - +#c2url = 'https://www.concept2.com/indoor-rowers/racing/records/world?machine=rower&event=&gender=&age_category=&weight_class=&adaptive=0&op=Search&form_id=concept2_record_search_form#results' +c2url = 'https://www.concept2.com/records?record_type=world&machine=rower&event=&gender=&age_category=&weight_class=&adaptive_rower=0' def update_records(url=c2url, verbose=True): ssl._create_default_https_context = ssl._create_unverified_context try: + response = requests.get(url) dfs = pd.read_html(url, attrs={'class': 'views-table'}) df = dfs[0] df.columns = df.columns.str.strip() diff --git a/rowers/tasks.py b/rowers/tasks.py index 99d10b3d..a9feb7a3 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -3990,25 +3990,6 @@ def fetch_strava_workout(stravatoken, oauth_data, stravaid, csvfilename, userid, row.write_csv(csvfilename, compressed=False) except ComputeError: dologging('stravalog.log','polars not working') - dologging('stravalog.log',{'TimeStamp (sec)': unixtime, - ' Horizontal (meters)': dist2, - ' Cadence (stokes/min)': spm, - ' HRCur (bpm)': hr, - ' longitude': loncoord, - ' latitude': latcoord, - ' Stroke500mPace (sec/500m)': pace, - ' Power (watts)': power, - ' DragFactor': np.zeros(nr_rows), - ' DriveLength (meters)': np.zeros(nr_rows), - ' StrokeDistance (meters)': strokelength, - ' DriveTime (ms)': np.zeros(nr_rows), - ' StrokeRecoveryTime (ms)': np.zeros(nr_rows), - ' AverageDriveForce (lbs)': np.zeros(nr_rows), - ' PeakDriveForce (lbs)': np.zeros(nr_rows), - ' lapIdx': lapidx, - ' ElapsedTime (sec)': seconds, - 'cum_dist': dist2, - }) row = rowingdata.rowingdata(df=df.to_pandas()) row.write_csv(csvfilename) diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index 87ec242e..963c5e23 100644 Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ