FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-12 02:39:57 +00:00
Code Issues Releases Wiki Activity

98_SVG.pm/92_FileLog.pm: add SVG_regexpFn function (Forum #40176)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@9107 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2015-08-22 13:16:05 +00:00
parent 3c109fb2ec
commit 854e7c1ebc
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fhem/FHEM/92_FileLog.pm
View File

@ -43,6 +43,7 @@ FileLog_Initialize($)
$hash->{FW_summaryFn} = "FileLog_fhemwebFn";
$hash->{FW_detailFn} = "FileLog_fhemwebFn";
$hash->{SVG_sampleDataFn} = "FileLog_sampleDataFn";
$hash->{SVG_regexpFn} = "FileLog_regexpFn";
$data{FWEXT}{"/FileLog_toSVG"}{CONTENTFUNC} = "FileLog_toSVG";
$data{FWEXT}{"/FileLog_logWrapper"}{CONTENTFUNC} = "FileLog_logWrapper";
@ -989,6 +990,18 @@ FileLog_sampleDataFn($$$$$)
return ($desc, \@htmlArr, $example);
}
sub
FileLog_regexpFn($$)
{
my ($name, $filter) = @_;
$filter = " $filter ";
$filter =~ s/ [^: ]*:/ /g;
$filter =~ s/:[^ ]* / /g;
$filter =~ s/(^ | $)//g;
$filter =~ s/ /|/g;
return $filter;
}
1;
=pod

11
fhem/FHEM/98_SVG.pm
View File

@ -1285,11 +1285,12 @@ SVG_render($$$$$$$$$$)
my $w = $ow-$nr_left_axis*$axis_width-$nr_right_axis*$axis_width;
my $h = $oh-2*$y; # Rect size
my $filter = $srcDesc->{all}." ";
$filter =~ s/ [^: ]*:/ /g;
$filter =~ s/:[^ ]* / /g;
$filter =~ s/(^ | $)//g;
$filter =~ s/ /|/g;
my @filter;
foreach my $src (keys $srcDesc->{src}) {
my $f = CallFn($src, "SVG_regexpFn", $src, $srcDesc->{src}{$src}{arg});
push(@filter, $f) if($f);
}
my $filter = join("|", @filter);
$filter =~ s/"/./g;
$filter = AttrVal($parent_name, "longpollSVG", 0) ? "flog=\"$filter\"" : "";