FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 18:59:33 +00:00
Code Issues Releases Wiki Activity

93_DbRep: contrib 8.26.0

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@20095 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2019-09-02 22:08:04 +00:00
parent 0d12ab0da9
commit d6e1ef2ace
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fhem/contrib/DS_Starter/93_DbRep.pm
View File

@ -2843,7 +2843,7 @@ sub count_DoParse($) {
if ($@) {
$err = encode_base64($@,"");
Log3 ($name, 2, "DbRep $name - $@");
return "$name|''|$device|$reading|''|$err|$table";
return "$name|''|$device|''|$err|$table";
}
# only for this block because of warnings if details of readings are not set
@ -2898,7 +2898,7 @@ sub count_DoParse($) {
$err = encode_base64($@,"");
Log3 ($name, 2, "DbRep $name - $@");
$dbh->disconnect;
return "$name|''|$device|$reading|''|$err|$table";
return "$name|''|$device|''|$err|$table";
}
if($ced) {
@ -9169,16 +9169,15 @@ sub DbRep_createDeleteSql($$$$$$$) {
# add valueFilter
$sql .= $vf if(defined $vf);
# Timestamp Filter
if (($tf && $tn)) {
$sql .= "TIMESTAMP >= $tf AND TIMESTAMP ".($tnfull?"<=":"<")." $tn ";
if ($tf && $tn) {
$sql .= "TIMESTAMP >= '$tf' AND TIMESTAMP ".($tnfull?"<=":"<")." '$tn' $addon;";
} else {
if ($dbmodel eq "POSTGRESQL") {
$sql .= "true ";
$sql .= "true;";
} else {
$sql .= "1 ";
$sql .= "1;";
}
}
$sql .= "$addon;";
return $sql;
}