From b9528076af0abbd8294159db7ca1db2cbd6bbea5 Mon Sep 17 00:00:00 2001 From: johannnes Date: Sat, 16 Mar 2013 17:27:24 +0000 Subject: [PATCH] minors git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@2930 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/www/frontend/FHEM/93_DbLog.pm | 4 ++-- fhem/www/frontend/controls_frontend.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fhem/www/frontend/FHEM/93_DbLog.pm b/fhem/www/frontend/FHEM/93_DbLog.pm index 2f4741b03..7c857ea49 100644 --- a/fhem/www/frontend/FHEM/93_DbLog.pm +++ b/fhem/www/frontend/FHEM/93_DbLog.pm @@ -776,7 +776,7 @@ sub prepareSql(@_) { my ($sql, $jsonstring, $countsql); if($userquery eq "getreadings") { - $sql = "SELECT distinct(reading) FROM current WHERE device = '".$device."'"; + $sql = "SELECT distinct(reading) FROM history WHERE device = '".$device."'"; } elsif($userquery eq "getdevices") { $sql = "SELECT distinct(device) FROM history"; } elsif($userquery eq "timerange") { @@ -808,7 +808,7 @@ sub chartQuery($@) { my ($sql, $countsql) = prepareSql(@_); if ($sql eq "error") { - return jsonError("Could not setup SQL String"); + return jsonError("Could not setup SQL String. Maybe the Database is busy, please try again!"); } my ($hash, @a) = @_; my $dbhf= $hash->{DBHF}; diff --git a/fhem/www/frontend/controls_frontend.txt b/fhem/www/frontend/controls_frontend.txt index 6ac532bb6..5f4c512b4 100644 --- a/fhem/www/frontend/controls_frontend.txt +++ b/fhem/www/frontend/controls_frontend.txt @@ -37,7 +37,7 @@ DIR www/frontend/lib/ext-4.1.1a/images/gray/grid DIR www/frontend/lib/ext-4.1.1a/images/gray/util DIR www/frontend/lib/ext-4.1.1a/images/gray/panel-header DIR www/frontend/lib/ext-4.1.1a/images/gray/tip -UPD 2013-03-07_12:12:22 49744 FHEM/93_DbLog.pm +UPD 2013-03-16_05:44:48 49791 FHEM/93_DbLog.pm UPD 2013-03-08_07:13:10 563 www/frontend/index.html UPD 2013-03-06_11:11:22 236 www/frontend/README.txt UPD 2013-03-08_01:44:54 613 www/frontend/app/userconfig.js