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 V 8.53.0

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@28348 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2024-01-06 14:53:34 +00:00
parent 8cd585af79
commit 9aab6923dc
1 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -831,7 +831,7 @@ sub DbRep_Set {
return; return;
} }
if ($opt eq "index") { if ($opt eq 'index') {
DbRep_setLastCmd (@a); DbRep_setLastCmd (@a);
Log3 ($name, 3, "DbRep $name - ################################################################"); Log3 ($name, 3, "DbRep $name - ################################################################");
Log3 ($name, 3, "DbRep $name - ### New Index operation ###"); Log3 ($name, 3, "DbRep $name - ### New Index operation ###");
@ -843,7 +843,7 @@ sub DbRep_Set {
return; return;
} }
if ($opt eq "adminCredentials" && $hash->{ROLE} ne "Agent") { if ($opt eq 'adminCredentials' && $hash->{ROLE} ne "Agent") {
return "Credentials are incomplete, use username password" if (!$prop || !$prop1); return "Credentials are incomplete, use username password" if (!$prop || !$prop1);
my $success = DbRep_setcredentials($hash, "adminCredentials", $prop, $prop1); my $success = DbRep_setcredentials($hash, "adminCredentials", $prop, $prop1);
@ -855,7 +855,7 @@ sub DbRep_Set {
} }
} }
if ($opt =~ /countEntries/ && $hash->{ROLE} ne "Agent") { if ($opt eq 'countEntries' && $hash->{ROLE} ne "Agent") {
my $table = $prop // "history"; my $table = $prop // "history";
DbRep_setLastCmd ($name, $opt, $table); DbRep_setLastCmd ($name, $opt, $table);
@ -863,7 +863,8 @@ sub DbRep_Set {
return; return;
} }
elsif ($opt =~ /fetchrows/ && $hash->{ROLE} ne "Agent") {
if ($opt eq 'fetchrows' && $hash->{ROLE} ne "Agent") {
my $table = $prop // "history"; my $table = $prop // "history";
DbRep_setLastCmd ($name, $opt, $table); DbRep_setLastCmd ($name, $opt, $table);
@ -2562,7 +2563,7 @@ sub DbRep_Main {
my ($epoch_seconds_begin,$epoch_seconds_end,$runtime_string_first,$runtime_string_next); my ($epoch_seconds_begin,$epoch_seconds_end,$runtime_string_first,$runtime_string_next);
if ($dbrep_hmainf{$opt} && exists &{$dbrep_hmainf{$opt}{fn}}) { if (defined $dbrep_hmainf{$opt} && defined &{$dbrep_hmainf{$opt}{fn}}) {
$params = { $params = {
hash => $hash, hash => $hash,
name => $name, name => $name,
@ -12981,6 +12982,10 @@ sub DbRep_nextMultiCmd {
CommandDeleteAttr (undef, "-silent $name $ma") if(defined AttrVal($name, $ma, undef)); CommandDeleteAttr (undef, "-silent $name $ma") if(defined AttrVal($name, $ma, undef));
} }
my $ok = 0;
my $cmd = '';
my $la = '';
for my $k (sort{$a<=>$b} keys %{$data{DbRep}{$name}{multicmd}}) { for my $k (sort{$a<=>$b} keys %{$data{DbRep}{$name}{multicmd}}) {
my $mcmd = delete $data{DbRep}{$name}{multicmd}{$k}; my $mcmd = delete $data{DbRep}{$name}{multicmd}{$k};
@ -12992,12 +12997,29 @@ sub DbRep_nextMultiCmd {
CommandAttr (undef, "-silent $name device $mcmd->{device}") if($mcmd->{device}); CommandAttr (undef, "-silent $name device $mcmd->{device}") if($mcmd->{device});
CommandAttr (undef, "-silent $name reading $mcmd->{reading}") if($mcmd->{reading}); CommandAttr (undef, "-silent $name reading $mcmd->{reading}") if($mcmd->{reading});
Log3 ($name, 4, "DbRep $name - Start multiCmd index >$k<"); $cmd = (split " ", $mcmd->{cmd})[0];
if (defined $dbrep_hmainf{$cmd}) {
$cmd = $mcmd->{cmd};
$la = 'start';
$ok = 1;
}
else {
$la = "don't contain a valid command -> skip $cmd";
}
Log3 ($name, 4, "DbRep $name - multiCmd index >$k< $la");
CommandSet (undef, "$name $mcmd->{cmd}");
last; # immer nur den ersten verbliebenen Eintrag abarbeiten last; # immer nur den ersten verbliebenen Eintrag abarbeiten
} }
if ($ok) {
CommandSet (undef, "$name $cmd");
}
else {
DbRep_nextMultiCmd ($name); # nächsten Eintrag abarbeiten falls Kommando ungültig
}
return; return;
} }