stv0g/vzlogger
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixed "Data has to be processed first!" exception when requesting a interval with no data

Browse source
This commit is contained in:
Steffen Vogel 2011-02-27 15:08:06 +01:00
parent cbfccdfd7b
commit 2092a257f2
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/Interpreter/MeterInterpreter.php
View file

@ -38,6 +38,7 @@ class MeterInterpreter extends Interpreter {
protected $min = NULL;
protected $max = NULL;
protected $consumption = NULL;
protected $tuples = NULL;
protected $resolution;
/**
@ -45,7 +46,7 @@ class MeterInterpreter extends Interpreter {
* @return float total consumption
*/
public function getConsumption() {
if (is_null($this->consumption)) throw new \Exception('Data has to be processed first!');
if (is_null($this->consumption) && is_null($this->tuples)) throw new \Exception('Data has to be processed first!');
return $this->consumption / $this->resolution;
}
@ -55,7 +56,7 @@ class MeterInterpreter extends Interpreter {
* @return array (0 => timestamp, 1 => value)
*/
public function getMin() {
if (is_null($this->min)) throw new \Exception('Data has to be processed first!');
if (is_null($this->min) && is_null($this->tuples)) throw new \Exception('Data has to be processed first!');
return $this->min;
}
@ -65,7 +66,7 @@ class MeterInterpreter extends Interpreter {
* @return array (0 => timestamp, 1 => value)
*/
public function getMax() {
if (is_null($this->max)) throw new \Exception('Data has to be processed first!');
if (is_null($this->max) && is_null($this->tuples)) throw new \Exception('Data has to be processed first!');
return $this->max;
}
@ -86,10 +87,11 @@ class MeterInterpreter extends Interpreter {
* @return array with timestamp, values, and pulse count
*/
public function processData($count, $groupBy, $callback) {
$pulses = parent::getData($count, $groupBy);
$this->tuples = count($pulses);
$this->resolution = $this->channel->getProperty('resolution');
$this->consumption = 0;
$pulses = parent::getData($count, $groupBy);
$tuples = array();
$last = $pulses->rewind();