mirror/zoneminder
1
0 Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-10-22 06:24:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Also join the Storage table, and use it for ServerId instead of Monitors table.

Browse Source
This commit is contained in:
Isaac Connor committed 2018-01-03 07:20:20 -08:00
1 parent 485741b6f7
commit 4e24e3647e
1 file changed
+9 -8
Download Patch File Download Diff File Expand all files Collapse all files
scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
+9 -8
View File
@@ -133,24 +133,25 @@ sub Sql {
my $self = $_[0];
if ( ! $$self{Sql} ) {
my $filter_expr = ZoneMinder::General::jsonDecode( $self->{Query} );
my $sql = "SELECT E.*,
my $sql = 'SELECT E.*,
unix_timestamp(E.StartTime) as Time,
M.Name as MonitorName,
M.DefaultRate,
M.DefaultScale
FROM Events as E
INNER JOIN Monitors as M on M.Id = E.MonitorId
";
INNER JOIN Storage as S on S.Id = E.StorageId
';
$self->{Sql} = '';
if ( $filter_expr->{terms} ) {
foreach my $term ( @{$filter_expr->{terms}} ) {
if ( exists($term->{cnj}) ) {
$self->{Sql} .= ' '.$term->{cnj}." ";
$self->{Sql} .= ' '.$term->{cnj}.' ';
}
if ( exists($term->{obr}) ) {
$self->{Sql} .= ' '.str_repeat( "(", $term->{obr} )." ";
$self->{Sql} .= ' '.str_repeat( '(', $term->{obr} ).' ';
}
my $value = $term->{val};
my @value_list;
@@ -159,7 +160,7 @@ sub Sql {
my ( $temp_attr_name ) = $term->{attr} =~ /^Monitor(.+)$/;
$self->{Sql} .= 'M.'.$temp_attr_name;
} elsif ( $term->{attr} =~ /^Server/ ) {
$self->{Sql} .= 'M.'.$term->{attr};
$self->{Sql} .= 'S.'.$term->{attr};
# StartTime options
} elsif ( $term->{attr} eq 'DateTime' ) {
@@ -171,9 +172,9 @@ sub Sql {
} elsif ( $term->{attr} eq 'StartDate' ) {
$self->{Sql} .= 'to_days( E.StartTime )';
} elsif ( $term->{attr} eq 'Time' ) {
$self->{Sql} .= "extract( hour_second from E.StartTime )";
$self->{Sql} .= 'extract( hour_second from E.StartTime )';
} elsif ( $term->{attr} eq 'Weekday' ) {
$self->{Sql} .= "weekday( E.StartTime )";
$self->{Sql} .= 'weekday( E.StartTime )';
# EndTIme options
} elsif ( $term->{attr} eq 'EndDateTime' ) {
@@ -181,7 +182,7 @@ sub Sql {
} elsif ( $term->{attr} eq 'EndDate' ) {
$self->{Sql} .= 'to_days( E.EndTime )';
} elsif ( $term->{attr} eq 'EndTime' ) {
$self->{Sql} .= "extract( hour_second from E.EndTime )";
$self->{Sql} .= 'extract( hour_second from E.EndTime )';
} elsif ( $term->{attr} eq 'EndWeekday' ) {
$self->{Sql} .= "weekday( E.EndTime )";