Commit Graph

309 Commits

Author SHA1 Message Date
Isaac Connor 27736fb5d9 Merge ../ZoneMinder.master into storageareas 2018-03-15 11:04:41 -04:00
Andy Bauer b41363fd60 Merge branch 'patch-3' of https://github.com/habibapp1365/zoneminder into habibapp1365-patch-3 2018-03-06 11:37:49 -06:00
habibapp1365 aa2134bde4
Update zm_create.sql.in 2018-03-06 19:59:06 +03:30
Isaac Connor 3aa31fd524 Merge branch 'master' into storageareas 2018-02-23 10:23:35 -05:00
Isaac Connor cece2f35f0 remove triggers from zm_create.sql.in as they are now contained in triggers.sql 2018-02-23 07:50:05 -05:00
Isaac Connor 0a6b463301 FIx MontageLayout=>MontageLayouts 2018-02-23 07:46:37 -05:00
Isaac Connor 0ad01f09bd refix triggers updating EventCounts. remove unsigned from eventcounts and diskspace totals. 2018-02-20 22:48:23 -05:00
Isaac Connor e18a14337f use path to triggers.sql 2018-02-18 11:47:03 -05:00
Isaac Connor 94212eda2f fix triggers 2018-02-18 11:01:33 -05:00
Isaac Connor 717d00ac99 missing // 2018-02-09 16:08:44 -05:00
Isaac Connor 4c5e47b050 fix DiskSpace summing when Nulls are present 2018-02-07 08:02:05 -05:00
Isaac Connor 0f83dfc769 Correct events_day, etc update trigger 2018-02-06 08:43:09 -05:00
flashoftheblades 34f6584081
Update zm_create.sql.in 2018-02-05 18:53:47 -05:00
Isaac Connor 86ae1b6598 Add missing commas 2018-02-05 17:31:34 -05:00
Isaac Connor 6822643d22 add update triggers for all the event tables so that diskspace counts work 2018-02-05 15:46:39 -05:00
Isaac Connor a7171eccf6 Replace EventTotal Updates in zmstats.pl with triggers which will hold locks less. Move stats updates to zmaudit.pl 2018-02-03 14:54:01 -05:00
Isaac Connor 8e547134d5 Replace EventTotal Updates in zmstats.pl with triggers which will hold locks less. Move stats updates to zmaudit.pl 2018-02-03 14:50:19 -05:00
Isaac Connor 12c4ab07ea use COALESCE to ensure integer values 2018-02-03 11:01:26 -05:00
Isaac Connor 868e17a414 Allow Method in Monitors to be NULL 2018-02-02 10:31:55 -05:00
Isaac Connor 73edd3221a make DiskSpace in storage table be int instead of unsigned. Event deletions can make it go negative and then the delete fails. 2018-02-01 11:32:44 -05:00
Isaac Connor ef51a21df4 add new runstate called Connected 2018-01-31 14:36:41 -05:00
Isaac Connor 456f29fcba Rename column Id OF Monitor_Statuses to simplify JOINS. 2018-01-26 13:39:37 -05:00
Isaac Connor 2d9f9125aa add update_storage_stats procedure 2018-01-26 13:08:10 -05:00
Isaac Connor 0bd1ee5992 Merge branch 'master' into m 2018-01-25 08:43:31 -05:00
Isaac Connor 50fc4a2d94 Use a memory table called Monitor_Status to store FPS and Status info for Monitors. This is to reduce locking and updates on the main Monitors table. 2018-01-24 11:51:11 -05:00
Simpler1 ce19c65cc9 Ipcc (#2040)
* fix(ipcc): Invert up/down to work properly

* fix(ipcc): Change the initial values for ipcc camera
2018-01-22 15:33:11 -05:00
Isaac Connor bc792a8325 Use coalesce to handle NULLs 2018-01-19 13:09:46 -05:00
Isaac Connor 2ce68e83c5 Update TotalEvents on event_insertion 2018-01-19 12:15:05 -05:00
Isaac Connor 1dbd8405a4 restructure indexes on the various Events tables. Use two separate indexes for MonitorId and StartTime because we access these tables using one or the other, but rarely both 2018-01-18 11:39:09 -05:00
Isaac Connor 306e9a75ee Fix issues with a period in the column name 2018-01-16 21:45:01 -05:00
Isaac Connor 9f42871c86 Fix Zone Triggers, bump version 2018-01-16 11:49:17 -05:00
Isaac Connor 48b636c749 fix missing triggers on Events tables. Add triggers for ZoneCount updating. 2018-01-16 09:30:40 -05:00
Isaac Connor bb0974044b add Scheme to Events 2018-01-15 17:45:45 -05:00
Andrew Bauer 7451afcfab
delete extra apostraphe 2018-01-15 11:13:26 -06:00
Andrew Bauer 31cc03eafc
fix datatype issue with BTTV Video presets 2018-01-15 09:45:40 -06:00
Andrew Bauer d54f3f7168
fix misaligned fields in Axis & Qihan presets 2018-01-15 09:15:57 -06:00
Andrew Bauer 80362f99fa fix misaligned db fields for certain presets (#2034) 2018-01-14 21:14:30 -05:00
Isaac Connor 4d342abf53 fixes 2018-01-11 14:34:57 -05:00
Isaac Connor 5e0c954aff remove crap 2018-01-10 15:23:22 -05:00
Isaac Connor f246599704 Fix inserting default Server entry 2018-01-10 14:56:12 -05:00
Isaac Connor f5b8461a54 Fix indexes on Groups_MOnitors 2018-01-10 14:33:31 -05:00
Isaac Connor 92bc6d6c20 put back the .pl 2018-01-10 12:55:42 -05:00
Isaac Connor acd12d234a add Events_Archived table. Add zmstats, zmaudit and zmtrigger settings to Servers table to tell if we should run the services or not. Fix a missing backtick at Scheme 2018-01-10 12:26:59 -05:00
Isaac Connor 1db4d7df83 start work on Events_(Hour|Day|Month|etc) tables for the event count data 2018-01-09 16:35:28 -05:00
Isaac Connor 5c75df1a40 drop archived and Frames indexes from Events, as they are useless. Add a StorageId Index 2018-01-05 14:40:03 -05:00
Isaac Connor 6c07347721 Fix Update DiskSpace Filter adding 2018-01-01 13:19:16 -05:00
Isaac Connor a79017b168 add a KEY to Events for EndTime and DiskSpace, since we are constantly selecting on those. Insert the Update DiskSpace filter on db creation. 2018-01-01 12:43:47 -05:00
Isaac Connor 0c350b8f41 add ServerId to Storage 2017-12-22 11:38:59 -08:00
Isaac Connor 2c1aa2a92f missing ; 2017-12-20 21:22:37 -05:00
Isaac Connor d312482a2b add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE 2017-12-18 12:52:26 -05:00