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

Bessere Variante zur HTTP Headeranalyse, Code aufgeräumt

Browse Source
This commit is contained in:
Marko Oldenburg 2015-11-05 12:45:37 +01:00
parent a0aee74475
commit 38320e3882
1 changed files with 22 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
74_AMAD.pm
View File

@ -35,7 +35,7 @@ use Time::HiRes qw(gettimeofday);
use HttpUtils; use HttpUtils;
use TcpServerUtils; use TcpServerUtils;
my $version = "0.8.2"; my $version = "0.8.3";
@ -894,7 +894,19 @@ sub AMAD_CommBridge_Read($) {
### ###
my @data = split( '\R\R', $buf ); my @data = split( '\R\R', $buf );
my $chash = undef; my $chash;
my $fhemdev;
my @fhemdev = split( '\R', $data[0] );
foreach my $ret( @fhemdev ) {
if( $ret =~ /FHEMDEVICE: (.*)/ ) {
$fhemdev = $1;
}
}
$chash = $defs{$fhemdev};
if ( $data[0] =~ /FHEMCMD: setreading\b/ ) { if ( $data[0] =~ /FHEMCMD: setreading\b/ ) {
my $tv = $data[1]; my $tv = $data[1];
@ -913,37 +925,16 @@ sub AMAD_CommBridge_Read($) {
my $t; my $t;
my $v; my $v;
if( $data[2] =~ /FHEMDEVICE:/ ) {
$data[2] =~ s/FHEMDEVICE: //;
my $chash = $defs{$data[2]};
while( ( $t, $v ) = each %buffer ) { while( ( $t, $v ) = each %buffer ) {
$v =~ s/null//g; $v =~ s/null//g;
readingsBeginUpdate( $chash ); readingsBeginUpdate( $chash );
readingsBulkUpdate( $chash, $t, $v ) if( defined( $v ) ); readingsBulkUpdate( $chash, $t, $v ) if( defined( $v ) );
}
readingsBulkUpdate( $chash, "lastStatusRequestState", "statusRequest_done" );
readingsEndUpdate( $chash, 1 );
} else {
$data[3] =~ s/FHEMDEVICE: //;
my $chash = $defs{$data[3]};
while( ( $t, $v ) = each %buffer ) {
$v =~ s/null//g;
readingsBeginUpdate( $chash );
readingsBulkUpdate( $chash, $t, $v ) if( defined( $v ) );
}
readingsBulkUpdate( $chash, "lastStatusRequestState", "statusRequest_done" );
readingsEndUpdate( $chash, 1 );
} }
readingsBulkUpdate( $chash, "lastStatusRequestState", "statusRequest_done" );
readingsEndUpdate( $chash, 1 );
### End Response Processing ### End Response Processing
@ -969,21 +960,7 @@ sub AMAD_CommBridge_Read($) {
elsif ( $data[0] =~ /FHEMCMD: statusrequest\b/ ) { elsif ( $data[0] =~ /FHEMCMD: statusrequest\b/ ) {
@data = split( '\R', $data[0] ); return AMAD_GetUpdateLocal( $chash );
if( $data[2] =~ /FHEMDEVICE:/ ) {
$data[2] =~ s/FHEMDEVICE: //;
my $chash = $defs{$data[2]};
return AMAD_GetUpdateLocal( $chash );
} else {
$data[3] =~ s/FHEMDEVICE: //;
my $chash = $defs{$data[3]};
return AMAD_GetUpdateLocal( $chash );
}
} }
} }