From 5050ba3b7f00fb78cb2f627dec0123f7db256baf Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Fri, 12 Jan 2018 21:32:18 +0000 Subject: [PATCH] 98_SVG.pm: favor plotReplace against title for replacement (Forum #82619) git-svn-id: https://svn.fhem.de/fhem/trunk@15863 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/98_SVG.pm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/fhem/FHEM/98_SVG.pm b/fhem/FHEM/98_SVG.pm index 5af215adb..49c596011 100644 --- a/fhem/FHEM/98_SVG.pm +++ b/fhem/FHEM/98_SVG.pm @@ -879,6 +879,18 @@ SVG_substcfg($$$$$$) my $gplot_script = join("", @{$cfg}); $gplot_script .= $plot if(!$splitret); + my $plotReplace = AttrVal($wl, "plotReplace", undef); + if($plotReplace) { + my ($list, $pr) = parseParams($plotReplace, "\\s"," "); + for my $k (keys %$pr) { + if($pr->{$k} =~ m/^{.*}$/) { + $cmdFromAnalyze = $pr->{$k}; + $pr->{$k} = eval $cmdFromAnalyze; + } + $gplot_script =~ s/<$k>/$pr->{$k}/g; + } + } + $gplot_script =~ s//$tmpfile/g; $gplot_script =~ s//$file/g; @@ -895,18 +907,6 @@ SVG_substcfg($$$$$$) } } - my $plotReplace = AttrVal($wl, "plotReplace", undef); - if($plotReplace) { - my ($list, $pr) = parseParams($plotReplace, "\\s"," "); - for my $k (keys %$pr) { - if($pr->{$k} =~ m/^{.*}$/) { - $cmdFromAnalyze = $pr->{$k}; - $pr->{$k} = eval $cmdFromAnalyze; - } - $gplot_script =~ s/<$k>/$pr->{$k}/g; - } - } - $plot =~ s/\r//g; # For our windows friends... $gplot_script =~ s/\r//g;