Isaac Connor
84b8e43034
Only start a transaction if we are not already in a transaction
2021-10-28 15:28:55 -04:00
Isaac Connor
15a7c22b94
layout->layer
2021-10-28 15:26:12 -04:00
ColorfullyZhang
d7abdb1505
Set character set as utf8 when connect to mysql to avoid mistakes when there are Chinese characters in storage path.
2021-10-28 15:18:55 -04:00
Isaac Connor
ee30c0f05e
add a comment about rollbacks
2021-10-28 12:03:58 -04:00
Isaac Connor
a6795cd026
Just return the error
2021-10-28 11:59:36 -04:00
Isaac Connor
6e68a35861
Remove dead code, remove locking from CopyTo, put locking into MoveTo.
2021-10-28 11:59:23 -04:00
Isaac Connor
dd758aacac
Fix Event count subsitutions in emails because they are no longer in Monitor_Status. They are in Event_Summaries. So create a new object for them and use it.
2021-10-27 12:21:30 -04:00
Isaac Connor
a258567c16
You cannot commit on error because it releases the locks.
2021-10-25 09:44:27 -04:00
Isaac Connor
b5bb5e67ff
Change commands used to set and goto presets. Fixes #3371
2021-10-19 13:16:21 -04:00
Isaac Connor
ad1db2c960
Only suspend/resume motion detection if the monitor is doing motion detection
2021-09-08 13:59:34 -04:00
criadoperez
4d09e5f93f
Fixed broken wiki links
2021-09-08 13:59:07 -04:00
Isaac Connor
09d4f0f9c2
Add missing fields. defaults need to be quoted because they are evalled
2021-09-04 10:44:12 -04:00
Isaac Connor
29e8d39c74
defaults need to be quoted because they are evalled
2021-09-04 10:44:04 -04:00
Isaac Connor
8da5a1d2c9
If we fail to suspend/resume, assume we need to disconnect/reconnect to the mmap
2021-09-04 10:00:55 -04:00
Isaac Connor
9ebff52c44
Add a 5 second timeout when setting suspending/resuming motion detection.Log errors appropriately
2021-09-04 10:00:42 -04:00
Isaac Connor
e9dab48834
Fix building SQL for ExistsInFileSystem PostCondition. Fix how we turn the rows into Event objects. Fix value handling in ExistsInFileSystem post condition.
2021-09-04 09:59:38 -04:00
Isaac Connor
f319d02373
Fix PTZ Diagonal cmds. Fixes #3300
2021-09-03 22:39:44 -04:00
Isaac Connor
f6c29b51ef
Fix EndTime case handling.
2021-06-14 11:58:06 -04:00
Isaac Connor
db0f9911ae
merge fixes from #3295 . Fixes #3295 .
2021-06-14 09:55:43 -04:00
Isaac Connor
bdae5dd9f8
Sort field should be StartDateTime not StartTime
2021-05-12 10:32:03 -04:00
Isaac Connor
9ee5e983d6
Add ZM_FEATURES_SNAPSHOTS to Config. Fix true=>yes
2021-05-04 13:19:10 -04:00
Isaac Connor
91a09608ea
Use newlines to make debugging sql easier to read.
2021-05-02 13:37:26 -04:00
Isaac Connor
202c4ef28c
copy array_diff sub into Object so we don't have the dependency
2021-04-29 19:00:36 -04:00
Isaac Connor
e32771c255
Add Zones() to Monitor
2021-04-29 14:49:39 -04:00
Isaac Connor
69098ccdcb
Implement changes() in Object
2021-04-29 14:49:30 -04:00
Isaac Connor
df754f0085
Can't do suspend in sendCmd
2021-04-24 19:22:17 -04:00
Isaac Connor
8d4c2afda8
Can't do suspend in sendCmd
2021-04-24 12:00:38 -04:00
Isaac Connor
4843cb8593
Add ModectDuringPTZ and suspend and resume functions
2021-04-23 14:52:29 -04:00
Isaac Connor
e256d9a5a8
Use ZoneMinder::Monitor->find_one instead of zmDbGetMonitor so that we get an object with useful methods
2021-04-23 14:52:29 -04:00
Isaac Connor
36ac473ad2
Add suspend/resume of MotionDetection of ModectDuringPTZ is off.
2021-04-23 14:52:29 -04:00
Isaac Connor
7c70c26fbd
Cleanup old Continuous stop. Rename lastMove to LastCmd and implement for Zoom
2021-04-21 14:30:02 -04:00
root
200dda11a2
Merge branch 'continuous' into cont_mast
2021-04-16 10:07:10 -04:00
Isaac Connor
c9c4224dd2
Change url used for authentication to magicBox.cgi?action=getDeviceType
2021-04-14 17:19:07 -04:00
Isaac Connor
7489c3850d
Store last command for continuous moves so that moveStop can send the correct stop command
2021-04-14 17:19:01 -04:00
Isaac Connor
4ead6886a3
Make shm debug level 3
2021-04-10 15:40:37 -04:00
Isaac Connor
da630f7534
Move shm Memory debug statements to level 2.
2021-04-10 15:35:24 -04:00
Isaac Connor
60970673c7
Implement debug levels in perl side. DEBUG==DEBUG1.
2021-04-10 15:35:04 -04:00
Isaac Connor
757ec2dbc1
Improve zmDbDo to return rows affected instead of boolean
2021-04-01 09:27:20 -04:00
Isaac Connor
9f5bc8b2b9
Merge pull request #3174 from akeyx/3173-bugfix-fix-onvif-control
...
3173 bugfix fix onvif control
2021-03-30 18:38:00 -04:00
Isaac Connor
dedf42371b
copy onvif.pm which isn't actually onvif to FoscamCGI.pm We will later replace onvif.pm with an Actual onvif implementation.
2021-03-30 18:32:42 -04:00
Isaac Connor
d54ba9b324
Change url used for authentication to magicBox.cgi?action=getDeviceType
2021-03-30 16:14:42 -04:00
Isaac Connor
21cf1f47a5
GroupIds is not a valid Column in Monitors
2021-03-25 17:33:04 -04:00
Arek Kossendowski
0eab9987fc
Just updated the script with moveMap and moveRel functions.
2021-02-26 00:11:29 +00:00
Arek Kossendowski
36f11158df
Replaced the onvif control module with a modified version of Netcat.
...
The original onvif module was NOT at all ONVIF protocol implementation.
This one pretty much copies the Netcat module but with a bit of clarity
to the XML that is sent to the camera but most importantly allows
specification of full onvif URL including authentication and control URI
through the Control Address field. Parsing of the url is done through a
combination of sane defaults and the URI module.
2021-02-25 22:37:34 +00:00
Jim Perkins
9a37c393cc
Update HikVision.pm
...
ERR [Can't access name:zoomStop AUTOLOAD:ZoneMinder::Control::HikVision::zoomStop member of object of class ZoneMinder::Control::HikVision from main:186]
https://forums.zoneminder.com/viewtopic.php?f=9&t=25442&p=119856#p119856
2021-02-17 19:02:01 -06:00
Isaac Connor
217d632f1a
Remove epadding, last_frame_score replaced it
2021-02-17 11:54:30 -05:00
Isaac Connor
e601c08ed0
last_read_index and last_write_index are not int32_ts. Add last_motion_score which should fix our failure to detect alarms in zmalarm etc
2021-02-16 16:56:10 -05:00
Peter Keresztes Schmidt
6c9983155c
Build: Reindent the CMakeLists
...
Indent with 2 spaces
Also remove expressions form closing tags. They have been made optional a while ago since they make reading rather more difficult.
2021-02-04 22:00:56 +01:00
Isaac Connor
bf8b3fee2a
Merge pull request #3126 from Carbenium/cmake-man-pages
...
Build: Make building man pages optional (enabled by default)
2021-02-04 12:05:22 -05:00
Peter Keresztes Schmidt
4db0dea1f2
Build: Make building man pages optional (enabled by default)
...
Add a new CMake option (-DBUILD_MAN) which can be used
to deactivate the man page build steps.
This is especially useful in a development situation where "make all"
is needlessly slowed down by these build steps.
2021-02-03 21:22:28 +01:00