From a04ac8e1a2522cca3f0e6f0bbec387d0fa8ee97d Mon Sep 17 00:00:00 2001 From: betateilchen <> Date: Sun, 8 Nov 2015 11:00:45 +0000 Subject: [PATCH] 55_GDS.pm: change encoding in forecast readings git-svn-id: https://svn.fhem.de/fhem/trunk@9818 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/55_GDS.pm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/fhem/FHEM/55_GDS.pm b/fhem/FHEM/55_GDS.pm index 2dddaf425..767a7c6ba 100644 --- a/fhem/FHEM/55_GDS.pm +++ b/fhem/FHEM/55_GDS.pm @@ -1782,9 +1782,9 @@ sub retrieveForecasts($$@) { } else { $b[3] = ' '; } - $fread{$prefix."_stationName"} = $area.'/'.latin1ToUtf8($b[0]); + $fread{$prefix."_stationName"} = $area.'/'.$b[0]; $fread{$prefix.$day.$tempLabel} = $b[1]; - $fread{$prefix.$day."_weather".$timeLabel} = latin1ToUtf8($b[2]); + $fread{$prefix.$day."_weather".$timeLabel} = $b[2]; $fread{$prefix.$day."_windGust".$timeLabel} = $b[3]; if ($fc != 3) { $fread{$prefix.$day."_weekday"} = $fcWeekday; @@ -1855,7 +1855,7 @@ sub retrieveForecasts($$@) { unless(defined($v)) {delete($defs{$name}{READINGS}{$k}); next;} if($v =~ m/^--/) {delete($defs{$name}{READINGS}{$k}); next;}; unless(length(trim($v))) {delete($defs{$name}{READINGS}{$k}); next;}; - readingsBulkUpdate($hash, $k, utf8ToLatin1($v)); + readingsBulkUpdate($hash, $k, $v); } readingsEndUpdate($hash, 1); } @@ -1908,7 +1908,8 @@ sub getListForecastStations($) { # ################################################################################################### # -# 2015-11-06 fixed problems after global rereadcfg +# 2015-11-06 changed character encoding in forecast readings (jensb) +# fixed problems after global rereadcfg # fixed delete CAP-zipfile unless gdsDebug set # # 2015-11-01 changed getListForecastStations: fixed inverted logging "data not found"