Merge pull request #1 from openaps/dev

Pull dev to master

3 files changed, 25 insertions, 2 deletions

diff --git a/dexcom_reader/database_records.py b/dexcom_reader/database_records.py
index 1afb593..79ae323 100644
--- a/dexcom_reader/database_records.py
+++ b/dexcom_reader/database_records.py
@@ -95,6 +95,8 @@ class InsertionRecord(GenericTimestampedRecord):
 
   @property
   def insertion_time(self):
+    if self.data[2] == 0xFFFFFFFF:
+      return self.system_time
     return util.ReceiverTimeToTime(self.data[2])
 
   @property
diff --git a/dexcom_reader/readdata.py b/dexcom_reader/readdata.py
index c94e5a6..3009f37 100644
--- a/dexcom_reader/readdata.py
+++ b/dexcom_reader/readdata.py
@@ -249,16 +249,23 @@ class Dexcom(object):
   def iter_records (self, record_type):
     assert record_type in constants.RECORD_TYPES
     page_range = self.ReadDatabasePageRange(record_type)
-    for x in xrange(page_range[1], page_range[0] or 1, -1):
+    start, end = page_range
+    if start != end or not end:
+      end += 1
+    for x in reversed(xrange(start, end)):
       records = list(self.ReadDatabasePage(record_type, x))
       records.reverse( )
       for record in records:
         yield record
+  
   def ReadRecords(self, record_type):
     records = []
     assert record_type in constants.RECORD_TYPES
     page_range = self.ReadDatabasePageRange(record_type)
-    for x in range(page_range[0], page_range[1] or 1):
+    start, end = page_range
+    if start != end or not end:
+      end += 1
+    for x in range(start, end):
       records.extend(self.ReadDatabasePage(record_type, x))
     return records
 
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 @@
+import readdata
+
+dd = readdata.Dexcom.FindDevice()
+dr = readdata.Dexcom(dd)
+meter_records = dr.ReadRecords('METER_DATA')
+print 'First Meter Record = '
+print meter_records[0]
+print 'Last Meter Record ='  
+print meter_records[-1]
+insertion_records = dr.ReadRecords('INSERTION_TIME')
+print 'First Insertion Record = '
+print insertion_records[0]
+print 'Last Insertion Record = '
+print insertion_records[-1]