FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 03:06:37 +00:00
Code Issues Releases Wiki Activity

extended tabledataquerys to realize more specific querys from frontend

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@3345 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
johannnes 2013-06-27 19:32:29 +00:00
parent a17e3a2f82
commit 92b6fc3cd7
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fhem/FHEM/93_DbLog.pm
View File

@ -976,8 +976,25 @@ sub prepareSql(@) {
} elsif($userquery eq "getcharts") { } elsif($userquery eq "getcharts") {
$sql = "SELECT * FROM frontend WHERE TYPE = 'savedchart'"; $sql = "SELECT * FROM frontend WHERE TYPE = 'savedchart'";
} elsif($userquery eq "getTableData") { } elsif($userquery eq "getTableData") {
$countsql = "SELECT count(*) FROM history"; if ($device ne '""' && $yaxis ne '""') {
$sql = "SELECT * FROM history LIMIT ".$paginglimit." OFFSET ".$pagingstart; $sql = "SELECT * FROM history WHERE READING = '$yaxis' AND DEVICE = '$device' ";
$sql .= "AND TIMESTAMP Between '$starttime' AND '$endtime'";
$sql .= " LIMIT '$paginglimit' OFFSET '$pagingstart'";
$countsql = "SELECT count(*) FROM history WHERE READING = '$yaxis' AND DEVICE = '$device' ";
$countsql .= "AND TIMESTAMP Between '$starttime' AND '$endtime'";
} elsif($device ne '""' && $yaxis eq '""') {
$sql = "SELECT * FROM history WHERE DEVICE = '$device' ";
$sql .= "AND TIMESTAMP Between '$starttime' AND '$endtime'";
$sql .= " LIMIT '$paginglimit' OFFSET '$pagingstart'";
$countsql = "SELECT count(*) FROM history WHERE DEVICE = '$device' ";
$countsql .= "AND TIMESTAMP Between '$starttime' AND '$endtime'";
} else {
$sql = "SELECT * FROM history";
$sql .= " WHERE TIMESTAMP Between '$starttime' AND '$endtime'";
$sql .= " LIMIT '$paginglimit' OFFSET '$pagingstart'";
$countsql = "SELECT count(*) FROM history";
$countsql .= " WHERE TIMESTAMP Between '$starttime' AND '$endtime'";
}
return ($sql, $countsql); return ($sql, $countsql);
} else { } else {
$sql = "error"; $sql = "error";