From f1a0c84e6e1be9a542dace292e7e6011e4e67a14 Mon Sep 17 00:00:00 2001
From: Martin Donnelly <martind2000@gmail.com>
Date: Mon, 29 Aug 2016 16:45:02 +0100
Subject: [PATCH] =?UTF-8?q?=E2=80=9D2016-08-29=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mdot/mdot_server/mdot_server/filler.js        | 15 ++++++++-------
 mdot/mdot_server/mdot_server/lib/mdot/mdot.js |  2 ++
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/mdot/mdot_server/mdot_server/filler.js b/mdot/mdot_server/mdot_server/filler.js
index 803639f..e3959b4 100644
--- a/mdot/mdot_server/mdot_server/filler.js
+++ b/mdot/mdot_server/mdot_server/filler.js
@@ -48,8 +48,8 @@ var mdot = require('./lib/mdot/mdot.js');
     var ids = ['CENSIS-LoRa-1','CENSIS-LoRa-2','CENSIS-LoRa-3','CENSIS-LoRa-4','HIE-mobile-1','HIE-demo','HIE-mobile-2','HIE-smart-campus-1','HIE-smart-campus-2','HIE-smart-campus-3','HIE-smart-campus-4','HIE-smart-campus-5','HIE-smart-campus-6','HIE-smart-campus-7','HIE-mDot-1'];
     var data = {id: ids[device]};
 
-    var startTs = Sugar.Date.create('2016-08-19 14:46:48');
-    var endTs = Sugar.Date.create('2016-08-21 10:03:39');
+    var startTs = Sugar.Date.create('2016-07-19 14:46:48');
+    var endTs = Sugar.Date.create('2016-08-29 10:03:39');
    // logger.debug(startTs, endTs);
    // logger.debug(startTs.getTime(), endTs.getTime());
 
@@ -61,16 +61,17 @@ var mdot = require('./lib/mdot/mdot.js');
       .then(function(d) {
         'use strict';
         //Logger.debug(d);
+        logger.info('Number of items:', d.events.length);
         for (var item in d.events) {
           var newItem = d.events[item].evt;
           newItem.topic=['','','','',ids[device]].join('/');
-     //     logger.debug(newItem);
-          var gwTime = new Date(newItem.gateway_info['0'].gw_time);
-          if ((gwTime > startTs) && (gwTime < endTs))  {
-            doInsertEntry(newItem);
+        //  logger.debug(newItem);
+        //  var gwTime = new Date(newItem.gateway_info['0'].gw_time);
+         /* if ((gwTime > startTs) && (gwTime < endTs))  {
+        //    doInsertEntry(newItem);
           } else {
             logger.warn('Out of range...');
-          }
+          }*/
 
         }
 
diff --git a/mdot/mdot_server/mdot_server/lib/mdot/mdot.js b/mdot/mdot_server/mdot_server/lib/mdot/mdot.js
index f273a75..cb6883f 100644
--- a/mdot/mdot_server/mdot_server/lib/mdot/mdot.js
+++ b/mdot/mdot_server/mdot_server/lib/mdot/mdot.js
@@ -31,6 +31,7 @@ function getData(data, prev) {
 
     var options = {
       uri: 'https://qz0da4.internetofthings.ibmcloud.com/api/v0002/historian/types/mDot/devices/' + data.id + range,
+      //uri: 'https://qz0da4.internetofthings.ibmcloud.com/api/v0002/historian/types/Ti-CC3200/devices/LightingISP15',
       headers: {
               Authorization: buildAuthentication()
             },
@@ -51,6 +52,7 @@ function getData(data, prev) {
               Array.prototype.push.apply(prev.events, d.events);
 
               if (d.hasOwnProperty('bookmark')) {
+                logger.info('Getting more...');
                 data.bookmark = d.bookmark;
                 getData(data, prev).then(function(d) {
                   resolve(d);