FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-21 01:46:08 +00:00
Code Issues Releases Wiki Activity

98_JsonMod.pm: #109413: list shrink reduced to computed readings

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21517 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
herrmannj 2020-03-25 23:14:35 +00:00
parent a9969502e0
commit c95a9fd870
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fhem/FHEM/98_JsonMod.pm
View File

@ -30,6 +30,7 @@ use utf8;
use Time::Local qw( timelocal timegm ); use Time::Local qw( timelocal timegm );
use Text::Balanced qw ( extract_codeblock extract_delimited ); use Text::Balanced qw ( extract_codeblock extract_delimited );
use Unicode::Normalize qw( NFD ); use Unicode::Normalize qw( NFD );
use List::Util qw( any );
use HttpUtils; use HttpUtils;
#use Memory::Usage; #use Memory::Usage;
@ -474,20 +475,25 @@ sub JsonMod_DoReadings {
}; };
if (my $readingList = AttrVal($name, 'readingList', '')) { if (my $readingList = AttrVal($name, 'readingList', '')) {
# support for perl expressions within
my $NAME = $name; my $NAME = $name;
if (not eval $readingList and $@) { if (not eval $readingList and $@) {
JsonMod_Logger($hash, 2, 'error while evaluating readingList: %s', $@); JsonMod_Logger($hash, 2, 'error while evaluating readingList: %s', $@);
return; return;
}; };
if (keys %{$newReadings}) { if (keys %{$newReadings}) {
my @newReadings;
my @oldReadings = split ',', ReadingsVal($name, '.computedReadings', '');
readingsBeginUpdate($hash); readingsBeginUpdate($hash);
foreach my $k (keys %{$newReadings}) { foreach my $k (keys %{$newReadings}) {
readingsBulkUpdate($hash, $k, $newReadings->{$k}); readingsBulkUpdate($hash, $k, $newReadings->{$k});
push @newReadings, $k;
}; };
# not used anymore # not used anymore
foreach my $k (keys %{$oldReadings}) { foreach my $k (keys %{$oldReadings}) {
readingsDelete($hash, $k) if ($oldReadings->{$k} == 0); readingsDelete($hash, $k) if ($oldReadings->{$k} == 0 and any { $_ eq $k} @oldReadings);
}; };
readingsBulkUpdate($hash, '.computedReadings', join ',', @newReadings);
readingsEndUpdate($hash, 1); readingsEndUpdate($hash, 1);
}; };
}; };