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

fix bug with blank character in city name

Browse Source
This commit is contained in:
Marko Oldenburg 2017-10-20 08:10:50 +02:00
parent 945ad50be3
commit 47c6e941f4
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
46_Aqicn.pm
View File

@ -287,7 +287,7 @@ sub Aqicn_Get($$@) {
return undef; return undef;
} elsif( $cmd eq 'stationSearchByCity' ) { } elsif( $cmd eq 'stationSearchByCity' ) {
return "usage: $cmd" if( @args != 1 ); return "usage: $cmd" if( @args == 0 );
my $city = join( " ", @args ); my $city = join( " ", @args );
my $ret; my $ret;
@ -336,11 +336,11 @@ sub Aqicn_GetData($;$) {
$uri = $host . '/feed/@' . $hash->{UID} . '/?token=' . $token; $uri = $host . '/feed/@' . $hash->{UID} . '/?token=' . $token;
} else { } else {
$uri = $host . '/search/?token=' . $token . '&keyword=' . $cityName; $uri = $host . '/search/?token=' . $token . '&keyword=' . urlEncode($cityName);
} }
my $param = { my $param = {
url => "https://" . $uri, url => "https://".$uri,
timeout => 5, timeout => 5,
method => 'GET', method => 'GET',
hash => $hash, hash => $hash,
@ -351,7 +351,7 @@ sub Aqicn_GetData($;$) {
$param->{cl} = $hash->{CL} if( $hash->{TOKEN} and ref($hash->{CL}) eq 'HASH' ); $param->{cl} = $hash->{CL} if( $hash->{TOKEN} and ref($hash->{CL}) eq 'HASH' );
HttpUtils_NonblockingGet($param); HttpUtils_NonblockingGet($param);
Log3 $name, 4, "Aqicn ($name) - Send with URI: https://$uri"; Log3 $name, 3, "Aqicn ($name) - Send with URI: https://$uri";
} }
sub Aqicn_ErrorHandling($$$) { sub Aqicn_ErrorHandling($$$) {
@ -362,6 +362,11 @@ sub Aqicn_ErrorHandling($$$) {
my $name = $hash->{NAME}; my $name = $hash->{NAME};
#Log3 $name, 3, "Aqicn ($name) - Recieve JSON data: $data";
#Log3 $name, 3, "Aqicn ($name) - Recieve HTTP Code: $param->{code}";
#Log3 $name, 3, "Aqicn ($name) - Recieve Error: $err";
### Begin Error Handling ### Begin Error Handling
if( defined( $err ) ) { if( defined( $err ) ) {
@ -433,7 +438,8 @@ sub Aqicn_ResponseProcessing($$$) {
if($@){ if($@){
Log3 $name, 4, "Aqicn ($name) - error while request: $@"; Log3 $name, 4, "Aqicn ($name) - error while request: $@";
readingsBeginUpdate($hash); readingsBeginUpdate($hash);
readingsBulkUpdate($hash, 'JSON Error', $@); readingsBulkUpdate($hash, 'JSON_Error', $@);
readingsBulkUpdate($hash, 'httpCode', $param->{code});
readingsBulkUpdate($hash, 'state', 'JSON error'); readingsBulkUpdate($hash, 'state', 'JSON error');
readingsEndUpdate($hash,1); readingsEndUpdate($hash,1);
return; return;
@ -525,11 +531,12 @@ sub Aqicn_ReadingsProcessing_SearchStationResponse($$) {
$ret .= '</tr>'; $ret .= '</tr>';
$linecount++; $linecount++;
} }
$ret .= '</table></td></tr>';
$ret .= '</table></html>';
} }
$ret .= '</table></td></tr>';
$ret .= '</table></html>';
#printf "\n\n$ret\n\n";
asyncOutput( $param->{cl}, $ret ) if( $param->{cl} && $param->{cl}{canAsyncOutput} ); asyncOutput( $param->{cl}, $ret ) if( $param->{cl} && $param->{cl}{canAsyncOutput} );
return; return;
} }