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

98_weekprofile: json allow_nonref

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@16418 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Risiko 2018-03-16 18:31:01 +00:00
parent af074003a5
commit 7c3cf99b8e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fhem/FHEM/98_weekprofile.pm
View File

@ -292,7 +292,7 @@ sub weekprofile_sendDevProfile(@)
return "profile has no data" if (!defined($prf->{DATA})); return "profile has no data" if (!defined($prf->{DATA}));
if ($type eq "WEEKPROFILE") { if ($type eq "WEEKPROFILE") {
my $json = JSON->new; my $json = JSON->new->allow_nonref;
my $json_text = undef; my $json_text = undef;
eval ( $json_text = $json->encode($prf->{DATA}) ); eval ( $json_text = $json->encode($prf->{DATA}) );
@ -628,7 +628,7 @@ sub weekprofile_Get($$@)
return "profile $params[0] not found" if (!defined($prf)); return "profile $params[0] not found" if (!defined($prf));
return "profile $params[0] has no data" if (!defined($prf->{DATA})); return "profile $params[0] has no data" if (!defined($prf->{DATA}));
my $json = JSON->new; my $json = JSON->new->allow_nonref;
my $json_text = undef; my $json_text = undef;
eval { $json_text = $json->encode($prf->{DATA}) }; eval { $json_text = $json->encode($prf->{DATA}) };
@ -691,7 +691,7 @@ sub weekprofile_Get($$@)
} }
if($cmd eq "sndDevList") { if($cmd eq "sndDevList") {
my $json = JSON->new; my $json = JSON->new->allow_nonref;
my @sortDevList = sort {lc($a->{ALIAS}) cmp lc($b->{ALIAS})} @{$hash->{SNDDEVLIST}}; my @sortDevList = sort {lc($a->{ALIAS}) cmp lc($b->{ALIAS})} @{$hash->{SNDDEVLIST}};
my $json_text = undef; my $json_text = undef;
eval { $json_text = $json->encode(\@sortDevList) }; eval { $json_text = $json->encode(\@sortDevList) };
@ -773,7 +773,7 @@ sub weekprofile_Set($$@)
my $jsonData = $params[1]; my $jsonData = $params[1];
my $json = JSON->new; my $json = JSON->new->allow_nonref;
my $data = undef; my $data = undef;
eval { $data = $json->decode($jsonData); }; eval { $data = $json->decode($jsonData); };
@ -1109,7 +1109,7 @@ sub weekprofile_writeProfilesToFile(@)
print $fh "__version__=".$CONFIG_VERSION."\n"; print $fh "__version__=".$CONFIG_VERSION."\n";
Log3 $me, 5, "$me(writeProfileToFile): write profiles to $filename"; Log3 $me, 5, "$me(writeProfileToFile): write profiles to $filename";
my $json = JSON->new; my $json = JSON->new->allow_nonref;
for (my $i = $start; $i < $prfCnt; $i++) { for (my $i = $start; $i < $prfCnt; $i++) {
print $fh "entry=".$json->encode($hash->{PROFILES}[$i])."\n"; print $fh "entry=".$json->encode($hash->{PROFILES}[$i])."\n";
} }
@ -1142,7 +1142,7 @@ sub weekprofile_readProfilesFromFile(@)
Log3 $me, 5, "$me(readProfilesFromFile): read profiles from $filename"; Log3 $me, 5, "$me(readProfilesFromFile): read profiles from $filename";
my $json = JSON->new; my $json = JSON->new->allow_nonref;
my $rowCnt = 0; my $rowCnt = 0;
my $version = undef; my $version = undef;
while (my $row = <$fh>) { while (my $row = <$fh>) {