mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

YAMAHA_AVR: replace html entities with the original characters

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@4658 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
markusbloch
2014-01-15 19:35:31 +00:00
parent 64b809f372
commit 39f543ba30
1 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
fhem/FHEM/71_YAMAHA_AVR.pm
View File

@@ -164,16 +164,16 @@ YAMAHA_AVR_GetStatus($;$)
if($infos =~ /<Meta_Info>.*?<Artist>(.+?)<\/Artist>.*?<\/Meta_Info>/) if($infos =~ /<Meta_Info>.*?<Artist>(.+?)<\/Artist>.*?<\/Meta_Info>/)
{ {
readingsBulkUpdate($hash, "currentArtist", $1); readingsBulkUpdate($hash, "currentArtist", YAMAHA_AVR_html2txt($1));
} }
if($infos =~ /<Meta_Info>.*?<Station>(.+?)<\/Station>.*?<\/Meta_Info>/) if($infos =~ /<Meta_Info>.*?<Station>(.+?)<\/Station>.*?<\/Meta_Info>/)
{ {
readingsBulkUpdate($hash, "currentStation", $1); readingsBulkUpdate($hash, "currentStation", YAMAHA_AVR_html2txt($1));
} }
elsif($infos =~ /<Meta_Info>.*?<Program_Service>(.+?)<\/Program_Service>.*?<\/Meta_Info>/) elsif($infos =~ /<Meta_Info>.*?<Program_Service>(.+?)<\/Program_Service>.*?<\/Meta_Info>/)
{ {
readingsBulkUpdate($hash, "currentStation", $1); readingsBulkUpdate($hash, "currentStation", YAMAHA_AVR_html2txt($1));
} }
if($infos =~ /<Meta_Info>.*?<Channel>(.+?)<\/Channel>.*?<\/Meta_Info>/) if($infos =~ /<Meta_Info>.*?<Channel>(.+?)<\/Channel>.*?<\/Meta_Info>/)
@@ -183,12 +183,12 @@ YAMAHA_AVR_GetStatus($;$)
if($infos =~ /<Meta_Info>.*?<Album>(.+?)<\/Album>.*?<\/Meta_Info>/) if($infos =~ /<Meta_Info>.*?<Album>(.+?)<\/Album>.*?<\/Meta_Info>/)
{ {
readingsBulkUpdate($hash, "currentAlbum", $1); readingsBulkUpdate($hash, "currentAlbum", YAMAHA_AVR_html2txt($1));
} }
if($infos =~ /<Meta_Info>.*?<Song>(.+?)<\/Song>.*?<\/Meta_Info>/) if($infos =~ /<Meta_Info>.*?<Song>(.+?)<\/Song>.*?<\/Meta_Info>/)
{ {
readingsBulkUpdate($hash, "currentTitle", $1); readingsBulkUpdate($hash, "currentTitle", YAMAHA_AVR_html2txt($1));
} }
if($infos =~ /<Playback_Info>(.+?)<\/Playback_Info>/) if($infos =~ /<Playback_Info>(.+?)<\/Playback_Info>/)
@@ -995,8 +995,7 @@ sub YAMAHA_AVR_getInputs($)
} }
############################# #############################
sub sub YAMAHA_AVR_ResetTimer($;$)
YAMAHA_AVR_ResetTimer($;$)
{ {
my ($hash, $interval) = @_; my ($hash, $interval) = @_;
@@ -1017,6 +1016,26 @@ YAMAHA_AVR_ResetTimer($;$)
} }
sub YAMAHA_AVR_html2txt($)
{
my ($string) = @_;
$string =~ s/&nbsp;/ /g;
$string =~ s/&amp;/&/g;
$string =~ s/(\xe4|&auml;)/<2F>/g;
$string =~ s/(\xc4|&Auml;)/<2F>/g;
$string =~ s/(\xf6|&ouml;)/<2F>/g;
$string =~ s/(\xd6|&Ouml;)/<2F>/g;
$string =~ s/(\xfc|&uuml;)/<2F>/g;
$string =~ s/(\xdc|&Uuml;)/<2F>/g;
$string =~ s/(\xdf|&szlig;)/<2F>/g;
$string =~ s/<.+?>//g;
$string =~ s/(^\s+|\s+$)//g;
return $string;
}
1; 1;
=pod =pod