From f1c52a97a0710dc734e7e245243020909daf5fcb Mon Sep 17 00:00:00 2001 From: Gustavo Cortez Date: Wed, 5 Feb 2014 14:17:19 -0300 Subject: [PATCH 1/2] added limit to method blocks by date --- lib/BlockDb.js | 5 +++-- test/integration/blocklist.js | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/BlockDb.js b/lib/BlockDb.js index 39e220de..fa654c1f 100644 --- a/lib/BlockDb.js +++ b/lib/BlockDb.js @@ -128,11 +128,12 @@ function spec(b) { }); }; - BlockDb.prototype.getBlocksByDate = function(start_ts, end_ts, cb) { + BlockDb.prototype.getBlocksByDate = function(start_ts, end_ts, limit, cb) { var list = []; db.createReadStream({ start: TIMESTAMP_ROOT + start_ts, - end: TIMESTAMP_ROOT + end_ts + end: TIMESTAMP_ROOT + end_ts, + limit: limit }) .on('data', function (data) { list.push({ diff --git a/test/integration/blocklist.js b/test/integration/blocklist.js index 26e5d415..d1ed33dc 100644 --- a/test/integration/blocklist.js +++ b/test/integration/blocklist.js @@ -7,6 +7,7 @@ var TESTING_BLOCK0 = '000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d7 var TESTING_BLOCK1 = '00000000b873e79784647a6c82962c70d228557d24a747ea4d1b8bbe878e1206'; var START_TS = 1; var END_TS = '1296688928~'; // 2/2/2011 23:23PM +var LIMIT = 2; var assert = require('assert'), BlockDb = require('../../lib/BlockDb').class(); @@ -23,7 +24,7 @@ describe('BlockDb getBlocksByDate', function(){ it('Get Hash by Date', function(done) { - bDb.getBlocksByDate(START_TS, END_TS, function(err, list) { + bDb.getBlocksByDate(START_TS, END_TS, LIMIT, function(err, list) { if (err) done(err); assert(list, 'returns list'); assert.equal(list.length,2, 'list has 2 items'); From 2a2a2110f5ee2c81a38ad54c8d036c305cc43206 Mon Sep 17 00:00:00 2001 From: Gustavo Cortez Date: Wed, 5 Feb 2014 15:11:39 -0300 Subject: [PATCH 2/2] front-end of block list by date is ready. fillCache for getting blocks. --- app/controllers/blocks.js | 54 ++++++++++++++++----------------------- lib/BlockDb.js | 3 ++- public/js/config.js | 4 +-- 3 files changed, 26 insertions(+), 35 deletions(-) diff --git a/app/controllers/blocks.js b/app/controllers/blocks.js index 4acc1207..468bc13a 100644 --- a/app/controllers/blocks.js +++ b/app/controllers/blocks.js @@ -72,7 +72,7 @@ console.log('[blocks.js.60]: could not get %s from RPC. Orphan? Error?', blockha * List of blocks by date */ exports.list = function(req, res) { - var limit = req.query.limit || 0; + var limit = req.query.limit || -1; var isToday = false; //helper to convert timestamps to yyyy-mm-dd format @@ -103,37 +103,27 @@ exports.list = function(req, res) { var prev = formatTimestamp(new Date((gte - 86400) * 1000)); var next = formatTimestamp(new Date(lte * 1000)); - /* - Block - .find({ - time: { - '$gte': gte, - '$lte': lte + bdb.getBlocksByDate(gte, lte, limit, function(err, blocks) { + if (err) { + res.status(500).send(err); + } + else { + var blockshashList = []; + for(var i=0;i