ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 343 - Fixed issue with monitor names in filters. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1993 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2006-05-25 14:02:15 +00:00
parent 67573429a2
commit 391d6f0345
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/zmfilter.pl
View File

@ -250,7 +250,7 @@ sub getFilters
my @value_list; my @value_list;
if ( $filter_terms{$attr_name} ) if ( $filter_terms{$attr_name} )
{ {
if ( $filter_terms{$attr_name} =~ '/^Monitor/' ) if ( $filter_terms{$attr_name} =~ /^Monitor/ )
{ {
my ( $temp_attr_name ) = $filter_terms{$attr_name} =~ /^Monitor(.+)$/; my ( $temp_attr_name ) = $filter_terms{$attr_name} =~ /^Monitor(.+)$/;
$filter_sql .= "M.".$temp_attr_name; $filter_sql .= "M.".$temp_attr_name;
@ -289,7 +289,7 @@ sub getFilters
( my $stripped_value = $value ) =~ s/^["\']+?(.+)["\']+?$/$1/; ( my $stripped_value = $value ) =~ s/^["\']+?(.+)["\']+?$/$1/;
foreach my $temp_value ( split( '/["\'\s]*?,["\'\s]*?/', $stripped_value ) ) foreach my $temp_value ( split( '/["\'\s]*?,["\'\s]*?/', $stripped_value ) )
{ {
if ( $filter_terms{$attr_name} =~ '/^Monitor/' ) if ( $filter_terms{$attr_name} =~ /^Monitor/ )
{ {
$value = "'$temp_value'"; $value = "'$temp_value'";
} }