From 56cfa24eb4036a8c3328e966daee305f5a46c5fb Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Tue, 20 Aug 2013 17:03:41 +0200 Subject: [PATCH] Include worker diff in API Addresses #145 --- public/include/classes/worker.class.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/public/include/classes/worker.class.php b/public/include/classes/worker.class.php index d9b87945..28dcc94a 100644 --- a/public/include/classes/worker.class.php +++ b/public/include/classes/worker.class.php @@ -110,7 +110,16 @@ class Worker { WHERE username = w.username AND time > DATE_SUB(now(), INTERVAL 10 MINUTE) - ) AS hashrate + ) AS hashrate, + ( + SELECT IFNULL(IF(our_result='Y', ROUND(SUM(IF(difficulty=0, pow(2, (" . $this->config['difficulty'] . " - 16)), difficulty)) / COUNT(id), 2), 0), 0) + FROM " . $this->share->getTableName() . " + WHERE username = w.username AND time > DATE_SUB(now(), INTERVAL 10 MINUTE) + ) + ( + SELECT IFNULL(IF(our_result='Y', ROUND(SUM(IF(difficulty=0, pow(2, (" . $this->config['difficulty'] . " - 16)), difficulty)) / COUNT(id), 2), 0), 0) + FROM " . $this->share->getArchiveTableName() . " + WHERE username = w.username AND time > DATE_SUB(now(), INTERVAL 10 MINUTE) + ) AS difficulty FROM $this->table AS w WHERE id = ? ");