FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-28 02:44:53 +00:00
Code Issues Releases Wiki Activity

Re-introduce grouping by subType

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@1821 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2012-08-31 06:29:17 +00:00
parent 470d33e545
commit 93b2e8d9f5
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fhem/webfrontend/pgm2/01_FHEMWEB.pm
View File

@ -664,7 +664,7 @@ FW_updateHashes()
next if(IsIgnored($d)); next if(IsIgnored($d));
my $t = AttrVal($d, "subType", $defs{$d}{TYPE}); my $t = AttrVal($d, "subType", $defs{$d}{TYPE});
$t = AttrVal($d, "model", $t) if($t eq "unknown"); $t = AttrVal($d, "model", $t) if($t eq "unknown");
$FW_types{$t}{$d} = 1; $FW_types{$d} = $t;
} }
$FW_room = AttrVal($FW_detail, "room", "Unsorted") if($FW_detail); $FW_room = AttrVal($FW_detail, "room", "Unsorted") if($FW_detail);
@ -985,7 +985,7 @@ FW_showRoom()
my %group; my %group;
foreach my $dev (@devs) { foreach my $dev (@devs) {
next if($defs{$dev}{TYPE} eq "weblink"); next if($defs{$dev}{TYPE} eq "weblink");
foreach my $grp (split(",", AttrVal($dev, "group", $defs{$dev}{TYPE}))) { foreach my $grp (split(",", AttrVal($dev, "group", $FW_types{$dev}))) {
$group{$grp}{$dev} = 1; $group{$grp}{$dev} = 1;
} }
} }
@ -1224,10 +1224,11 @@ FW_readgplotfile($$$)
open(FH, $gplot_pgm) || return (FW_fatal("$gplot_pgm: $!"), undef); open(FH, $gplot_pgm) || return (FW_fatal("$gplot_pgm: $!"), undef);
while(my $l = <FH>) { while(my $l = <FH>) {
$l =~ s/\r//g; $l =~ s/\r//g;
# if($l =~ m/^#FileLog (.*)$/) { if($l =~ m/^#FileLog (.*)$/ &&
if($l =~ m/^#FileLog (.*)$/ && ($wltype eq "fileplot" || $wl eq "FileLog")) { ($wltype eq "fileplot" || $wl eq "FileLog")) {
push(@filelog, $1); push(@filelog, $1);
} elsif ($l =~ m/^#DbLog (.*)$/ && ($wltype eq "dbplot" || $wl eq "DbLog")) { } elsif ($l =~ m/^#DbLog (.*)$/ &&
($wltype eq "dbplot" || $wl eq "DbLog")) {
push(@filelog, $1); push(@filelog, $1);
} elsif($l =~ "^plot" || $plot) { } elsif($l =~ "^plot" || $plot) {
$plot .= $l; $plot .= $l;