FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-13 05:06:35 +00:00
Code Issues Releases Wiki Activity

dummy/structure was listed twice in list and xmllist fixed (by rudi)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@557 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
m_fischer 2010-01-21 19:29:47 +00:00
parent bd2a344fdc
commit 26cdf2c8e2
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -567,4 +567,5 @@
- bugfix: [pgm3] table-format on Android-Browser optimized - bugfix: [pgm3] table-format on Android-Browser optimized
- feature: [pgm3] Skinable - change the colors. - feature: [pgm3] Skinable - change the colors.
- feature: [pgm3] Rooms possible for Webcam and Google-Weather - feature: [pgm3] Rooms possible for Webcam and Google-Weather
- bugfix: dummy/structure was listed twice in list and xmllist

12
fhem/fhem.pl
View File

@ -159,7 +159,7 @@ my $nextat; # Time when next timer will be triggered.
my $intAtCnt=0; my $intAtCnt=0;
my %duplicate; # Pool of received msg for multi-fhz/cul setups my %duplicate; # Pool of received msg for multi-fhz/cul setups
my $duplidx=0; # helper for the above pool my $duplidx=0; # helper for the above pool
my $cvsid = '$Id: fhem.pl,v 1.99 2010-01-20 08:56:17 rudolfkoenig Exp $'; my $cvsid = '$Id: fhem.pl,v 1.100 2010-01-21 19:29:47 m_fischer Exp $';
my $namedef = my $namedef =
"where <name> is either:\n" . "where <name> is either:\n" .
"- a single device name\n" . "- a single device name\n" .
@ -1244,9 +1244,9 @@ CommandList($$)
my $lt = ""; my $lt = "";
# Sort first by type then by name # Sort first by type then by name
for my $d (sort { my $x = $modules{$defs{$a}{TYPE}}{ORDER} cmp for my $d (sort { my $x=$modules{$defs{$a}{TYPE}}{ORDER}.$defs{$a}{TYPE} cmp
$modules{$defs{$b}{TYPE}}{ORDER}; $modules{$defs{$b}{TYPE}}{ORDER}.$defs{$b}{TYPE};
$x = ($a cmp $b) if($x == 0); $x; } keys %defs) { $x=($a cmp $b) if($x == 0); $x; } keys %defs) {
next if(IsIgnored($d)); next if(IsIgnored($d));
my $t = $defs{$d}{TYPE}; my $t = $defs{$d}{TYPE};
$str .= "\n$t:\n" if($t ne $lt); $str .= "\n$t:\n" if($t ne $lt);
@ -1604,7 +1604,9 @@ CommandSetstate($$)
} }
} else { } else {
$d->{STATE} = $a[1];
# Do not overwrite state like "opened" or "initialized"
$d->{STATE} = $a[1] if($init_done || $d->{STATE} eq "???");
$oldvalue{$sdev}{VAL} = $a[1]; $oldvalue{$sdev}{VAL} = $a[1];
# This time is not the correct one, but we do not store a timestamp for # This time is not the correct one, but we do not store a timestamp for