martin/SilvrAPI
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

modified to use events, hopefully will fix the crashing particle

Browse Source
This commit is contained in:
Martin Donnelly 2016-02-12 16:32:32 +00:00
parent da0b134f53
commit 1143a32b8b
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
routes/temp.js
View File

@ -41,7 +41,7 @@ function connectDB() {
"use strict"; "use strict";
logger.debug('Connect db.'); logger.debug('Connect db.');
temp_db = new sqlite3.Database(file); temp_db = new sqlite3.Database(file);
console.log(temp_db); logger.log(temp_db);
return temp_db; return temp_db;
} }
@ -54,12 +54,12 @@ function createTable() {
function closeDB() { function closeDB() {
"use strict"; "use strict";
console.log('Closing db.'); logger.log('Closing db.');
temp_db.close(); temp_db.close();
} }
function insertTempReading(time, reading) { function insertTempReading(time, reading) {
console.log('Inserting reading:' + reading); logger.log('Inserting reading:' + reading);
// var sql = db.prepare('INSERT into temperature(date, reading) VALUES // var sql = db.prepare('INSERT into temperature(date, reading) VALUES
// (?,?)',[time],[reading]); // (?,?)',[time],[reading]);
@ -77,8 +77,8 @@ function insertTempReading(time, reading) {
var t = req.query; var t = req.query;
console.log('t:'); logger.log('t:');
console.log(JSON.stringify(t)); logger.log(JSON.stringify(t));
if (req.query != {} && req.query.temp != null) { if (req.query != {} && req.query.temp != null) {
// createDB(); // createDB();
@ -98,7 +98,7 @@ function insertTempReading(time, reading) {
/*router.get('/:id', function (req, res, next) { /*router.get('/:id', function (req, res, next) {
var id = req.params.id; var id = req.params.id;
console.log('id: ' + id); logger.log('id: ' + id);
res.writeHead(200, {"ContentType": "text/html"}); res.writeHead(200, {"ContentType": "text/html"});
//res.send(JSON.stringify(t)); //res.send(JSON.stringify(t));
res.end('ok'); res.end('ok');
@ -109,8 +109,8 @@ router.get('/reading', function (req, res, next) {
var t = req.query; var t = req.query;
console.log('t:'); logger.log('t:');
console.log(JSON.stringify(t)); logger.log(JSON.stringify(t));
res.writeHead(200, {"ContentType": "application/json"}); res.writeHead(200, {"ContentType": "application/json"});
//res.send(JSON.stringify(t)); //res.send(JSON.stringify(t));
@ -124,16 +124,11 @@ router.post('/', function (req, res, next) {
var t = req.body; var t = req.body;
var now = new Date(); var now = new Date();
var dataJSON; var dataJSON;
console.log('~~~~');
logger.debug(t);
console.log(typeof t);
//t = JSON.parse(t);
if(t.hasOwnProperty('data')){ if(t.hasOwnProperty('data')){
logger.debug('We have data');
var data = JSON.parse(t.data.toString()); var data = JSON.parse(t.data.toString());
if (data.hasOwnProperty('temp')) { if (data.hasOwnProperty('temp')) {
logger.log('We have temp! ' + data.temp);
busEmitter.emit("saveTempData", {time: now.toJSON(), value: parseFloat(data.temp)}); busEmitter.emit("saveTempData", {time: now.toJSON(), value: parseFloat(data.temp)});
} }
else else
@ -153,16 +148,16 @@ router.post('/', function (req, res, next) {
router.get('/all', function (req, res, next) { router.get('/all', function (req, res, next) {
"use strict"; "use strict";
console.log('Selecint all..'); logger.log('Selecint all..');
var db = connectDB(); var db = connectDB();
db.all('SELECT * from temp', function (err, rows) { db.all('SELECT * from temp', function (err, rows) {
var out = []; var out = [];
console.log(err); logger.log(err);
console.log(rows); logger.log(rows);
rows.forEach(function (row) { rows.forEach(function (row) {
console.log(row.date + ', ' + row.reading); logger.log(row.date + ', ' + row.reading);
// var t = ; // var t = ;
// out.push({"date": Date(row.date), "reading":row.reading}); // out.push({"date": Date(row.date), "reading":row.reading});
out.push({"date": row.date, "reading": row.reading}); out.push({"date": row.date, "reading": row.reading});