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

Changed to not use from_unixtime in time calculations. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@629 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2003-07-11 09:37:01 +00:00
parent dccacc72aa
commit a8b8c6b5fd
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/zmfilter.pl.z
View File

@ -330,32 +330,32 @@ sub GetFilters
{ {
if ( $filter_terms{$attr_name} eq 'DateTime' ) if ( $filter_terms{$attr_name} eq 'DateTime' )
{ {
my $dt_val = strtotime( $filter_terms{$value_name} ); my $dt_val = strftime( "%Y-%m-%d %H:%M:%S", strtotime( $filter_terms{$value_name} ) );
if ( !$dt_val ) if ( !$dt_val )
{ {
printf( STDERR "Error, unable to parse date '$filter_terms{$value_name}', skipping\n" ); printf( STDERR "Error, unable to parse date '$filter_terms{$value_name}', skipping\n" );
next FILTER; next FILTER;
} }
$filter_sql .= "E.StartTime ".$filter_terms{$op_name}." from_unixtime( $dt_val )"; $filter_sql .= "E.StartTime ".$filter_terms{$op_name}." '$dt_val'";
# Indicate that this filter uses dates and so should not be dependant on the event id # Indicate that this filter uses dates and so should not be dependant on the event id
$filter_data->{has_dates} = !undef; $filter_data->{has_dates} = !undef;
} }
elsif ( $filter_terms{$attr_name} eq 'Date' ) elsif ( $filter_terms{$attr_name} eq 'Date' )
{ {
my $dt_val = strtotime( $filter_terms{$value_name} ); my $dt_val = strftime( "%Y-%m-%d %H:%M:%S", strtotime( $filter_terms{$value_name} ) );
$filter_sql .= "to_days( E.StartTime ) ".$filter_terms{$op_name}." to_days( from_unixtime( $dt_val ) )"; $filter_sql .= "to_days( E.StartTime ) ".$filter_terms{$op_name}." to_days( '$dt_val' )";
# Indicate that this filter uses dates and so should not be dependant on the event id # Indicate that this filter uses dates and so should not be dependant on the event id
$filter_data->{has_dates} = !undef; $filter_data->{has_dates} = !undef;
} }
elsif ( $filter_terms{$attr_name} eq 'Time' ) elsif ( $filter_terms{$attr_name} eq 'Time' )
{ {
my $dt_val = strtotime( $filter_terms{$value_name} ); my $dt_val = strftime( "%Y-%m-%d %H:%M:%S", strtotime( $filter_terms{$value_name} ) );
$filter_sql .= "extract( hour_second from E.StartTime ) ".$filter_terms{$op_name}." extract( hour_second from from_unixtime( $dt_val ) )"; $filter_sql .= "extract( hour_second from E.StartTime ) ".$filter_terms{$op_name}." extract( hour_second from '$dt_val' )";
} }
elsif ( $filter_terms{$attr_name} eq 'Weekday' ) elsif ( $filter_terms{$attr_name} eq 'Weekday' )
{ {
my $dt_val = strtotime( $filter_terms{$value_name} ); my $dt_val = strftime( "%Y-%m-%d %H:%M:%S", strtotime( $filter_terms{$value_name} ) );
$filter_sql .= "weekday( E.StartTime ) ".$filter_terms{$op_name}." weekday( from_unixtime( $dt_val ) )"; $filter_sql .= "weekday( E.StartTime ) ".$filter_terms{$op_name}." weekday( '$dt_val' )";
} }
elsif ( $filter_terms{$attr_name} eq 'Archived' ) elsif ( $filter_terms{$attr_name} eq 'Archived' )
{ {