mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

98_SVG.pm: allow commands separated with ; in FileLog expression.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@8882 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2015-07-03 18:47:02 +00:00
parent 5b26e7d6e8
commit eb04df2ef7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fhem/FHEM/98_SVG.pm
View File

@@ -1002,7 +1002,7 @@ SVG_doShowLog($$$$;$)
my $oll = $attr{global}{verbose}; my $oll = $attr{global}{verbose};
$attr{global}{verbose} = 0; # Else the filenames will be Log'ged $attr{global}{verbose} = 0; # Else the filenames will be Log'ged
my @path = split(" ", my @path = split(" ",
FW_fC("get $d $file $tmpfile $f $t $srcDesc->{all}")); FW_fC("get $d $file $tmpfile $f $t $srcDesc->{all}", 1));
$attr{global}{verbose} = $oll; $attr{global}{verbose} = $oll;
# replace the path with the temporary filenames of the filelog output # replace the path with the temporary filenames of the filelog output
@@ -1029,7 +1029,7 @@ SVG_doShowLog($$$$;$)
my $oll = $attr{global}{verbose}; my $oll = $attr{global}{verbose};
$attr{global}{verbose} = 0; # Else the filenames will be Log'ged $attr{global}{verbose} = 0; # Else the filenames will be Log'ged
my @path = split(" ", my @path = split(" ",
FW_fC("get $d $file $tmpfile $f $t $srcDesc->{all}")); FW_fC("get $d $file $tmpfile $f $t $srcDesc->{all}", 1));
$attr{global}{verbose} = $oll; $attr{global}{verbose} = $oll;
# replace the path with the temporary filenames of the filelog output # replace the path with the temporary filenames of the filelog output
@@ -1112,7 +1112,7 @@ SVG_getData($$$$$)
my $s = $srcDesc->{src}{$src}; my $s = $srcDesc->{src}{$src};
my $fname = ($src eq $defs{$d}{LOGDEVICE} ? $defs{$d}{LOGFILE} : "CURRENT"); my $fname = ($src eq $defs{$d}{LOGDEVICE} ? $defs{$d}{LOGFILE} : "CURRENT");
my $cmd = "get $src $fname INT $f $t ".$s->{arg}; my $cmd = "get $src $fname INT $f $t ".$s->{arg};
FW_fC($cmd); FW_fC($cmd, 1);
if($showData) { if($showData) {
$ret .= "\n$cmd\n\n"; $ret .= "\n$cmd\n\n";
$ret .= $$internal_data if(ref $internal_data eq "SCALAR"); $ret .= $$internal_data if(ref $internal_data eq "SCALAR");