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

02_HTTPAPI.pm: new API action "readtimestamp"

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@26287 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
klaus.schauer 2022-08-05 12:40:47 +00:00
parent 6a219d6997
commit 9c94ee426d
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fhem/FHEM/02_HTTPAPI.pm
View File

@ -107,7 +107,7 @@ sub HTTPAPI_CGI($$$) {
my $link; my $link;
return($hash, 503, 'close', "text/plain; charset=utf-8", encode($encoding, "error=503 Service Unavailable")) if(IsDisabled($name)); return($hash, 503, 'close', "text/plain; charset=utf-8", encode($encoding, "error=503 Service Unavailable")) if(IsDisabled($name));
if($request =~ m/^(\/$infix)\/(set|get|read|write)\?(.*)$/) { if($request =~ m/^(\/$infix)\/(set|get|read|readtimestamp|write)\?(.*)$/) {
$link = $1; $link = $1;
$apiCmd = $2; $apiCmd = $2;
$apiCmdString = $3; $apiCmdString = $3;
@ -148,13 +148,13 @@ sub HTTPAPI_CGI($$$) {
} else { } else {
return($hash, 400, 'close', "text/plain; charset=utf-8", encode($encoding, "error=400 Bad Request, $request > attribute action is missing")) return($hash, 400, 'close', "text/plain; charset=utf-8", encode($encoding, "error=400 Bad Request, $request > attribute action is missing"))
} }
} elsif ($apiCmd eq 'read') { } elsif ($apiCmd =~ /^read|readtimestamp$/) {
my $readingName; my $readingName;
if ($apiCmdString =~ /&reading(\=[^&]*)?(?=&|$)|^reading(\=[^&]*)?(&|$)/) { if ($apiCmdString =~ /&reading(\=[^&]*)?(?=&|$)|^reading(\=[^&]*)?(&|$)/) {
$readingName = substr(($1 // $2), 1); $readingName = substr(($1 // $2), 1);
# url decoding # url decoding
$readingName =~ s/%([0-9A-Fa-f]{2})/chr(hex($1))/eg; $readingName =~ s/%([0-9A-Fa-f]{2})/chr(hex($1))/eg;
my $readingVal = ReadingsVal($fhemDevName, $readingName, undef); my $readingVal = $apiCmd eq 'readtimestamp' ? ReadingsTimestamp($fhemDevName, $readingName, undef) : ReadingsVal($fhemDevName, $readingName, undef);
#readingsSingleUpdate($defs{$name}, 'reponse', "$readingName=$readingVal", 1); #readingsSingleUpdate($defs{$name}, 'reponse', "$readingName=$readingVal", 1);
if (defined $readingVal) { if (defined $readingVal) {
return($hash, 200, 'close', "text/plain; charset=utf-8", encode($encoding, "$readingName=$readingVal")); return($hash, 200, 'close', "text/plain; charset=utf-8", encode($encoding, "$readingName=$readingVal"));
@ -384,6 +384,8 @@ sub HTTPAPI_Undef($) {
Example: Example:
<ul> <ul>
<code>define httpapi HTTPAPI</code> (Configuration with default values)<br>
or<br>
<code>define httpapi HTTPAPI api 8087 global</code><br> <code>define httpapi HTTPAPI api 8087 global</code><br>
or<br> or<br>
<code>define httpapi HTTPAPI infix=api1 port=8089 global=local</code><br> <code>define httpapi HTTPAPI infix=api1 port=8089 global=local</code><br>
@ -446,6 +448,16 @@ sub HTTPAPI_Undef($) {
<code>&lt;reading name&gt;=&lt;val&gt;|error=&lt;error message&gt;</code><br> <code>&lt;reading name&gt;=&lt;val&gt;|error=&lt;error message&gt;</code><br>
</ul> </ul>
</li> </li>
<li>API command line for querying the timestamp of a reading<br>
Request:
<ul>
<code>http://&lt;ip-addr&gt;:&lt;port&gt;/&lt;apiName&gt;/readtimestamp?device=&lt;devname&gt;&reading=&lt;name&gt;</code><br>
</ul>
Response:
<ul>
<code>&lt;reading name&gt;=&lt;timestamp&gt;|error=&lt;error message&gt;</code><br>
</ul>
</li>
<li>API command line for deleting a reading<br> <li>API command line for deleting a reading<br>
Request: Request:
<ul> <ul>