FHEM/mod-UWZ
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix searchAreaID Fkt

Browse Source
This commit is contained in:
Marko Oldenburg 2020-04-29 15:01:32 +02:00
parent e8f92c5f0b
commit 798de737bd
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
77_UWZ.pm
View File

@ -768,10 +768,10 @@ sub Get {
elsif ( ( lc $hash->{CountryCode} ) eq 'search' ) { elsif ( ( lc $hash->{CountryCode} ) eq 'search' ) {
my $usage = "Unknown argument $cmd, choose one of SearchAreaID "; my $usage = "Unknown argument $cmd, choose one of SearchAreaID ";
return $usage if ( scalar( @{$a} ) < 3 ); return $usage if ( scalar( @{$a} ) != 1 );
if ( $a->[0] =~ /^SearchAreaID/ ) { UWZSearchLatLon( $name, $a->[0] ); } if ( $cmd =~ m{\ASearchAreaID}xms ) { UWZSearchLatLon( $name, $a->[0] ); }
elsif ( $a->[0] =~ /^AreaID/ ) { elsif ( $cmd =~ m{\AAreaID}xms ) {
my @splitparam = split( /,/, $a->[0] ); my @splitparam = split( /,/, $a->[0] );
UWZSearchAreaID( $splitparam[0], $splitparam[1] ); UWZSearchAreaID( $splitparam[0], $splitparam[1] );
} }
@ -798,8 +798,6 @@ sub Get {
: $cmd =~ m{\Ahail}xms ? GetCurrentHail($hash) : $cmd =~ m{\Ahail}xms ? GetCurrentHail($hash)
: $usage; : $usage;
} }
return;
} }
##################################### #####################################
@ -2347,7 +2345,7 @@ sub UWZSearchLatLon {
my $uwzxmlparser = XML::Simple->new(); my $uwzxmlparser = XML::Simple->new();
my $search = $uwzxmlparser->XMLin( my $search = $uwzxmlparser->XMLin(
$response->content, $response->content,
KeyAttr => { city => 'id' }, KeyAttr => { 'city' => 'id' },
ForceArray => ['city'] ForceArray => ['city']
); );
@ -2376,19 +2374,16 @@ sub UWZSearchLatLon {
$ret .= '<td>' . $value->{'latitude'} . '</td>'; $ret .= '<td>' . $value->{'latitude'} . '</td>';
$ret .= '<td>' . $value->{'longitude'} . '</td>'; $ret .= '<td>' . $value->{'longitude'} . '</td>';
my @headerHost = grep /Host/, @FW_httpheader;
$headerHost[0] =~ s/Host: //g;
my $aHref = my $aHref =
'<a href=\'http://' '<a href="/fhem?cmd=get%20'
. $headerHost[0]
. '/fhem?cmd=get+'
. $name . $name
. '+AreaID+' . '%20AreaID%20'
. $value->{'latitude'} . ',' . $value->{'latitude'}
. ','
. $value->{'longitude'} . $value->{'longitude'}
. $::FW_CSRF . $::FW_CSRF
. '\'>Get AreaID</a>'; . '">Get AreaID</a>';
$ret .= '<td>' . $aHref . '</td>'; $ret .= '<td>' . $aHref . '</td>';
$ret .= '</tr>'; $ret .= '</tr>';
$linecount++; $linecount++;