From 6c67289f84e587d101245a211dd86dcbc3d20aed Mon Sep 17 00:00:00 2001
From: Richard Meadows <richardeoin@gmail.com>
Date: Sun, 2 Aug 2015 13:02:46 +0100
Subject: [PATCH] Habitat upload done. 'time_created' corresponds to the
 backlog time, gets sorted correctly by the habitat couchdb views

---
 firmware/tools/habitat_upload.py | 10 +++++-----
 firmware/tools/raw_parser.py     | 10 +++++++---
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/firmware/tools/habitat_upload.py b/firmware/tools/habitat_upload.py
index 6fa8631..b4314a2 100644
--- a/firmware/tools/habitat_upload.py
+++ b/firmware/tools/habitat_upload.py
@@ -10,23 +10,23 @@ from datetime import datetime
 couch = couchdb.Server('http://habitat.habhub.org/')
 db = couch['habitat']
 
+"""
+Uploaded payload_telemetry to habhub
+"""
 def habitat_upload(rx_time, packet_string):
 
-    print packet_string
-
     # Packet ID
     packet_base64 = base64.standard_b64encode(packet_string+"\n")
     packet_sha256 = hashlib.sha256(packet_base64).hexdigest()
 
     # Time Created = backlog time
     time_created = rx_time.replace(microsecond=0).isoformat()+"+00:00"
-    print time_created
 
     # Time Uploaded = now
     now = datetime.utcnow()
     time_uploaded = now.replace(microsecond=0).isoformat()+"+00:00"
 
-    print db.save({
+    return db.save({
         "type":"payload_telemetry",
         "_id": packet_sha256,
         "data":{
@@ -35,7 +35,7 @@ def habitat_upload(rx_time, packet_string):
         "receivers": {
             "BACKLOG": {
                 "time_created": time_created,
-                "time_uploaded": time_created,
+                "time_uploaded": time_uploaded,
             }
         }
     })
diff --git a/firmware/tools/raw_parser.py b/firmware/tools/raw_parser.py
index 286b03f..c7b2604 100644
--- a/firmware/tools/raw_parser.py
+++ b/firmware/tools/raw_parser.py
@@ -140,6 +140,10 @@ with open(file_name, 'r') as data_file:
         print "%s: %s, %s" % ((str(datum['time']),) + datum['coords'][:2])
 
     # Upload data to habitat
-    datum = data[2]
-    ukhas_str = ukhas_format(datum)
-    habitat_upload(datum['time'], ukhas_str)
+    for datum in data[3:]:
+        ukhas_str = ukhas_format(datum)
+        try:
+            print ukhas_str
+            print habitat_upload(datum['time'], ukhas_str)
+        except:
+            None