FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 16:56:54 +00:00
Code Issues Releases Wiki Activity

01_FHEMWEB: JSON format for longpoll only if requested, for backward WebViewControl compatibility (Forum #31968)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@7540 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2015-01-12 21:26:50 +00:00
parent 83dc38f51f
commit f575497d7a
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
fhem/FHEM/01_FHEMWEB.pm
View File

@ -2206,13 +2206,17 @@ FW_makeEdit($$$)
sub
FW_longpollInfo($$$)
FW_longpollInfo($$$$)
{
my ($dev, $state, $html) = @_;
$dev =~ s/([\\"])/\\$1/g;
$state =~ s/([\\"])/\\$1/g;
$html =~ s/([\\"])/\\$1/g;
return "[\"$dev\",\"$state\",\"$html\"]";
my ($dev, $state, $html, $fmt) = @_;
if($fmt && $fmt eq "JSON") {
$dev =~ s/([\\"])/\\$1/g;
$state =~ s/([\\"])/\\$1/g;
$html =~ s/([\\"])/\\$1/g;
return "[\"$dev\",\"$state\",\"$html\"]";
} else {
return "$dev<<$state<<$html";
}
}
sub
@ -2233,7 +2237,8 @@ FW_roomStatesForInform($$)
my ($allSet, $cmdlist, $txt) = FW_devState($dn, "", \%extPage);
if($defs{$dn} && $defs{$dn}{STATE} && $defs{$dn}{TYPE} ne "weblink") {
push @data, FW_longpollInfo($dn, $defs{$dn}{STATE}, $txt);
push @data,
FW_longpollInfo($dn, $defs{$dn}{STATE}, $txt, $me->{inform}{fmt});
}
}
my $data = join("\n", map { s/\n/ /gm; $_ } @data)."\n";
@ -2279,7 +2284,7 @@ FW_Notify($$)
if( !$modules{$defs{$dn}{TYPE}}{FW_atPageEnd} ) {
my ($allSet, $cmdlist, $txt) = FW_devState($dn, "", \%extPage);
($FW_wname, $FW_ME, $FW_ss, $FW_tp, $FW_subdir) = @old;
push @data, FW_longpollInfo($dn, $dev->{STATE}, $txt);
push @data, FW_longpollInfo($dn, $dev->{STATE}, $txt, $h->{fmt});
}
#Add READINGS
@ -2291,8 +2296,9 @@ FW_Notify($$)
next; #ignore 'set' commands
}
my ($readingName,$readingVal) = split(": ",$events->[$i],2);
push @data, FW_longpollInfo("$dn-$readingName",$readingVal,$readingVal);
push @data, FW_longpollInfo("$dn-$readingName-ts", $tn, $tn);
push @data, FW_longpollInfo("$dn-$readingName",
$readingVal,$readingVal, $h->{fmt});
push @data, FW_longpollInfo("$dn-$readingName-ts", $tn, $tn, $h->{fmt});
}
}
}
@ -2333,7 +2339,8 @@ FW_directNotify($$) # Notify without the event overhead (Forum #31293)
$ntfy->{TYPE} ne "FHEMWEB" ||
!$ntfy->{inform} ||
!$ntfy->{inform}{devices}{$dev});
if(!addToWritebuffer($ntfy, FW_longpollInfo($dev, $msg, "")."\n")){
if(!addToWritebuffer($ntfy,
FW_longpollInfo($dev, $msg, "", $ntfy->{inform}{fmt})."\n")) {
my $name = $ntfy->{NAME};
Log3 $name, 4, "Closing connection $name due to full buffer in FW_Notify";
TcpServer_Close($ntfy);

4
fhem/www/pgm2/fhemweb.js
View File

@ -401,8 +401,8 @@ FW_longpoll()
since = FW_serverLastMsg + (FW_serverGenerated-FW_serverFirstMsg);
var query = location.pathname+"?XHR=1"+
"&inform=type=status;filter="+filter+";since="+since+
"&timestamp="+new Date().getTime();
"&inform=type=status;filter="+filter+";since="+since+";fmt=JSON"+
"&timestamp="+new Date().getTime();
query = addcsrf(query);
FW_pollConn.open("GET", query, true);
FW_pollConn.onreadystatechange = FW_doUpdate;