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

93_DbRep: contrib V8.10.0

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@18331 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2019-01-19 07:23:05 +00:00
parent bc353e3b4a
commit 77b9271f7b
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
########################################################################################################## ##########################################################################################################
# $Id: 93_DbRep.pm 17862 2018-11-27 22:10:21Z DS_Starter $ # $Id: 93_DbRep.pm 18163 2019-01-06 17:13:00Z DS_Starter $
########################################################################################################## ##########################################################################################################
# 93_DbRep.pm # 93_DbRep.pm
# #
@ -57,6 +57,8 @@ no if $] >= 5.017011, warnings => 'experimental::smartmatch';
# Versions History intern # Versions History intern
our %DbRep_vNotesIntern = ( our %DbRep_vNotesIntern = (
"8.10.0" => "19.01.2019 sqlCmd may input SQL session variables, Forum:#96082",
"8.9.10" => "18.01.2019 fix warnings Malformed UTF-8 character during importFromFile, Forum:#96056 ",
"8.9.9" => "06.01.2019 diffval_DoParse: 'ORDER BY TIMESTAMP' added to statements Forum:https://forum.fhem.de/index.php/topic,53584.msg882082.html#msg882082", "8.9.9" => "06.01.2019 diffval_DoParse: 'ORDER BY TIMESTAMP' added to statements Forum:https://forum.fhem.de/index.php/topic,53584.msg882082.html#msg882082",
"8.9.8" => "27.11.2018 minor fix in deviceRename, commandref revised ", "8.9.8" => "27.11.2018 minor fix in deviceRename, commandref revised ",
"8.9.7" => "21.11.2018 DbRep_firstconnect now uses attribute \"timeout\" ", "8.9.7" => "21.11.2018 DbRep_firstconnect now uses attribute \"timeout\" ",
@ -129,6 +131,7 @@ our %DbRep_vNotesIntern = (
# Versions History extern: # Versions History extern:
our %DbRep_vNotesExtern = ( our %DbRep_vNotesExtern = (
"8.10.0" => "19.01.2019 In sqlCmd you may now take over SQL session variables like \"SET \@open:=NULL,\@closed:=NULL; SELECT ...\", Forum:#96082",
"8.9.0" => "07.11.2018 new command set delDoublets added. This command allows to delete multiple occuring identical records. ", "8.9.0" => "07.11.2018 new command set delDoublets added. This command allows to delete multiple occuring identical records. ",
"8.8.0" => "06.11.2018 new attribute 'fastStart'. Usually every DbRep-device is making a short connect to its database when " "8.8.0" => "06.11.2018 new attribute 'fastStart'. Usually every DbRep-device is making a short connect to its database when "
."FHEM is restarted. When this attribute is set, the initial connect is done when the DbRep-device is doing its " ."FHEM is restarted. When this attribute is set, the initial connect is done when the DbRep-device is doing its "
@ -5362,8 +5365,8 @@ sub impfile_Push($) {
$infile =~ s/%TSB/$rsf/g; $infile =~ s/%TSB/$rsf/g;
my @t = localtime; my @t = localtime;
$infile = ResolveDateWildcards($infile, @t); $infile = ResolveDateWildcards($infile, @t);
if (open(FH, "<:utf8", "$infile")) { if (open(FH, "<", "$infile")) {
binmode (FH) if(!$utf8); binmode (FH);
} else { } else {
$err = encode_base64("could not open ".$infile.": ".$!,""); $err = encode_base64("could not open ".$infile.": ".$!,"");
return "$name|''|''|$err|''"; return "$name|''|''|$err|''";
@ -5558,11 +5561,30 @@ sub sqlCmd_DoParse($) {
no warnings 'uninitialized'; no warnings 'uninitialized';
my $sql = ($cmd =~ m/\;$/)?$cmd:$cmd.";"; my $sql = ($cmd =~ m/\;$/)?$cmd:$cmd.";";
# split SQL-Parameter Statement falls mitgegeben
# z.B. SET @open:=NULL, @closed:=NULL; Select ...
my $set;
if($cmd =~ /^SET.*;/i) {
$cmd =~ m/^(SET.*?;)(.*)/i;
$set = $1;
$sql = $2;
}
if($set) {
Log3($name, 4, "DbRep $name - Set SQL session variables: $set");
eval {$dbh->do($set);}; # @\RB = Resetbit wenn neues Selektionsintervall beginnt
}
if ($@) {
$err = encode_base64($@,"");
Log3 ($name, 2, "DbRep $name - ERROR - $@");
$dbh->disconnect;
return "$name|''|$opt|$set|''|''|$err";
}
# Allow inplace replacement of keywords for timings (use time attribute syntax) # Allow inplace replacement of keywords for timings (use time attribute syntax)
$sql =~ s/§timestamp_begin§/'$runtime_string_first'/g; $sql =~ s/§timestamp_begin§/'$runtime_string_first'/g;
$sql =~ s/§timestamp_end§/'$runtime_string_next'/g; $sql =~ s/§timestamp_end§/'$runtime_string_next'/g;
# Debug "SQL :".$sql.":";
Log3($name, 4, "DbRep $name - SQL execute: $sql"); Log3($name, 4, "DbRep $name - SQL execute: $sql");
@ -5576,7 +5598,6 @@ sub sqlCmd_DoParse($) {
}; };
if ($@) { if ($@) {
# error bei sql-execute
$err = encode_base64($@,""); $err = encode_base64($@,"");
Log3 ($name, 2, "DbRep $name - ERROR - $@"); Log3 ($name, 2, "DbRep $name - ERROR - $@");
$dbh->disconnect; $dbh->disconnect;