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

autocreate: ignoreTypes adds ^$ starting with featurelevel 5.9 (Forum #80775)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@15620 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2017-12-16 18:10:36 +00:00
parent adcaa0e49b
commit d80b7e8c8a
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fhem/FHEM/98_autocreate.pm
View File

@ -132,6 +132,8 @@ autocreate_Notify($$)
next if(AttrVal($me, "disable", undef)); next if(AttrVal($me, "disable", undef));
my $it = AttrVal($me, "ignoreTypes", undef); my $it = AttrVal($me, "ignoreTypes", undef);
$it = "^$it\$" if($featurelevel > 5.8); # Forum #80775
next if($it && $name =~ m/$it/i); next if($it && $name =~ m/$it/i);
my $at = AttrVal($me, "autocreateThreshold", undef); my $at = AttrVal($me, "autocreateThreshold", undef);
@ -751,9 +753,12 @@ autocreate_Attr(@)
<li>ignoreTypes<br> <li>ignoreTypes<br>
This is a regexp, to ignore certain devices, e.g. the neighbours FHT. This is a regexp, to ignore certain devices, e.g. the neighbours FHT.
You can specify more than one, with usual regexp syntax, e.g.<br> You can specify more than one, with usual regexp syntax, e.g.<br>
attr autocreate ignoreTypes CUL_HOERMANN.*|FHT_1234|CUL_WS_7<br> attr autocreate ignoreTypes (CUL_HOERMANN.*|FHT_1234|CUL_WS_7)<br>
The word "Types" is somehow misleading, as it actually checks the The word "Types" is somehow misleading, as it actually checks the
generated device name. generated device name.<br>
<b>Note</b>: starting with featurelevel 5.9 the regexp is automatically
extended with ^ and $, so that it must match the whole name (same
procedure as in notify and FileLog).
</li><br> </li><br>
<a name="autocreateThreshold"></a> <a name="autocreateThreshold"></a>
@ -915,9 +920,12 @@ autocreate_Attr(@)
Funk-Heizungsthermostat (FHT) des Nachbarn. In dem Ausdruck k&ouml;nnen Funk-Heizungsthermostat (FHT) des Nachbarn. In dem Ausdruck k&ouml;nnen
mehr als ein Ger&auml;t &uuml;ber die normale Regexp-Syntax angegeben mehr als ein Ger&auml;t &uuml;ber die normale Regexp-Syntax angegeben
werden. Beispiel:<br> werden. Beispiel:<br>
attr autocreate ignoreTypes CUL_HOERMANN.*|FHT_1234|CUL_WS_7<br> attr autocreate ignoreTypes (CUL_HOERMANN.*|FHT_1234|CUL_WS_7)<br>
Das Wort "Types" ist etwas irref&uuml;hrend, da der Ger&auml;tename Das Wort "Types" ist etwas irref&uuml;hrend, da der Ger&auml;tename
gepr&uuml;ft wird, und nicht der Typ. gepr&uuml;ft wird, und nicht der Typ.<br>
<b>Achtung</b>: ab featurelevel 5.9 wird der Regexp automatisch mit
^ und $ erg&auml;nzt, muss also den kompletten Namen matchen (genau wie
bei notify und FileLog).
</li><br> </li><br>
<a name="autocreateThreshold"></a> <a name="autocreateThreshold"></a>

2
fhem/fhem.pl
View File

@ -2647,7 +2647,7 @@ GlobalAttr($$$$)
} }
elsif($name eq "featurelevel") { elsif($name eq "featurelevel") {
return "$val is not in the form N.N" if($val !~ m/^\d\.\d$/); return "$val is not in the form N.N" if($val !~ m/^\d+\.\d+$/);
$featurelevel = $val; $featurelevel = $val;
} }