Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

98_DSBMobile.pm: Added parsing of output that is grouped, bugfixes

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@21240 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
KernSani 2020-02-21 00:30:57 +00:00
parent 56f530304e
commit df9281535c
1 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
FHEM/98_DSBMobile.pm
View File

@ -45,6 +45,7 @@ eval "use IO::Uncompress::Gunzip qw(gunzip);1" or $missingModul .= "IO::Compress
eval "use MIME::Base64;1" or $missingModul .= "MIME::Base64 "; eval "use MIME::Base64;1" or $missingModul .= "MIME::Base64 ";
eval "use HTML::TableExtract;1" or $missingModul .= "HTML::TableExtract "; eval "use HTML::TableExtract;1" or $missingModul .= "HTML::TableExtract ";
eval "use HTML::TreeBuilder;1" or $missingModul .= "HTML::TreeBuilder "; eval "use HTML::TreeBuilder;1" or $missingModul .= "HTML::TreeBuilder ";
eval "use JSON::XS;1" or $missingModul .= "JSON::XS ";
##################################### #####################################
sub DSBMobile_Initialize($) { sub DSBMobile_Initialize($) {
@ -219,8 +220,13 @@ sub DSBMobile_getDataCallback($) {
IO::Uncompress::Gunzip::gunzip \$d64 => \$json; IO::Uncompress::Gunzip::gunzip \$d64 => \$json;
$json = latin1ToUtf8($json); $json = latin1ToUtf8($json);
my $res = decode_json($json); my $res = decode_json($json);
if ( $res->{Resultcode} == 1 ) {
readingsSingleUpdate( $hash, "error", $res->{ResultStatusInfo}, 0 );
return undef;
}
Log3 $name, 5, "[$name] JSON received: " . Dumper($res); Log3 $name, 5, "[$name] JSON received: " . Dumper($res);
# todo - add error handling
my $url; my $url;
my $udate; my $udate;
my $test = $res->{ResultMenuItems}[0]->{Childs}; my $test = $res->{ResultMenuItems}[0]->{Childs};
@ -267,7 +273,7 @@ sub DSBMobile_getDataCallback($) {
readingsEndUpdate( $hash, 1 ); readingsEndUpdate( $hash, 1 );
if ( time_str2num( $udate . ":00" ) < time_str2num( $lastCheck . ":00" ) ) { if ( time_str2num( $udate . ":00" ) < time_str2num( $lastCheck . ":00" ) ) {
Log3 $name, 4, "[$name] Last update from $udate, now it's $today. Quitting."; Log3 $name, 4, "[$name] Last update from $udate, now it's $today. Quitting." unless $hash->{helper}{forceRead};
return undef unless $hash->{helper}{forceRead}; return undef unless $hash->{helper}{forceRead};
} }
delete $hash->{helper}{forceRead}; delete $hash->{helper}{forceRead};
@ -328,10 +334,11 @@ sub DSBMobile_getTTCallback($) {
#$te->parse($data); #$te->parse($data);
my @tabs; my @tabs;
foreach my $ttab (@tt) { foreach my $ttab (@tt) {
my $te = HTML::TableExtract->new(); my $te = HTML::TableExtract->new( slice_columns => 0, gridmap => 0 );
$te->parse($ttab); $te->parse($ttab);
push( @tabs, $te->tables() ); push( @tabs, $te->tables() );
} }
#Log3 $name, 4, "[$name] Extracted Tables". Dumper(@tabs);
Log3 $name, 4, "[$name] Starting extraction info"; Log3 $name, 4, "[$name] Starting extraction info";
@ -381,8 +388,8 @@ sub DSBMobile_getTTCallback($) {
my $t = $tabs[$i]; my $t = $tabs[$i];
my $info = $itabs[$i]; my $info = $itabs[$i];
$i++; $i++;
my $j = 0; my $j = 0;
my $group = undef;
if ($t) { if ($t) {
foreach my $r ( $t->rows() ) { foreach my $r ( $t->rows() ) {
my @f = @$r; my @f = @$r;
@ -393,9 +400,25 @@ sub DSBMobile_getTTCallback($) {
@ch = map { makeReadingName($_) } @f; @ch = map { makeReadingName($_) } @f;
next; next;
} }
#check if we have a single row (grouping by class)
if ( !defined($f[1]) ) {
# create the reading if we didn't have a group before
unshift( @ch, makeReadingName($class) ) unless $group;
$group = $f[0];
next;
}
my %tst = (); my %tst = ();
my $k = 0; my $k = 0;
# Add the group as "class"
if ($group) {
$tst{$class} = $group;
}
foreach my $cl (@ch) { foreach my $cl (@ch) {
next if $group && $class eq $cl;
$tst{$cl} = $f[$k]; $tst{$cl} = $f[$k];
$k++; $k++;
} }
@ -415,7 +438,7 @@ sub DSBMobile_getTTCallback($) {
# roomOld => $f[9], # roomOld => $f[9],
# comment => $f[10] # comment => $f[10]
# ); # );
Log3 $name, 4, "found single line: " . Dumper(%tst);
#push( @result, \%roq ) if ( defined( $row{class} ) && $row{class} =~ /$filter/ ); #push( @result, \%roq ) if ( defined( $row{class} ) && $row{class} =~ /$filter/ );
push( @result, \%tst ) push( @result, \%tst )
if ( defined( $tst{$class} ) if ( defined( $tst{$class} )