Merge branch 'release-1.34'
This commit is contained in:
commit
c14e141295
|
@ -13,6 +13,8 @@ SET @s = (SELECT IF(
|
|||
PREPARE stmt FROM @s;
|
||||
EXECUTE stmt;
|
||||
|
||||
UPDATE `Events` SET `SaveJPEGs`=(SELECT `SaveJPEGs` FROM `Monitors` WHERE Monitors.Id = MonitorId) WHERE `SaveJPEGs` IS NULL;
|
||||
|
||||
SET @s = (SELECT IF(
|
||||
(SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
|
||||
AND table_name = 'Storage'
|
||||
|
|
|
@ -146,15 +146,15 @@ sub zmDbGetMonitors {
|
|||
|
||||
if ( $function ) {
|
||||
if ( $function == DB_MON_CAPT ) {
|
||||
$sql .= " where `Function` >= 'Monitor'";
|
||||
$sql .= " WHERE `Function` >= 'Monitor'";
|
||||
} elsif ( $function == DB_MON_ACTIVE ) {
|
||||
$sql .= " where `Function` > 'Monitor'";
|
||||
$sql .= " WHERE `Function` > 'Monitor'";
|
||||
} elsif ( $function == DB_MON_MOTION ) {
|
||||
$sql .= " where `Function` = 'Modect' or Function = 'Mocord'";
|
||||
$sql .= " WHERE `Function` = 'Modect' OR `Function` = 'Mocord'";
|
||||
} elsif ( $function == DB_MON_RECORD ) {
|
||||
$sql .= " where `Function` = 'Record' or Function = 'Mocord'";
|
||||
$sql .= " WHERE `Function` = 'Record' OR `Function` = 'Mocord'";
|
||||
} elsif ( $function == DB_MON_PASSIVE ) {
|
||||
$sql .= " where `Function` = 'Nodect'";
|
||||
$sql .= " WHERE `Function` = 'Nodect'";
|
||||
}
|
||||
}
|
||||
my $sth = $dbh->prepare_cached( $sql );
|
||||
|
|
Loading…
Reference in New Issue