mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

01_FHEMWEB.pm: regexp for Columns (Forum #71381)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14170 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2017-05-02 18:06:49 +00:00
parent 9114d321c1
commit 8e5baeca5f
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fhem/FHEM/01_FHEMWEB.pm
View File

@@ -1855,7 +1855,7 @@ FW_parseColumns()
foreach my $roomgroup (split("[ \t\r\n]+", AttrVal($FW_wname,"column",""))) { foreach my $roomgroup (split("[ \t\r\n]+", AttrVal($FW_wname,"column",""))) {
my ($room, $groupcolumn)=split(":",$roomgroup,2); my ($room, $groupcolumn)=split(":",$roomgroup,2);
$room =~ s/%20/ /g; # Space $room =~ s/%20/ /g; # Space
next if(!defined($groupcolumn) || $room ne $FW_room); next if(!defined($groupcolumn) || $FW_room !~ m/$room/);
$colNo = 1; $colNo = 1;
foreach my $groups (split(/\|/,$groupcolumn)) { foreach my $groups (split(/\|/,$groupcolumn)) {
my $lineNo = 1; my $lineNo = 1;
@@ -1865,6 +1865,7 @@ FW_parseColumns()
} }
$colNo++; $colNo++;
} }
last;
} }
return (\%columns, $colNo); return (\%columns, $colNo);
} }
@@ -3310,7 +3311,7 @@ FW_widgetOverride($$)
This attribute can be used to sort the groups in a room, just specify This attribute can be used to sort the groups in a room, just specify
the groups in one column. the groups in one column.
Space in the room and group name has to be written as %20 for this Space in the room and group name has to be written as %20 for this
attribute. attribute. The room name is a regeular expression.
</li> </li>
<br> <br>
@@ -4076,7 +4077,7 @@ FW_widgetOverride($$)
href="#group">group</a> stehen. Dieses Attribut kann man zum sortieren href="#group">group</a> stehen. Dieses Attribut kann man zum sortieren
der Gruppen auch dann verwenden, wenn man nur eine Spalte hat. der Gruppen auch dann verwenden, wenn man nur eine Spalte hat.
Leerzeichen im Raum- und Gruppennamen sind f&uuml;r dieses Attribut als Leerzeichen im Raum- und Gruppennamen sind f&uuml;r dieses Attribut als
%20 zu schreiben. %20 zu schreiben. Raumname is ein regul&auml;rer Ausdruck.
</li><br> </li><br>
<a name="confirmDelete"></a> <a name="confirmDelete"></a>