Author: arekm Date: Thu Jan 20 09:04:26 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- fix for zmfilter
---- Files affected:
packages/zoneminder:
zoneminder-build.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/zoneminder/zoneminder-build.patch
diff -u packages/zoneminder/zoneminder-build.patch:1.1
packages/zoneminder/zoneminder-build.patch:1.2
--- packages/zoneminder/zoneminder-build.patch:1.1 Sun Jul 12 19:48:12 2009
+++ packages/zoneminder/zoneminder-build.patch Thu Jan 20 10:04:20 2011
@@ -8,3 +8,14 @@
const std::string stringtf( const char *format, ... )
{
+--- ZoneMinder-1.24.2/scripts/zmfilter.pl.in~ 2009-06-08 11:16:04.000000000
+0200
++++ ZoneMinder-1.24.2/scripts/zmfilter.pl.in 2011-01-20 11:03:41.575750088
+0100
+@@ -270,7 +270,7 @@
+ my $sql = "select E.Id,E.MonitorId,M.Name as
MonitorName,M.DefaultRate,M.DefaultScale,E.Name,E.Cause,E.Notes,E.StartTime,unix_timestamp(E.StartTime)
as
Time,E.Length,E.Frames,E.AlarmFrames,E.TotScore,E.AvgScore,E.MaxScore,E.Archived,E.Videoed,E.Uploaded,E.Emailed,E.Messaged,E.Executed
from Events as E inner join Monitors as M on M.Id = E.MonitorId where not
isnull(E.EndTime)";
+ $db_filter->{Sql} = '';
+
+- if ( @{$filter_expr->{terms}} )
++ if ( $filter_expr->{terms} and @{$filter_expr->{terms}} )
+ {
+ for ( my $i = 0; $i < @{$filter_expr->{terms}}; $i++ )
+ {
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/zoneminder/zoneminder-build.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
