FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 16:56:54 +00:00
Code Issues Releases Wiki Activity

98_SVG.pm: fix error message if SVG_showLog is called with junk (Forum #87561)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@16719 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2018-05-10 14:06:03 +00:00
parent 7375f17fbc
commit fdad22a58f
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fhem/FHEM/98_SVG.pm
View File

@ -764,17 +764,19 @@ SVG_readgplotfile($$$)
# Read in the template gnuplot file. Digest the #FileLog lines. Replace # Read in the template gnuplot file. Digest the #FileLog lines. Replace
# the plot directive with our own, as we offer a file for each line # the plot directive with our own, as we offer a file for each line
my (%srcDesc, @data, $plot); my (%srcDesc, @data, $plot);
my ($err1, $err2, @svgplotfile);
return ("Nonexisting device $wl specified", @svgplotfile)
if(!$defs{$wl});
my $ld = $defs{$wl}{LOGDEVICE} my $ld = $defs{$wl}{LOGDEVICE}
if($defs{$wl} && $defs{$wl}{LOGDEVICE}); if($defs{$wl}{LOGDEVICE});
my $ldType = $defs{$defs{$wl}{LOGDEVICE}}{TYPE} my $ldType = $defs{$defs{$wl}{LOGDEVICE}}{TYPE}
if($ld && $defs{$ld}); if($ld && $defs{$ld});
if(!$ldType && $defs{$wl}) { if(!$ldType) {
$ldType = $defs{$wl}{TYPE}; $ldType = $defs{$wl}{TYPE};
$ld = $wl; $ld = $wl;
} }
my ($err1, $err2, @svgplotfile);
($err1, @svgplotfile) = FileRead($gplot_pgm); ($err1, @svgplotfile) = FileRead($gplot_pgm);
($err2, @svgplotfile) = FileRead("$FW_gplotdir/template.gplot") if($err1); ($err2, @svgplotfile) = FileRead("$FW_gplotdir/template.gplot") if($err1);
return ($err1, undef) if($err2); return ($err1, undef) if($err2);
@ -819,7 +821,7 @@ SVG_readgplotfile($$$)
} }
if($plotfn) { if($plotfn) {
Log 3, "$wl: space is not allowed in $ldType definition: $plotfn" Log 3, "$wl: space is not allowed in >$ldType< definition: $plotfn"
if($plotfn =~ m/\s/); if($plotfn =~ m/\s/);
if ($specval) { if ($specval) {
my @spec = split(" ",$specval); my @spec = split(" ",$specval);
@ -1113,10 +1115,10 @@ SVG_doShowLog($$$$;$)
my ($err, $cfg, $plot, $srcDesc) = SVG_readgplotfile($wl, $gplot_pgm, $pm); my ($err, $cfg, $plot, $srcDesc) = SVG_readgplotfile($wl, $gplot_pgm, $pm);
if($err || !$defs{$d}) { if($err || !$defs{$d}) {
my $msg = ($defs{$d} ? "Cannot read $gplot_pgm" : "No Logdevice $d"); my $msg = ($err ? $err : "No Logdevice >$d<");
Log3 $FW_wname, 1, $msg; Log3 $FW_wname, 1, $msg;
if($pm =~ m/SVG/) { # FW_fatal for SVG: if($pm && $pm =~ m/SVG/) { # FW_fatal for SVG:
$FW_RETTYPE = "image/svg+xml"; $FW_RETTYPE = "image/svg+xml";
FW_pO '<svg xmlns="http://www.w3.org/2000/svg">'; FW_pO '<svg xmlns="http://www.w3.org/2000/svg">';
FW_pO '<text x="20" y="20">'.$msg.'</text>'; FW_pO '<text x="20" y="20">'.$msg.'</text>';

4
fhem/www/gplot/template.gplot
View File

@ -1,7 +1,5 @@
############################ ############################
# Display the power reported by the EM1010 # Template .gplot file for creating a new SVG instance
# Corresponding FileLog definition:
# define ememlog FileLog /var/log/fhem/emem-%Y.log emem:power.*
set terminal png transparent size <SIZE> crop set terminal png transparent size <SIZE> crop
set output '<OUT>.png' set output '<OUT>.png'