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

02_HTTPSRV: query string sets readings (Stefan Strobel)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@8163 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
borisneubert 2015-03-07 10:50:05 +00:00
parent 89ed7b80a3
commit 7b6b2a67aa
2 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it.
- feature: 02_HTTPSRV: query string sets readings (Stefan Strobel)
- bugfix: 57_CALVIEW: - bugfix in set function
- change: 57_CALVIEW: - fixed function 'set intervall'
- see comandref for detail (now use the define

43
fhem/FHEM/02_HTTPSRV.pm
View File

@ -44,7 +44,9 @@ HTTPSRV_Initialize($) {
$hash->{DefFn} = "HTTPSRV_Define";
$hash->{UndefFn} = "HTTPSRV_Undef";
#$hash->{AttrFn} = "HTTPSRV_Attr";
$hash->{AttrList} = "directoryindex";
$hash->{AttrList} = "directoryindex " .
"readings";
$hash->{AttrFn} = "HTTPSRV_Attr";
#$hash->{SetFn} = "HTTPSRV_Set";
return undef;
@ -85,6 +87,25 @@ HTTPSRV_Undef($$) {
return undef;
}
##################
sub
HTTPSRV_Attr(@)
{
my ($cmd,$name,$aName,$aVal) = @_;
if ($cmd eq "set") {
if ($aName =~ "readings") {
if ($aVal !~ /^[A-Z_a-z0-9\,]+$/) {
Log3 $name, 3, "$name: Invalid reading list in attr $name $aName $aVal (only A-Z, a-z, 0-9, _ and , allowed)";
return "Invalid reading name $aVal (only A-Z, a-z, 0-9, _ and , allowed)";
}
addToDevAttrList($name, $aName);
}
}
return undef;
}
##################
#
# here we answer any request to http://host:port/fhem/$infix and below
@ -108,6 +129,17 @@ sub HTTPSRV_CGI() {
# return error if no such device
return("text/plain; charset=utf-8", "No HTTPSRV device for $link") unless($name);
my $fullName = $filename;
foreach my $reading (split (/,/, AttrVal($name, "readings", ""))) {
my $value = "";
if ($fullName =~ /^([^\?]+)\?(.*)($reading)=([^;&]*)([&;].*)?$/) {
$filename = $1;
$value = $4;
Log3 $name, 5, "$name: set Reading $reading = $value";
readingsSingleUpdate($defs{$name}, $reading, $value, 1);
}
};
# set directory index
$filename= AttrVal($name,"directoryindex","index.html") unless($filename);
my $MIMEtype= filename2MIMEType($filename);
@ -147,7 +179,8 @@ sub HTTPSRV_CGI() {
<a name="HTTPSRV"></a>
<h3>HTTPSRV</h3>
<ul>
Provides a mini HTTP server plugin for FHEMWEB. It serves files from a given directory.<p>
Provides a mini HTTP server plugin for FHEMWEB. It serves files from a given directory.
It optionally accepts a query string to set readings of this device if an attribute allows the given reading<p>
HTTPSRV is an extension to <a href="HTTPSRV">FHEMWEB</a>. You must install FHEMWEB to use HTTPSRV.</p>
@ -163,6 +196,11 @@ sub HTTPSRV_CGI() {
Example:
<ul>
<code>define myJSFrontend HTTPSRV jsf /usr/share/jsfrontend My little frontend</code><br>
or <br>
<code>
define kindleweb HTTPSRV kindle /opt/fhem/kindle Kindle Web<br>
attr kindleweb readings KindleBatt
</code><br>
</ul>
<br>
</ul>
@ -179,6 +217,7 @@ sub HTTPSRV_CGI() {
<br><br>
<ul>
<li>directoryindex: if the request is sent with no filename, i.e. the infix (with or without trailing slash) only, the file given in this attribute is loaded. Defaults to <code>index.html</code>.</li>
<li>readings: a comma separated list of reading names. If the request ends with a querystring like <code>?Batt=43</code> and an attribute is set like <code>attr kindleweb readings Batt</code>, then a reading with the Name of this Attribute (here Batt) is created with the value from the request.</li>
</ul>
<br><br>