From cdc2cab5d122042ac3ab3664df2e9fa9c542a538 Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Fri, 16 May 2014 19:54:51 +0000 Subject: [PATCH] FileLog/SVG: direct FileLog Plot bug, when SVGcache is on (forum #23671) git-svn-id: https://svn.fhem.de/fhem/trunk@5876 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/92_FileLog.pm | 2 +- fhem/FHEM/98_SVG.pm | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/fhem/FHEM/92_FileLog.pm b/fhem/FHEM/92_FileLog.pm index 4e14d4995..a5517a355 100755 --- a/fhem/FHEM/92_FileLog.pm +++ b/fhem/FHEM/92_FileLog.pm @@ -465,7 +465,7 @@ FileLog_logWrapper($) } FW_pO "
"; FW_pO ""; - my $logtype = $defs{$d}{TYPE}; + my $logtype = $defs{$d}{NAME}; my $wl = "&pos=" . join(";", map {"$_=$FW_pos{$_}"} keys %FW_pos); my $arg = "$FW_ME/SVG_showLog&dev=$logtype&logdev=$d". "&gplotfile=$type&logfile=$file$wl"; diff --git a/fhem/FHEM/98_SVG.pm b/fhem/FHEM/98_SVG.pm index e465a1aa6..6c74529d3 100755 --- a/fhem/FHEM/98_SVG.pm +++ b/fhem/FHEM/98_SVG.pm @@ -501,7 +501,8 @@ SVG_readgplotfile($$) my $ldType = $defs{$defs{$wl}{LOGDEVICE}}{TYPE} if($defs{$wl} && $defs{$wl}{LOGDEVICE} && $defs{$defs{$wl}{LOGDEVICE}}); - $ldType = $wl if(!$ldType); + $ldType = $defs{$wl}{TYPE} + if(!$ldType && $defs{$wl}); my ($err, @svgplotfile) = FileRead($gplot_pgm); return ("$err", undef) if($err);