From 4c6a25f5b4b5d20c5323a842e122da966cd95889 Mon Sep 17 00:00:00 2001 From: tobiasfaust <> Date: Fri, 28 Mar 2014 09:38:23 +0000 Subject: [PATCH] DbLog: fixedrange=hour works now correctly git-svn-id: https://svn.fhem.de/fhem/trunk@5348 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/93_DbLog.pm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index dfd528a73..cf8291259 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,6 +1,7 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. - SVN + - bugfix: DbLog: fixedrange=hour works now correctly - bugfix: Dashboard: dashboard_showfullsize not applied in room "all" - feature: new module 98_PID20.pm added (John / betateilchen) - feature: new module 00_RPII2C.pm, 52_I2C_PCA9532.pm, 52_I2C_PCF8574.pm, diff --git a/fhem/FHEM/93_DbLog.pm b/fhem/FHEM/93_DbLog.pm index cef844a16..baab34441 100644 --- a/fhem/FHEM/93_DbLog.pm +++ b/fhem/FHEM/93_DbLog.pm @@ -824,7 +824,7 @@ DbLog_Get($@) $stm .= "AND READING = '".$readings[$i]->[1]."' " if ($readings[$i]->[1] !~ m(\%)); $stm .= "AND READING LIKE '".$readings[$i]->[1]."' " if(($readings[$i]->[1] !~ m(^%$)) && ($readings[$i]->[1] =~ m(\%))); - $stm .= "AND TIMESTAMP > $sqlspec{from_timestamp} + $stm .= "AND TIMESTAMP >= $sqlspec{from_timestamp} AND TIMESTAMP < $sqlspec{to_timestamp} ORDER BY TIMESTAMP";