diff options
author | Ben West <bewest@gmail.com> | 2015-10-15 17:38:33 -0700 |
---|---|---|
committer | Ben West <bewest@gmail.com> | 2015-10-15 17:38:33 -0700 |
commit | 0f044c789d0e2a7ef13913073b2e7a3fb4c354e0 (patch) | |
tree | eb5e30b104957421ebce0147a74877066c056f41 | |
parent | d724922e9b15dc902126a374bd6b95f0ad763740 (diff) | |
parent | f98204dc88c8186e7b1cbd1aa8ca38d12dba1b52 (diff) |
Merge pull request #2 from channemann/wip/fix-pages
Wip/fix pages
-rw-r--r-- | dexcom_reader/readdata.py | 9 | ||||
-rw-r--r-- | dexcom_reader/record_test.py | 14 |
2 files changed, 21 insertions, 2 deletions
diff --git a/dexcom_reader/readdata.py b/dexcom_reader/readdata.py index fb1863f..3009f37 100644 --- a/dexcom_reader/readdata.py +++ b/dexcom_reader/readdata.py | |||
@@ -250,17 +250,22 @@ class Dexcom(object): | |||
250 | assert record_type in constants.RECORD_TYPES | 250 | assert record_type in constants.RECORD_TYPES |
251 | page_range = self.ReadDatabasePageRange(record_type) | 251 | page_range = self.ReadDatabasePageRange(record_type) |
252 | start, end = page_range | 252 | start, end = page_range |
253 | # for x in xrange(page_range[1], page_range[0] or 1, -1): | 253 | if start != end or not end: |
254 | end += 1 | ||
254 | for x in reversed(xrange(start, end)): | 255 | for x in reversed(xrange(start, end)): |
255 | records = list(self.ReadDatabasePage(record_type, x)) | 256 | records = list(self.ReadDatabasePage(record_type, x)) |
256 | records.reverse( ) | 257 | records.reverse( ) |
257 | for record in records: | 258 | for record in records: |
258 | yield record | 259 | yield record |
260 | |||
259 | def ReadRecords(self, record_type): | 261 | def ReadRecords(self, record_type): |
260 | records = [] | 262 | records = [] |
261 | assert record_type in constants.RECORD_TYPES | 263 | assert record_type in constants.RECORD_TYPES |
262 | page_range = self.ReadDatabasePageRange(record_type) | 264 | page_range = self.ReadDatabasePageRange(record_type) |
263 | for x in range(page_range[0], page_range[1] or 1): | 265 | start, end = page_range |
266 | if start != end or not end: | ||
267 | end += 1 | ||
268 | for x in range(start, end): | ||
264 | records.extend(self.ReadDatabasePage(record_type, x)) | 269 | records.extend(self.ReadDatabasePage(record_type, x)) |
265 | return records | 270 | return records |
266 | 271 | ||
diff --git a/dexcom_reader/record_test.py b/dexcom_reader/record_test.py new file mode 100644 index 0000000..eb82358 --- /dev/null +++ b/dexcom_reader/record_test.py | |||
@@ -0,0 +1,14 @@ | |||
1 | import readdata | ||
2 | |||
3 | dd = readdata.Dexcom.FindDevice() | ||
4 | dr = readdata.Dexcom(dd) | ||
5 | meter_records = dr.ReadRecords('METER_DATA') | ||
6 | print 'First Meter Record = ' | ||
7 | print meter_records[0] | ||
8 | print 'Last Meter Record =' | ||
9 | print meter_records[-1] | ||
10 | insertion_records = dr.ReadRecords('INSERTION_TIME') | ||
11 | print 'First Insertion Record = ' | ||
12 | print insertion_records[0] | ||
13 | print 'Last Insertion Record = ' | ||
14 | print insertion_records[-1] | ||