From 5cc1e051b9998df705306fc2c5de7f1ca29ae63f Mon Sep 17 00:00:00 2001 From: Alexander Blair Date: Wed, 15 Feb 2017 17:11:32 -0800 Subject: [PATCH] That's offset, not page! --- lib/api.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/api.js b/lib/api.js index 8771db7..2a38e73 100644 --- a/lib/api.js +++ b/lib/api.js @@ -164,6 +164,8 @@ app.get('/pool/blocks', function (req, res) { app.get('/pool/payments/:pool_type', function (req, res) { let pool_type = req.params.pool_type; + let limit = typeof(req.query.limit) !== 'undefined' ? Number(req.query.limit) : 10; + let page = typeof(req.query.page) !== 'undefined' ? Number(req.query.page) : 0; switch (pool_type) { case 'pplns': break; @@ -175,9 +177,9 @@ app.get('/pool/payments/:pool_type', function (req, res) { return res.json({'error': 'Invalid pool type'}); } let paymentIds = []; - let query = "SELECT distinct(transaction_id) as txnID FROM payments WHERE pool_type = ? ORDER BY transaction_id"; + let query = "SELECT distinct(transaction_id) as txnID FROM payments WHERE pool_type = ? ORDER BY transaction_id LIMIT ? OFFSET ?"; let response = []; - global.mysql.query(query, [pool_type]).then(function (rows) { + global.mysql.query(query, [pool_type, limit, page]).then(function (rows) { if (rows.length === 0) { return res.json([]); } @@ -212,7 +214,7 @@ app.get('/pool/payments/:pool_type', function (req, res) { app.get('/pool/payments', function (req, res) { let limit = typeof(req.query.limit) !== 'undefined' ? Number(req.query.limit) : 10; let page = typeof(req.query.page) !== 'undefined' ? Number(req.query.page) : 0; - let query = "SELECT * FROM transactions ORDER BY id DESC LIMIT ? page ?"; + let query = "SELECT * FROM transactions ORDER BY id DESC LIMIT ? OFFSET ?"; global.mysql.query(query, [limit, page]).then(function (rows) { if (rows.length === 0) { return res.json([]); @@ -238,7 +240,7 @@ app.get('/pool/payments', function (req, res) { }); }).catch(function (err) { console.error(threadName + "Error getting miner payments: " + JSON.stringify(err)); - res.json({error: 'Issue getting miner payments'}); + res.json({error: 'Issue getting pool payments'}); }); });