ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rough in Pre and Post SQL Conditions in execute. Rough in ExistsInFileSystem support. Needs more work.

pull/3040/head
Isaac Connor 2020-08-15 17:49:11 -04:00
parent 49316244a8
commit b8433373b5
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
View File

@ -82,8 +82,8 @@ sub Execute {
my $self = $_[0];
my $sql = $self->Sql(undef);
if ( @{$$self{PreConditions}} ) {
foreach my $term ( @{$$self{PreConditions}} ) {
if ( @{$$self{PreSQLConditions}} ) {
foreach my $term ( @{$$self{PreSQLConditions}} ) {
if ( $$term{attr} eq 'DiskPercent' ) {
}
}
@ -116,10 +116,22 @@ sub Execute {
}
$sth->finish();
Debug('Loaded ' . @results . ' events for filter '.$$self{Name}.' using query ('.$sql.')"');
if ( $self->{HasNonSqlConditions} ) {
}
if ( $self->{PostSQLConditions} ) {
my @filtered_events;
foreach my $term ( @{$$self{PostSQLConditions}} ) {
if ( $$term{attr} eq 'ExistsInFileSystem' ) {
foreach my $row ( @results ) {
my $event = new ZoneMinder::Event($row);
if ( -e $event->Path() ) {
push @filtered_events, $row;
}
}
}
} # end foreach term
@results = @filtered_events;
} # end if has PostSQLConditions
return @results;
}
} # end sub Execute
sub Sql {
my $self = shift;