Merge branch 'master' into osx-port

Merge master to osx-port

.cirrus.yml

@@ -1,26 +0,0 @@
-task:
-  name: freebsd-build
-  freebsd_instance:
-    image_family: freebsd-12-2
-
-  prepare_script:
-    - pkg install -yq git cmake jpeg-turbo mysql80-client ffmpeg libvncserver libjwt catch p5-DBI p5-DBD-mysql p5-Date-Manip p5-Test-LWP-UserAgent p5-Sys-Mmap
-
-  configure_script:
-    - git submodule update --init --recursive
-    - mkdir build
-    - cd build
-    - cmake --version
-    - cmake ../ -DBUILD_MAN=0 -DBUILD_TEST_SUITE=1 -DENABLE_WERROR=1
-
-  build_script:
-    - cd build
-    - make -j3
-
-  install_script:
-    - cd build
-    - make install
-
-  test_script:
-    - cd build/tests
-    - ./tests "~[notCI]"

.eslintignore

@@ -1,19 +1,4 @@
-*.min.js
-
-# libraries
 web/api/lib
-web/includes/csrf/
-web/js/videojs.zoomrotate.js
-web/skins/classic/js/bootstrap.js
-web/skins/classic/js/chosen
-web/skins/classic/js/dateTimePicker
-web/skins/classic/js/jquery-*.js
-web/skins/classic/js/jquery-ui-*
+web/skins/classic/js/jquery-1.11.3.js
 web/skins/classic/js/jquery.js
-web/skins/classic/js/moment.js
-web/skins/classic/js/video.js
 web/tools/mootools
-
-# Cannot be parsed as JS
-web/skins/classic/includes/export_functions.php
-web/skins/classic/views/events.php

.eslintrc.js

@@ -3,49 +3,27 @@
 module.exports = {
   "env": {
     "browser": true,
-    "es6": true,
   },
   "extends": ["google"],
-  "overrides": [{
-    // eslint-plugin-html handles eol-last slightly different - it applies to
-    // each set of script tags, so we turn it off here.
-    "files": "**/*.*php",
-    "rules": {
-      "eol-last": "off",
-      "indent": "off",
-    },
-  }],
-  "plugins": [
-    "html",
-    "php-markup",
-  ],
   "rules": {
+    "brace-style": "off",
     "camelcase": "off",
     "comma-dangle": "off",
-    "guard-for-in": "off",
+    "key-spacing": "off",
     "max-len": "off",
     "new-cap": ["error", {
       capIsNewExceptions: ["Error", "Warning", "Debug", "Polygon_calcArea", "Play", "Stop"],
       newIsCapExceptionPattern: "^Asset\.."
     }],
     "no-array-constructor": "off",
-    "no-unused-vars": ["error", {
-      "vars": "local",
-      "args": "none",
-      "ignoreRestSiblings": false
-    }],
+    "no-caller": "off",
+    "no-new-object": "off",
+    "no-unused-vars": "off",
     "no-var": "off",
+    "object-curly-spacing": "off",
     "prefer-rest-params": "off",
     "quotes": "off",
     "require-jsdoc": "off",
     "spaced-comment": "off",
   },
-  "settings": {
-    "php/php-extensions": [".php"],
-    "php/markup-replacement": {"php": "", "=": "0"},
-    "php/keep-eol": false,
-    "php/remove-whitespace": false,
-    "php/remove-empty-line": false,
-    "php/remove-php-lint": false
-  },
 };

.git-blame-ignore-revs

@@ -1,2 +0,0 @@
-# Reindent CMakeLists
-6c9983155c65848a3e67976445cd20fb4fbfe108

.github/FUNDING.yml

@@ -1,12 +0,0 @@
-# These are supported funding model platforms
-
-github: [connortechnology,pliablepixels] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: zoneminder # Replace with a single Patreon username
-open_collective: zoneminder # Replace with a single Open Collective username
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/ISSUE_TEMPLATE.md

@@ -1,59 +1,21 @@
-<!--
+You should only file an issue if you found a bug.  Feature and enhancement requests, general discussions and support questions should occur in one of the following areas:
 
-**THIS FORUM IS FOR BUG REPORTS ONLY**
-
-Do not post feature or enhancement requests, general discussions, or support questions here.
-
-Feature and enhancement requests, general discussions, and support questions should occur in one of the following areas:
-
-- The [ZoneMinder-Chat Slack channel](https://zoneminder-chat.herokuapp.com/)
+- The ZoneMinder IRC channel - irc.freenode.net #zoneminder
 - The [ZoneMinder Forum](https://forums.zoneminder.com/)
 
-Docker related issues should be posted here: https://github.com/ZoneMinder/zmdockerfiles
+**Do not post feature or enhancement requests, general discussions or support questions here.**
 
-In order to submit a bug report, please populate the fields below this line. This is required.
+Make sure you are running the latest version of ZoneMinder before reporting an issue.
 
-----------------------------------------------------------------------------------------------------
--->
-**Describe Your Environment**
-<!--
-- Version of ZoneMinder [release version, development version, or commit]
-- How you installed ZoneMinder [e.g. PPA, RPMFusion, from-source, etc]
-- Full name and version of OS
-- Browser name and version (if this is an issue with the web interface)
--->
+**ZoneMinder Version (`zmaudit.pl -v`):**
 
-**If the issue concerns a camera**
-<!--
-- Make and Model
-- Frame rate
-- Resolution
-- ZoneMinder Source Type:
--->
+**Are you using a development snapshot / git checkout?  If so, what is the latest commit? (`git rev-parse HEAD`):**
 
-**Describe the bug**
-<!--
-A clear and concise description of what the bug is.
--->
-**To Reproduce**
-<!--
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
--->
+**Linux Distribution and Version (`cat /etc/os-release` or `cat /etc/redhat-release`):**
 
-**Expected behavior**
-<!--
-A clear and concise description of what you expected to happen.
--->
+**If the issue concerns a camera, provide the make, model, frame rate, resolution and ZoneMinder Source Type:**
 
-**Debug Logs**
+**Relevant log lines:**
 ```
-
-<!--
-<insert debug logs here, please make sure they are within the ``` quotes so they are formatted properly>
--->
-
+log lines here
 ```

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,40 +0,0 @@
----
-name: Bug report
-about: Issues that do not follow the template will be closed
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Describe Your Environment**
-- Version of ZoneMinder [release version, development version, or commit]
-- How you installed ZoneMinder [e.g. PPA, RPMFusion, from-source, etc]
-- Full name and version of OS
-- Browser name and version (if this is an issue with the web interface)
-
-**If the issue concerns a camera**
-- Make and Model
-- frame rate
-- resolution
-- ZoneMinder Source Type:
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Debug Logs**
-```
-
-<insert debug logs here, please make sure they are within the ``` quotes so they are formatted properly>
-
-```

.github/codeql/codeql-config.yml

@@ -1,2 +0,0 @@
-paths-ignore:
-  - dep/

.github/config.yml

@@ -1,21 +0,0 @@
-# Configuration for welcome - https://github.com/behaviorbot/welcome
-
-# Configuration for new-issue-welcome - https://github.com/behaviorbot/new-issue-welcome
-
-# Comment to be posted to on first time issues
-newIssueWelcomeComment: >
-  Thanks for opening your first issue here! Just a reminder, this forum is for Bug Reports only. Be sure to follow the issue template!
-
-# Configuration for new-pr-welcome - https://github.com/behaviorbot/new-pr-welcome
-
-# Comment to be posted to on PRs from first time contributors in your repository
-#newPRWelcomeComment: >
-#  Thanks for opening this pull request! Please check out our contributing guidelines.
-
-# Configuration for first-pr-merge - https://github.com/behaviorbot/first-pr-merge
-
-# Comment to be posted to on pull requests merged by a first time user
-#firstPRMergeComment: >
-#  Congrats on merging your first pull request! We here at behaviorbot are proud of you! 
-
-# It is recommend to include as many gifs and emojis as possible

.github/issue-close-app.yml

@@ -1,16 +0,0 @@
-# Comment that will be sent if an issue is judged to be closed
-comment: "This issue is closed because it does not meet our bug report issue template. Please read it."
-issueConfigs:
-# There can be several configs for different kind of issues.
-- content:
-# Example 1: bug report
-  - "Describe Your Environment"
-  - "Describe the bug"
-  - "Expected behavior"
-# Optional configuration:
-#
-# whether the keywords are case-insensitive
-# default value is false, which means keywords are case-sensitive
-caseInsensitive: true
-# The issue is judged to be legal if it includes all keywords from any of these two configs.
-# Or it will be closed by the app.

.github/no-response.yml

@@ -1,13 +0,0 @@
-# Configuration for probot-no-response - https://github.com/probot/no-response
-
-# Number of days of inactivity before an Issue is closed for lack of response
-daysUntilClose: 7
-# Label requiring a response
-responseRequiredLabel: more-information-needed
-# Comment to post when closing an Issue for lack of response. Set to `false` to disable
-closeComment: >
-  This issue has been automatically closed because there has been no response
-  to our request for more information from the original author. With only the
-  information that is currently in the issue, we don't have enough information
-  to take action. Please reach out if you have or find the answers we need so
-  that we can investigate further.

.github/stale.yml

@@ -1,29 +0,0 @@
-# Configuration for probot-stale - https://github.com/probot/stale
-
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 180
-
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 30
-
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - "Under Review"
-  - "Bounty"
-  - "bug"
-  - "Feature"
-
-# Set to true to ignore issues in a milestone (defaults to false)
-exemptMilestones: true
-
-# Label to use when marking an issue as stale
-staleLabel: stale
-
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
-
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false

.github/support.yml

@@ -1,29 +0,0 @@
-# Configuration for support-requests - https://github.com/dessant/support-requests
-
-# Label used to mark issues as support requests
-supportLabel: support
-
-# Comment to post on issues marked as support requests, `{issue-author}` is an
-# optional placeholder. Set to `false` to disable
-supportComment: >
-  :wave: @{issue-author}, we use the issue tracker exclusively for bug reports.
-  However, this issue appears to be a support request, a feature request, or
-  attempts to ask a question.
-  
-  Please use our support channels to get help with or discuss this project:
-  
-  - The [ZoneMinder-Chat Slack channel](https://zoneminder-chat.herokuapp.com/)
-  
-  - The [ZoneMinder USer Forum](https://forums.zoneminder.com/)
-
-# Close issues marked as support requests
-close: true
-
-# Lock issues marked as support requests
-lock: true
-
-# Assign `off-topic` as the reason for locking. Set to `false` to disable
-setLockReason: true
-
-# Repository to extend settings from
-# _extends: repo

.github/workflows/ci-xenial.yml

@@ -1,25 +0,0 @@
-name: CI Xenial
-
-on:
-  push:
-    branches:
-      - '*'
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  build:
-    runs-on: zm-xenial-ci
-
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: recursive
-      - name: Install dependencies
-        run: sudo apt-get update && sudo apt-get install libavdevice-dev libcurl4-gnutls-dev libvlc-dev libvncserver-dev libdate-manip-perl libdbd-mysql-perl libsys-mmap-perl libpolkit-gobject-1-dev
-      - name: Prepare
-        run: mkdir build
-      - name: Configure
-        run: cd build && cmake --version && cmake .. -DBUILD_MAN=0 -DENABLE_WERROR=1
-      - name: Build
-        run: cd build && make -j3 | grep --line-buffered -Ev '^(cp lib\/|Installing.+\.pm)' && (exit ${PIPESTATUS[0]})

.github/workflows/codeql-analysis.yml

@@ -1,79 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-name: "CodeQL"
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [master]
-  schedule:
-    - cron: '0 3 * * 5'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        # Override automatic language detection by changing the below list
-        # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
-        language: ['cpp', 'javascript']
-        # Learn more...
-        # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-      with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
-        fetch-depth: 2
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-        config-file: ./.github/codeql/codeql-config.yml
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file. 
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-    - name: Clean install dependencies and build
-      run: |
-        git submodule init
-        git submodule update --init --recursive
-        sudo apt-get update
-        sudo apt-get install libavdevice-dev libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev  libjwt-gnutls-dev
-        sudo apt-get install libbz2-dev libgcrypt20-dev libcurl4-gnutls-dev libjpeg-turbo8-dev libturbojpeg0-dev
-        sudo apt-get install default-libmysqlclient-dev libpcre3-dev libpolkit-gobject-1-dev libv4l-dev libvlc-dev
-        sudo apt-get install libdate-manip-perl libdbd-mysql-perl libphp-serialization-perl libsys-mmap-perl
-        sudo apt-get install libwww-perl libdata-uuid-perl libssl-dev libcrypt-eksblowfish-perl libdata-entropy-perl
-        
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl- 
-   
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1

.gitignore

@@ -22,7 +22,6 @@ db/zm_create.sql
 depcomp
 docs/_build
 install-sh
-install_manifest.txt
 misc/CMakeFiles/
 misc/apache.conf
 misc/cmake_install.cmake
@@ -86,52 +85,18 @@ scripts/zmupdate.pl
 scripts/zmvideo.pl
 scripts/zmwatch.pl
 scripts/zmx10.pl
-scripts/zoneminder-zmaudit.pl.8
-scripts/zoneminder-zmaudit.pl.8.gz
-scripts/zoneminder-zmcamtool.pl.8
-scripts/zoneminder-zmcamtool.pl.8.gz
-scripts/zoneminder-zmcontrol.pl.8
-scripts/zoneminder-zmcontrol.pl.8.gz
-scripts/zoneminder-zmdc.pl.8
-scripts/zoneminder-zmdc.pl.8.gz
-scripts/zoneminder-zmfilter.pl.8
-scripts/zoneminder-zmfilter.pl.8.gz
-scripts/zoneminder-zmpkg.pl.8
-scripts/zoneminder-zmpkg.pl.8.gz
-scripts/zoneminder-zmsystemctl.pl.8
-scripts/zoneminder-zmsystemctl.pl.8.gz
-scripts/zoneminder-zmtelemetry.pl.8
-scripts/zoneminder-zmtelemetry.pl.8.gz
-scripts/zoneminder-zmtrack.pl.8
-scripts/zoneminder-zmtrack.pl.8.gz
-scripts/zoneminder-zmtrigger.pl.8
-scripts/zoneminder-zmtrigger.pl.8.gz
-scripts/zoneminder-zmupdate.pl.8
-scripts/zoneminder-zmupdate.pl.8.gz
-scripts/zoneminder-zmvideo.pl.8
-scripts/zoneminder-zmvideo.pl.8.gz
-scripts/zoneminder-zmwatch.pl.8
-scripts/zoneminder-zmwatch.pl.8.gz
-scripts/zoneminder-zmx10.pl.8
-scripts/zoneminder-zmx10.pl.8.gz
 src/*.o
 src/.deps/
 src/CMakeFiles/
 src/cmake_install.cmake
 src/libzm.a
-src/nph-zms
+src/zm_config.h
+src/zm_config_defines.h
+src/zma
 src/zmc
 src/zmf
 src/zms
 src/zmu
-src/zoneminder-zmc.8
-src/zoneminder-zmc.8.gz
-src/zoneminder-zmf.8
-src/zoneminder-zmf.8.gz
-src/zoneminder-zmstreamer.8
-src/zoneminder-zmstreamer.8.gz
-src/zoneminder-zmu.8
-src/zoneminder-zmu.8.gz
 stamp-h.in
 stamp-h1
 web/CMakeFiles/
@@ -139,19 +104,12 @@ web/api/CMakeFiles/
 web/api/app/Config/bootstrap.php
 web/api/app/Config/core.php
 web/api/cmake_install.cmake
-web/cgi-bin/
 web/cmake_install.cmake
-web/events/
-web/images/
 web/includes/config.php
 web/tools/mootools/CMakeFiles/
 web/tools/mootools/cmake_install.cmake
 web/tools/mootools/mootools-core.js
 web/tools/mootools/mootools-more.js
-web/undef.log
 zm.conf
 zmconfgen.pl
 zmlinkcontent.sh
-zm_config_data.h
-zm_config_defines.h
-**/.DS_Store

.gitlab-ci.yml

@@ -1,17 +0,0 @@
-default:
-  image:
-    name: ubuntu:latest
-  before_script:
-    - apt-get update -yq
-    - DEBIAN_FRONTEND=noninteractive apt-get install -yq devscripts sudo
-
-deb:
-  stage: build
-  tags:
-    - docker
-  script:
-    - yes "" | ./utils/do_debian_package.sh --snapshot=stable --type=binary --interactive=no --dput=no --debbuild-extra=--no-sign || true
-  artifacts:
-    paths:
-      - '*.deb'
-    expire_in: 1 week

.gitmodules

@@ -2,9 +2,3 @@
 	path = web/api/app/Plugin/Crud
 	url = https://github.com/FriendsOfCake/crud.git
 	branch = 3.0
-[submodule "web/api/app/Plugin/CakePHP-Enum-Behavior"]
-	path = web/api/app/Plugin/CakePHP-Enum-Behavior
-	Url = https://github.com/ZoneMinder/CakePHP-Enum-Behavior.git
-[submodule "dep/RtspServer"]
-	path = dep/RtspServer
-	url = https://github.com/ZoneMinder/RtspServer

.travis.yml

@@ -1,6 +1,6 @@
 language: cpp
 sudo: required
-dist: bionic
+dist: trusty
 git:
   depth: 9999999
 notifications:
@@ -13,7 +13,7 @@ addons:
   ssh_known_hosts: zmrepo.zoneminder.com
   apt:
     sources:
-    - sourceline: ppa:iconnor/zoneminder-master
+    - sourceline: ppa:iconnor/zoneminder
     - key_url: http://keyserver.ubuntu.com:11371/pks/lookup?op=get&search=0x4D0BF748776FFB04
     packages:
     - gdebi
@@ -23,24 +23,21 @@ addons:
     - curl
     - sshfs
     - sed
-    - binfmt-support
-    - qemu
-    - qemu-user-static
-    - dnsutils
-    - traceroute
-install:
-  - update-binfmts --enable qemu-arm
-
 env:
-  - SMPFLAGS=-j4 OS=eslint DIST=eslint
-  - SMPFLAGS=-j4 OS=ubuntu DIST=bionic DOCKER_REPO=iconzm/packpack
-
+  matrix:
+  - OS=el DIST=6
+  - OS=el DIST=7
+  - OS=fedora DIST=24
+  - OS=fedora DIST=25
+  - OS=ubuntu DIST=trusty
+  - OS=ubuntu DIST=xenial
+  - OS=ubuntu DIST=trusty ARCH=i386
+  - OS=ubuntu DIST=xenial ARCH=i386
 compiler:
 - gcc
 services:
 - mysql
 - docker
-
 script:
 - utils/packpack/startpackpack.sh
 
@@ -56,3 +53,4 @@ deploy:
   script: utils/packpack/rsync_xfer.sh
   on:
     branch: master
+

AUTHORS

@@ -0,0 +1,10 @@
+ZoneMinder - A Linux based camera monitoring and analysis tool.
+
+This project was imagined and created by Philip Coombes in
+September 2002, shortly after being burglarised of his power tools.
+He can be contacted at philip.coombes@zoneminder.com
+
+In early 2013 after nearly two years of no development,
+the community reached out to Phil in an attempt to open up the
+project.  With Phil's blessing, the code was migrated to github,
+and the community took over the project.

BUGS

@@ -0,0 +1 @@
+Please see https://github.com/ZoneMinder/ZoneMinder/issues?state=open

ChangeLog

@@ -0,0 +1 @@
+This is too hard to maintain.  See https://github.com/ZoneMinder/ZoneMinder/commits/master

Dockerfile

@@ -0,0 +1,110 @@
+# ZoneMinder, you need the GIT repository code and submodules (git submodule update --init --recursive)
+
+FROM ubuntu:xenial
+MAINTAINER Markos Vakondios <mvakondios@gmail.com>
+
+# Resynchronize the package index files 
+RUN apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+    apache2 \
+    build-essential \
+    cmake \
+    dh-autoreconf \
+    dpatch \
+    libapache2-mod-php \
+    libarchive-zip-perl \
+    libavcodec-dev \
+    libavdevice-dev \
+    libavfilter-dev \
+    libavformat-dev \
+    libavresample-dev \
+    libav-tools \
+    libavutil-dev \
+    libbz2-dev \
+    libcurl4-openssl-dev \
+    libdate-manip-perl \
+    libdbd-mysql-perl \
+    libdbi-perl \
+    libdevice-serialport-perl \
+    libjpeg-turbo8 \
+    libjpeg-turbo8-dev \
+    libmime-lite-perl \
+    libmime-perl \
+    libmp4v2-dev \
+    libmysqlclient-dev \
+    libnetpbm10-dev \
+    libpcre3 \
+    libpcre3-dev \
+    libpolkit-gobject-1-dev \
+    libpostproc-dev \
+    libssl-dev \
+    libswscale-dev \
+    libsys-mmap-perl \
+    libtheora-dev \
+    libtool \
+    libv4l-dev \
+    libvlc5 \
+    libvlccore8 \
+    libvlccore-dev \
+    libvlc-dev \
+    libvorbis-dev \
+    libvpx-dev \
+    libwww-perl \
+    libx264-dev \
+    mysql-client \
+    mysql-server \
+    php \
+    php-cli \
+    php-mysql \
+    vlc-data \
+    yasm \
+	&& rm -rf /var/lib/apt/lists/*
+
+# Copy local code into our container
+ADD cmake /ZoneMinder/cmake/
+ADD db /ZoneMinder/db/
+ADD misc /ZoneMinder/misc/
+ADD onvif /ZoneMinder/onvif/
+ADD scripts /ZoneMinder/scripts/
+ADD src /ZoneMinder/src/
+ADD umutils /ZoneMinder/umutils/
+ADD web /ZoneMinder/web/
+ADD cmakecacheimport.sh CMakeLists.txt version zm.conf.in zmconfgen.pl.in zmlinkcontent.sh.in zoneminder-config.cmake /ZoneMinder/
+ADD conf.d /ZoneMinder/conf.d
+
+# Change into the ZoneMinder directory
+WORKDIR /ZoneMinder
+
+# Setup the ZoneMinder build environment
+#RUN aclocal && autoheader && automake --force-missing --add-missing && autoconf
+
+# Configure ZoneMinder
+#RUN ./configure --with-libarch=lib/$DEB_HOST_GNU_TYPE --disable-debug --host=$DEB_HOST_GNU_TYPE --build=$DEB_BUILD_GNU_TYPE --with-mysql=/usr  --with-webdir=/var/www/zm --with-ffmpeg=/usr --with-cgidir=/usr/lib/cgi-bin --with-webuser=www-data --with-webgroup=www-data --enable-mmap=yes --enable-onvif ZM_SSL_LIB=openssl ZM_DB_USER=zm ZM_DB_PASS=zm
+RUN cmake .
+
+# Build & install ZoneMinder
+RUN make && make install
+
+# ensure writable folders
+RUN ./zmlinkcontent.sh
+
+# Adding the start script
+ADD utils/docker/start.sh /tmp/start.sh
+
+# Settings rights for /usr/local/share/zoneminder/
+RUN chown -R www-data:www-data /usr/local/share/zoneminder/
+
+# Adding apache virtual hosts file
+RUN cp misc/apache.conf /etc/apache2/sites-available/000-default.conf
+
+# Expose http port
+EXPOSE 80
+
+VOLUME /var/lib/zoneminder/images /var/lib/zoneminder/events /var/lib/mysql /var/log/zm
+
+# To speed up configuration testing, we put it here
+ADD utils/docker /ZoneMinder/utils/docker/
+
+CMD /ZoneMinder/utils/docker/setup.sh && /ZoneMinder/utils/docker/start.sh >/var/log/start.log 2>&1 & /bin/bash
+
+# Run example docker run -it -p 1080:80 -e PHP_TIMEZONE='Europe/Paris' -v /disk/zoneminder/events:/var/lib/zoneminder/events -v /disk/zoneminder/images:/var/lib/zoneminder/images -v /disk/zoneminder/mysql:/var/lib/mysql -v /disk/zoneminder/logs:/var/log/zm --name zoneminder zoneminder/zoneminder

INSTALL

@@ -0,0 +1,138 @@
+Installing ZoneMinder with cmake
+--------------------------------
+Starting with ZoneMinder 1.26.4, ZoneMinder can now be installed using cmake. This requires cmake version 2.6 or newer.
+cmake is an alternative to the autotools collection (libtool, autoconf, automake, autoheader and such). Its more recent and has many advantages, including, but not limited to:
+* One program (cmake) instead of multiple. (libtool, autoconf, automake, etc)
+* One file per directory (CMakeLists.txt) instead of multiple. (configure.ac, Makefile.am and sometimes more)
+* One syntax (cmake's syntax) instead of multiple. (bash and m4)
+* Generation of makefiles for many platforms, including Windows.
+* Newer than autotools and is being actively developed.
+* Generates colored makefiles with progress indicator.
+* Slightly faster because its based on C and not bash.
+* Lots of documentation, unlike autotools: http://www.cmake.org/cmake/help/cmake2.6docs.html
+
+At this point, its still possible to use autotools for the ZoneMinder project. Choosing cmake or autotools is now a matter of preference.
+Hopefully in the future, cmake will become the default way to install ZoneMinder.
+
+Important differences
+---------------------
+* Unlike the autotools way, the cmake way does not require any options. It attempts to detect some things by its own (system directories, libarch, web user and group) and uses defaults for others (installation paths and such).
+* Unlike the autotools way, which links the binaries to a fixed list of libraries, the cmake way only links to libraries that it found on the system. If a library is not found, but required, a fatal error will be shown during the configuration step.
+* Unlike the autotools way, the cmake way does not modify the system in any way it shouldn't. It only does what its supposed to do: Install files to your system. Nothing else and nothing leaks out of the DESTDIR environment variable (if used). This means that depending on your configuration, there might be an extra required step after installation: to link WEB_PATH/events and WEB_PATH/images folders to the correct places.
+
+Configuration
+-------------
+cmake by default does not require any parameters, but its possible to override the defaults with the options below.
+
+Configuration can be done in 4 ways:
+1) As a command line parameter, e.g. cmake -DCMAKE_VERBOSE_MAKEFILE=ON .
+2) Using cmake-gui
+3) Providing cmake with an initial cache file with the -C option
+   IMPORTANT: Do not use the -C option if any major part of your system, excluding the version of zoneminder, has changed.
+   For example, do not use this option if: you have upgraded your distro to a new version, have gone from 32 to 64 bits,
+   or have migrated from one machine to another.
+4) By editing the cache file CMakeCache.txt (after it has been generated) - Not recommended
+
+Possible configuration options: 
+	ZM_RUNDIR		Location of transient process files, default: /var/run/zm
+	ZM_SOCKDIR		Location of Unix domain socket files, default /var/run/zm
+	ZM_TMPDIR		Location of temporary files, default: /tmp/zm
+	ZM_LOGDIR 		Location of generated log files, default: /var/log/zm
+	ZM_WEBDIR		Location of the web files, default: <prefix>/share/zoneminder/www
+	ZM_CGIDIR		Location of the cgi-bin files, default: <prefix>/libexec/zoneminder/cgi-bin
+	ZM_CONTENTDIR		Location of dynamic content (events and images), default: /var/lib/zoneminder
+	ZM_DB_HOST		Hostname where ZoneMinder database located, default: localhost
+	ZM_DB_NAME		Name of ZoneMinder database, default: zm
+	ZM_DB_USER		Name of ZoneMinder database user, default: zmuser
+	ZM_DB_PASS		Password of ZoneMinder database user, default: zmpass
+	ZM_WEB_USER		The user apache or the local web server runs on. Leave empty for automatic detection. If that fails, you can use this variable to force
+	ZM_WEB_GROUP		The group apache or the local web server runs on, Leave empty to be the same as the web user
+Advanced:
+	ZM_EXTRA_LIBS		A list of optional libraries, separated by semicolons, e.g. ssl;theora
+	ZM_MYSQL_ENGINE		MySQL engine to use with database, default: InnoDB
+	ZM_NO_MMAP		Set to ON to not use mmap shared memory. Shouldn't be enabled unless you experience problems with the shared memory. default: OFF
+	ZM_NO_FFMPEG		Set to ON to skip ffmpeg checks and force building ZM without ffmpeg. default: OFF
+	ZM_NO_X10		Set to ON to build ZoneMinder without X10 support. default: OFF
+	ZM_PERL_MM_PARMS	By default, ZoneMinder's Perl modules are installed into the Vendor folders, as defined by your installation of Perl. You can change that here. Consult Perl's MakeMaker documentation for a definition of acceptable parameters. If you set this to something that causes the modules to be installed outside Perl's normal serach path, then you will also need to set ZM_PERL_SEARCH_PATH accordingly. default: "INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1"
+	ZM_PERL_SEARCH_PATH	Use to add a folder to your Perl's search path. This will need to be set in cases where ZM_PERL_MM_PARMS has been modified such that ZoneMinder's Perl modules are installed outside Perl's default search path. default: ""
+
+Useful configuration options provided by cmake:
+CMAKE_VERBOSE_MAKEFILE - Set this to ON (default OFF) to see what cmake is doing. Very useful for troubleshooting.
+CMAKE_BUILD_TYPE - Set this to Debug (default Release) to build ZoneMinder with debugging enabled.
+CMAKE_INSTALL_PREFIX - Use this to change the prefix (default /usr/local). This option behaves like --prefix from autoconf. Package maintainers will probably want to set this to "/usr".
+
+Useful environment variables provided by cmake:
+CMAKE_INCLUDE_PATH - Use this to add to the include search path.
+CMAKE_LIBRARY_PATH - Use this to add to the library search path.
+CMAKE_PREFIX_PATH - Use this to add to both include and library search paths. <path>/include will be added to the include search path and <path>/lib to the library search path. Multiple paths can be specified, separated by a : character. For example: export CMAKE_PREFIX_PATH="/opt/libjpeg-turbo:/opt/ffmpeg-from-git"
+
+CFLAGS, CPPFLAGS and other environment variables:
+To append to the CFLAGS and CXXFLAGS, please use the CFLAGS and CXXFLAGS environment variables.
+Or use the CMAKE_C_FLAGS and CMAKE_CXX_FLAGS configuration options.
+To replace the CFLAGS and CXXFLAGS entirely:
+*   For the Release build type: use CMAKE_C_FLAGS_RELEASE for the CFLAGS and CMAKE_CXX_FLAGS_RELEASE for the CXXFLAGS
+*   For the Debug build type: use CMAKE_C_FLAGS_DEBUG for the CFLAGS and CMAKE_CXX_FLAGS_DEBUG for the CXXFLAGS
+Other important environment variables (such as LDFLAGS) are also supported.
+
+The DESTDIR environment variable is also supported, however it needs to be set before invoking make install. For example: DESTDIR=mydestdir make install
+For more information about DESTDIR, see:
+*   http://www.gnu.org/prep/standards/html_node/DESTDIR.html
+
+Basic steps for installing ZoneMinder on a fresh system
+-------------------------------------------------------
+1) After installing all the required dependencies, in the project directory, run "cmake [extra options] ."
+This behaves like ./configure. It is also possible to supply configuration options, e.g. cmake -DZM_DB_PASS="mypass" .
+IMPORTANT: Don't forget the dot "." at the end.
+2) Run "make" to compile ZoneMinder
+3) Run "make install" (as root, or use sudo) to install ZoneMinder to your system.
+4) Create a directory for the content and the necessary symlinks by running zmlinkcontent.sh with the directory you want to use. e.g. ./zmlinkcontent.sh /nfs/zm
+5) Create a database for zoneminder, called "zm".
+6) Create a user for the zoneminder database, called zmuser with password and full privileges to the "zm" database.
+NOTE: The database server, database name, user and password can be different and adjusted during configuration step with the options in this file, or by editing /etc/zm.conf
+7) Populate the zoneminder database using the script zm_create.sql. This should be found in <prefix>/share/zoneminder/db or in the project/db directory.
+
+8) Create an apache virtual host for ZoneMinder. Make sure to use the same paths as ZM_WEBDIR and ZM_CGIDIR in /etc/zm.conf
+9) Verify date.timezone is set to your timezone. This parameter is often found inside the system php.ini file. Consult your distribution's documentation for the proper way to set this value.
+10) Create other config if desired (e.g. rsyslog, logrotate and such). Some of this can be found in <prefix>/share/zoneminder/misc or project/misc directory
+11) Setup an appropriate startup script for your system. Two generic startup scripts have been provided, a legacy Sys V Init script and a Systemd service file.
+
+*Sys V Init Setup*
+- Copy the sys v init script /scripts/zm from the build folder to /etc/init. 
+- Inspect the contents to make sure they apply to your distro.
+
+*SystemD Setup*
+- Copy the zoneminder systemd service file /misc/zoneminder.service from the build folder to the systemd service file location. 
+  For Redhat based distros, that folder is /usr/lib/systemd/system.
+- Inspect the contents to make sure they apply to your distro.
+- Tell systemd to load the new service file: "sudo systemctl daemon-reload".
+- Copy /misc/zoneminder-tmpfiles.conf to /etc/tmpfiles.d
+- Tell systemd to process this file: "sudo /usr/bin/systemd-tmpfiles --create /etc/tmpfiles.d/zoneminder.conf".
+
+Basic steps for upgrading ZoneMinder
+------------------------------------
+1) If you wish to use the same paths and configuration as the currently installed ZoneMinder, you need to provide cmake with options that match your current installation.
+You can provide those options in the command line to cmake, e.g. cmake -DZM_DB_PASS="blah" -DZM_WEBDIR="/usr/local/share/zoneminder/www" -DCMAKE_INSTALL_FULL_BINDIR="/usr/bin" .
+Or alternatively, for convenience, use the cmakecacheimport.sh script. This reads a zoneminder configuration file (zm.conf) and creates a cmake initial cache file called zm_conf.cmake, which you can then provide to cmake.
+For example:
+./cmakecacheimport.sh /etc/zm.conf
+cmake -C zm_conf.cmake [extra options] .
+
+2) Run "make" to compile ZoneMinder
+3) Run "make install" (as root, or use sudo) to install ZoneMinder to your system.
+4) Depending on your configuration: If the DIR_EVENTS and DIR_IMAGES options are set to default (pointing to web directory/events and web directory/images), You will need to update the symlinks in the web directory to the correct folders. e.g. web directory/events should point to the real events directory, and likewise for the images directory.
+You can use the zmlinkcontent.sh script for this. For example, if /var/lib/zoneminder is the folder that contains the "images" and "events" directories, you can use:
+./zmlinkcontent.sh /var/lib/zoneminder
+By default, the content directory for new installations is /var/lib/zoneminder. This can be overridden in cmake with the ZM_CONTENTDIR option. e.g. cmake -DZM_CONTENTDIR="/some/big/storage/zm" .
+
+5) Run zmupdate.pl to update the database layout to the new version.
+
+Uninstallation:
+---------------
+By default, cmake does not have an uninstall target, however we have added a one. Simply run make uninstall (or DESTDIR=mydestdir make uninstall if a DESTDIR was used) and it will remove all the files that cmake installed.
+It's also possible to do this manually. The file install_manifest.txt contains the list of files installed to the system. This can be used in many ways to delete all files installed by cmake, such as: xargs rm < install_manifest.txt
+
+Contributions:
+--------------
+Please visit our GitHub at http://github.com/ZoneMinder/ZoneMinder
+
+

NEWS

@@ -0,0 +1 @@
+Please see README file.

README.md

@@ -1,10 +1,7 @@
 ZoneMinder
 ==========
 
-[![Build Status](https://travis-ci.org/ZoneMinder/zoneminder.png)](https://travis-ci.org/ZoneMinder/zoneminder)
-[![Bounty Source](https://api.bountysource.com/badge/team?team_id=204&style=bounties_received)](https://www.bountysource.com/teams/zoneminder/issues?utm_source=ZoneMinder&utm_medium=shield&utm_campaign=bounties_received)
-[![Join Slack](https://github.com/ozonesecurity/ozonebase/blob/master/img/slacksm.png?raw=true)](https://join.slack.com/t/zoneminder-chat/shared_invite/enQtNTU0NDkxMDM5NDQwLTdhZmQ5Y2M2NWQyN2JkYTBiN2ZkMzIzZGQ0MDliMTRmM2FjZWRlYzUwYTQ2MjMwMTVjMzQ1NjYxOTdmMjE2MTE)
-[![IRC Network](https://img.shields.io/badge/irc-%23zoneminder-blue.svg "IRC Freenode")](https://webchat.freenode.net/?channels=zoneminder)
+[![Build Status](https://travis-ci.org/ZoneMinder/ZoneMinder.png)](https://travis-ci.org/ZoneMinder/ZoneMinder) [![Bountysource](https://api.bountysource.com/badge/team?team_id=204&style=bounties_received)](https://www.bountysource.com/teams/zoneminder/issues?utm_source=ZoneMinder&utm_medium=shield&utm_campaign=bounties_received)
 
 All documentation for ZoneMinder is now online at https://zoneminder.readthedocs.org
 
@@ -16,35 +13,28 @@ ZoneMinder is an integrated set of applications which provide a complete surveil
 Before creating an issue in our github forum, please read our posting rules:
 https://github.com/ZoneMinder/ZoneMinder/wiki/Github-Posting-Rules
 
-## Our Dockerfile has moved
-Please file issues against the ZoneMinder Dockerfile here: 
-https://github.com/ZoneMinder/zmdockerfiles
-
 ## Installation Methods
 
-### Install from a Package Repository
-
-This is the recommended method to install ZoneMinder onto your system. ZoneMinder packages are maintained for the following distros:
-
-- Ubuntu via [Iconnor's PPA](https://launchpad.net/~iconnor)
-- Debian from their [default repository](https://packages.debian.org/search?searchon=names&keywords=zoneminder) 
-- RHEL/CentOS and clones via [RPM Fusion](http://rpmfusion.org)
-- Fedora via [RPM Fusion](http://rpmfusion.org)
-- OpenSuse via [third party repository](https://wiki.zoneminder.com/Installing_using_ZoneMinder_RPMs_for_SuSE)
-- Mageia from their default repository
-- Arch via the [AUR](https://aur.archlinux.org/packages/zoneminder/)
-- Gentoo via [Portage Overlays](http://gpo.zugaina.org/www-misc/zoneminder)
-
-If a repository that hosts ZoneMinder packages is not available for your distro, then you are encouraged to build your own package, rather than build from source.  While each distro is different in ways that set it apart from all the others, they are often similar enough to allow you to adapt another distro's package building instructions to your own.
-
 ### Building from Source is Discouraged
 
 Historically, installing ZoneMinder onto your system required building from source code by issuing the traditional configure, make, make install commands.  To get ZoneMinder to build, all of its dependencies had to be determined and installed beforehand. Init and logrotate scripts had to be manually copied into place following the build.  Optional packages such as jscalendar and Cambozola had to be manually installed. Uninstalls could leave stale files around, which could cause problems during an upgrade.  Speaking of upgrades, when it comes time to upgrade all these manual steps must be repeated again.
 
 Better methods exist today that do much of this for you. The current development team, along with other volunteers, have taken great strides in providing the resources necessary to avoid building from source.  
 
+### Install from a Package Repository
 
-### Building a ZoneMinder Package ###
+This is the recommended method to install ZoneMinder onto your system. ZoneMinder packages are maintained for the following distros:
+
+- Ubuntu via [Iconnor's PPA](https://launchpad.net/~iconnor/+archive/ubuntu/zoneminder)
+- Debian from their [default repository](https://packages.debian.org/search?searchon=names&keywords=zoneminder) 
+- RHEL/CentOS and clones via [zmrepo](http://zmrepo.zoneminder.com/)
+- Fedora via [zmrepo](http://zmrepo.zoneminder.com/)
+- OpenSuse via [third party repository](http://www.zoneminder.com/wiki/index.php/Installing_using_ZoneMinder_RPMs_for_SuSE)
+- Mageia from their default repository
+
+If a repository that hosts ZoneMinder packages is not available for your distro, then you are encouraged to build your own package, rather than build from source.  While each distro is different in ways that set it apart from all the others, they are often similar enough to allow you to adapt another distro's package building instructions to your own.
+
+### Building a ZoneMinder Package
 
 Building ZoneMinder into a package is not any harder than building from source.  As a matter of fact, if you have successfully built ZoneMinder from source in the past, then you may find these steps to be easier. 
 
@@ -55,9 +45,9 @@ Lastly, if you desire to build a development snapshot from the master branch, it
 Please visit our [ReadtheDocs site](https://zoneminder.readthedocs.org/en/stable/installationguide/index.html) for distro specific instructions.
 
 ### Package Maintainers
-Many of the ZoneMinder configuration variable default values are not configurable at build time through autotools or cmake.  A new tool called *zmeditconfigdata.sh* has been added to allow package maintainers to manipulate any variable stored in ConfigData.pm without patching the source. 
+Many of the ZoneMinder configration variable default values are not configurable at build time through autotools or cmake.  A new tool called *zmeditconfigdata.sh* has been added to allow package maintainers to manipulate any variable stored in ConfigData.pm without patching the source. 
 
-For example, let's say I have created a new ZoneMinder package that contains the cambozola javascript file.  However, by default cambozola support is turned off.  To fix that, add this to the packaging script:
+For example, let's say I have created a new ZoneMinder package that contains the cambolzola javascript file.  However, by default cambozola support is turned off.  To fix that, add this to the pacakging script:
 ```bash
 ./utils/zmeditconfigdata.sh ZM_OPT_CAMBOZOLA yes
 ```
@@ -70,19 +60,18 @@ Docker is a system to run applications inside isolated containers. ZoneMinder, a
 Dockerfile contained in this repository. However, there is still work needed to ensure that the main ZM features work 
 properly and are documented. 
 
-## Contribution Model and Development
+## Contribution Model and  Development
 
 * Source hosted at [GitHub](https://github.com/ZoneMinder/ZoneMinder/)
-* Report issues at [GitHub Issues](https://github.com/ZoneMinder/ZoneMinder/issues)
-* Questions/feature requests in [Slack](https://zoneminder-chat.slack.com/) or [forums](https://forums.zoneminder.com)
+* Report issues/questions/feature requests on [GitHub Issues](https://github.com/ZoneMinder/ZoneMinder/issues)
 
 Pull requests are very welcome!  If you would like to contribute, please follow
-the following steps.  While step 3 is optional, it is preferred.
+the following steps.
 
 1. Fork the repo
 2. Open an issue at our [GitHub Issues Tracker](https://github.com/ZoneMinder/ZoneMinder/issues).
-   Follow the issue template to describe the bug or security issue you found. Please note feature
-   requests or questions should be posted in our user forum or Slack channel.
+   Describe the bug that you've found, or the feature which you're asking for.
+   Jot down the issue number (e.g. 456)
 3. Create your feature branch (`git checkout -b 456-my-new-feature`)
 4. Commit your changes (`git commit -am 'Added some feature'`)
    It is preferred that you 'commit early and often' instead of bunching all

SECURITY.md

@@ -1,18 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-Time and computers move on. We do not have the resources to support every ancient version of everything
-(unless you'd like to pay us to do so.)  We ONLY support the latest stable release and development releases.
-
-| Version | Supported          |
-| ------- | ------------------ |
-| 1.34.x   | :white_check_mark: |
-| 1.35.x   | :white_check_mark: |
-| < 1.34.x   | :x:                |
-
-## Reporting a Vulnerability
-
-Since sometimes security vulnerabilities can be sensitive, you can just email me at isaac@zoneminder.com.
-If it's not such a big deal, by all means, create an issue here on github
-

TODO

@@ -0,0 +1,2 @@
+Please see README.md file.
+

cmake/Modules/CheckPlatform.cmake

@@ -1,44 +0,0 @@
-set(HOST_OS "")
-if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-  set(HOST_OS "linux")
-endif()
-if(${CMAKE_SYSTEM_NAME} MATCHES ".*(SunOS|Solaris).*")
-  set(HOST_OS "solaris")
-  set(SOLARIS 1)
-endif()
-if(${CMAKE_SYSTEM_NAME} MATCHES ".*BSD.*")
-  set(HOST_OS "BSD")
-  set(BSD 1)
-endif()
-if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
-  set(HOST_OS "darwin")
-endif()
-if(NOT HOST_OS)
-  message(FATAL_ERROR
-    "ZoneMinder was unable to deterimine the host OS. Please report this.
-    Value of CMAKE_SYSTEM_NAME: ${CMAKE_SYSTEM_NAME}")
-endif()
-
-if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-  string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" ZM_SYSTEM_PROC)
-  if((ZM_SYSTEM_PROC STREQUAL "") OR (ZM_SYSTEM_PROC STREQUAL "unknown"))
-    execute_process(COMMAND uname -m OUTPUT_VARIABLE ZM_SYSTEM_PROC ERROR_VARIABLE ZM_SYSTEM_PROC_ERR)
-
-    # maybe make the following error checks fatal
-    if(ZM_SYSTEM_PROC_ERR)
-      message(WARNING "\nAn error occurred while attempting to determine the system processor:\n${ZM_SYSTEM_PROC_ERR}")
-    endif()
-    if(NOT ZM_SYSTEM_PROC)
-      message(WARNING "\nUnable to determine the system processor. This may cause a build failure.\n")
-    endif()
-  endif()
-endif()
-
-message(STATUS "Detected compiler: ${CMAKE_C_COMPILER}")
-if(CMAKE_C_COMPILER MATCHES "gcc" OR CMAKE_C_COMPILER_ID STREQUAL "GNU")
-  include(${CMAKE_SOURCE_DIR}/cmake/compiler/gcc/settings.cmake)
-elseif(CMAKE_C_COMPILER MATCHES "clang" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-  include(${CMAKE_SOURCE_DIR}/cmake/compiler/clang/settings.cmake)
-else()
-  message(FATAL_ERROR "No supported compiler found")
-endif()

cmake/Modules/ConfigureBaseTargets.cmake

@@ -1,50 +0,0 @@
-add_library(zm-compile-option-interface INTERFACE)
-
-# Use -std=c++11 instead of -std=gnu++11
-set(CMAKE_CXX_EXTENSIONS OFF)
-
-add_library(zm-feature-interface INTERFACE)
-
-# The cxx_std_* feature flags were only introduced in CMake 3.8
-# Use to old way to specify the required standard level for older CMake versions.
-# Remove this once we raise the required CMake version.
-if(${CMAKE_VERSION} VERSION_LESS 3.8.0)
-  set(CMAKE_CXX_STANDARD 11)
-else()
-  target_compile_features(zm-feature-interface
-    INTERFACE
-      cxx_std_11)
-endif()
-
-# Interface to set warning levels on targets.
-# It gets populated in the compiler specific script.
-add_library(zm-warning-interface INTERFACE)
-
-# Interface which disables all warnings on the target.
-add_library(zm-no-warning-interface INTERFACE)
-target_compile_options(zm-no-warning-interface
-  INTERFACE
-    -w)
-
-# An interface used by all other interfaces.
-add_library(zm-default-interface INTERFACE)
-target_link_libraries(zm-default-interface
-  INTERFACE
-    zm-compile-option-interface
-    zm-feature-interface)
-
-# An interface which provides the flags and definitions
-# used by the non-dependency targets.
-add_library(zm-core-interface INTERFACE)
-target_link_libraries(zm-core-interface
-  INTERFACE
-    zm-default-interface
-    zm-warning-interface)
-
-# An interface which provides the flags and definitions
-# used by the external dependency targets.
-add_library(zm-dependency-interface INTERFACE)
-target_link_libraries(zm-dependency-interface
-  INTERFACE
-    zm-default-interface
-    zm-no-warning-interface)

cmake/Modules/FindLibJWT.cmake

@@ -1,28 +0,0 @@
-include(FindPackageHandleStandardArgs)
-
-find_package(PkgConfig QUIET)
-pkg_check_modules(PC_LIBJWT QUIET libjwt)
-
-find_path(LIBJWT_INCLUDE_DIR
-  NAMES jwt.h
-  HINTS ${PC_LIBJWT_INCLUDEDIR} ${PC_LIBJWT_INCLUDE_DIRS}
-  )
-
-find_library(LIBJWT_LIBRARY
-  NAMES jwt-gnutls libjwt-gnutls liblibjwt-gnutls
-  HINTS ${PC_LIBJWT_LIBDIR} ${PC_LIBJWT_LIBRARY_DIR}
-  )
-
-find_package_handle_standard_args(LibJWT
-  REQUIRED_VARS LIBJWT_INCLUDE_DIR LIBJWT_LIBRARY
-  )
-
-if(LIBJWT_FOUND)
-  add_library(libjwt STATIC IMPORTED GLOBAL)
-  set_target_properties(libjwt PROPERTIES
-    IMPORTED_LOCATION "${LIBJWT_LIBRARY}"
-    INTERFACE_INCLUDE_DIRECTORIES "${LIBJWT_INCLUDE_DIR}"
-    )
-endif()
-
-mark_as_advanced(LIBJWT_INCLUDE_DIR LIBJWT_LIBRARY)

cmake/Modules/FindMySQL.cmake

@@ -0,0 +1,837 @@
+# -*- indent-tabs-mode:nil; -*-
+# vim: set expandtab:
+#
+#   Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+#
+#   The MySQL Connector/C++ is licensed under the terms of the GPLv2
+#   <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
+#   MySQL Connectors. There are special exceptions to the terms and
+#   conditions of the GPLv2 as it is applied to this software, see the
+#   FLOSS License Exception
+#   <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published
+#   by the Free Software Foundation; version 2 of the License.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+#   or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+#   for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program; if not, write to the Free Software Foundation, Inc.,
+#   51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+##########################################################################
+
+##########################################################################
+#
+# Configuration variables, all optional, are
+#
+#   MYSQL_DIR         - Set in environment or as parameter to "cmake",
+#                       this is the top directory of the MySQL Server or
+#                       Connector/C install
+#   MYSQL_INCLUDE_DIR - Set in environment or as parameter to "cmake",
+#                       this is the include directory where to find
+#                       the client library
+#   MYSQL_LIB_DIR     - Set in environment or as parameter to "cmake",
+#                       this is the library directory where to find
+#                       the client library
+#   MYSQLCLIENT_STATIC_LINKING
+#                     - Specify that you want static linking, dynamic
+#                       linking is the default
+#   MYSQLCLIENT_NO_THREADS
+#                     - Specify to link against the single threaded
+#                       library, "libmysqlclient". Note that in 5.5
+#                       and up "libmysqlclient" is multithreaded and
+#                       "libmysqlclient_r" just a soft link to it
+#   MYSQL_CONFIG_EXECUTABLE
+#                     - "mysql_config" executable to use
+#   MYSQL_CXX_LINKAGE - Specify that client library needs C++ linking
+#   MYSQL_EXTRA_LIBRARIES
+#                     - Libraries to add to the linkage
+#   MYSQL_CFLAGS      - C compiler flags
+#   MYSQL_CXXFLAGS    - C++ compiler flags
+#   MYSQL_LINK_FLAGS  - User defined extra linkage flags
+#   FINDMYSQL_DEBUG   - Set if want debug output from this script
+#
+# Note that most variables above, if not set by the user they will be
+# set by this include file.
+#
+# In addition, the below CMake variables are set by this include file
+#
+#   MYSQL_VERSION     - Three position numeric version, like 5.6.41
+#   MYSQL_VERSION_ID  - Numeric padded version, 5.13.4 => 51304
+#   MYSQL_NUM_VERSION - Same as MYSQL_VERSION_ID, for compatibility
+#   MYSQL_LIB         - Path to the client library
+#   MYSQL_LIBRARIES   - Library name, might be "-lmysqlclient" while
+#                       MYSQL_LIB is the path to the library
+#   MYSQL_CLIENT_LIBS - Same as MYSQL_LIBRARIES, for compatibility
+#
+# (1) If MYSQL_INCLUDE_DIR or MYSQL_LIB_DIR are given, these are
+#     used and an error is reported if can't be used
+# (2) If MYSQL_CONFIG_EXECUTABLE is given, it is used to get
+#     headers and libraries
+# (3) If MYSQL_DIR is given and "${MYSQL_DIR}/bin/mysql_config" is
+#     found, then same as (2)
+# (4) If MYSQL_DIR is given and no "${MYSQL_DIR}/bin/mysql_config",
+#     search MYSQL_DIR
+#
+# FIXME if we get a "mysql_config" on Windows, things needs to change
+# FIXME rename the VERSION variables above
+# FIXME let MYSQL_VERSION include "-beta" etc?
+# FIXME can mysql_config --version be C/C verson?
+# FIXME if no mysql_config, find version from include/mysql_version.h?
+#       #define MYSQL_SERVER_VERSION       "5.7.5-m15"
+#       #define MYSQL_VERSION_ID            50705
+#       #define LIBMYSQL_VERSION           "6.1.5"
+#       #define LIBMYSQL_VERSION_ID         60105
+# FIXME can MYSQL_LIB_DIR be a list of paths?
+# FIXME is MYSQLCLIENT_LIBS a better name?
+# FIXME cache variables, makes them command line args?
+# FIXME really do include_directories() and link_directories()? Likely
+# FIXME add check that if not static, not picked up .a or mysqlclient.lib
+# FIXME MYSQL_VERSION_ID need to take into account Cluster versions
+#       and Connector/C versions
+# FIXME handle MYSQL_VERSION_ID, LIBMYSQL_VERSION and LIBMYSQL_VERSION_ID?
+#
+##########################################################################
+
+
+##########################################################################
+#
+# Check the input data
+#
+##########################################################################
+
+# If using both MYSQL_DIR as a cmake argument and set in environment,
+# and not empty strings, they better be the same. Else stop and complain
+
+set(ENV_OR_OPT_VARS
+  MYSQL_DIR
+  MYSQL_INCLUDE_DIR
+  MYSQL_LIB_DIR
+  MYSQL_CFLAGS
+  MYSQL_CXXFLAGS
+  MYSQL_CONFIG_EXECUTABLE
+  MYSQLCLIENT_STATIC_LINKING
+  MYSQLCLIENT_NO_THREADS
+  MYSQL_CXX_LINKAGE
+  MYSQL_EXTRA_LIBRARIES
+  MYSQL_LINK_FLAGS
+)
+
+# Mark the variable names that have values that are paths
+set(ENV_OR_OPT_PATH_VARS
+  MYSQL_DIR
+  MYSQL_INCLUDE_DIR
+  MYSQL_LIB_DIR
+)
+
+foreach(_xvar ${ENV_OR_OPT_VARS})
+
+  if((DEFINED ${_xvar}) AND
+     (DEFINED ENV{${_xvar}}) AND
+     (NOT "${${_xvar}}" STREQUAL "") AND
+     (NOT "$ENV{${_xvar}}" STREQUAL "") AND
+     (NOT "$ENV{${_xvar}}" STREQUAL "${${_xvar}}"))
+    message(FATAL_ERROR "Please pass -D${_xvar}=... as an argument or "
+                        "set ${_xvar} in the environment, but not both")
+  endif()
+
+  # Now we know both are not set, set the CMake variable if needed
+  if((DEFINED ENV{${_xvar}}) AND (NOT "$ENV{${_xvar}}" STREQUAL ""))
+    set(${_xvar} $ENV{${_xvar}})
+  endif()
+
+  # Notmalize the path if the variable is set and is a path 
+  if(${_xvar})
+    list(FIND ENV_OR_OPT_PATH_VARS ${_xvar} _index)
+    if (${_index} GREATER -1)
+      file(TO_CMAKE_PATH "${${_xvar}}" ${_xvar})
+    endif()
+  endif()
+
+endforeach()
+
+
+if(MYSQL_CONFIG_EXECUTABLE)
+  set(_mysql_config_set_by_user 1)
+else()
+  # If MYSQL_DIR is set, set MYSQL_CONFIG_EXECUTABLE
+  if((NOT WIN32) AND
+     (DEFINED MYSQL_DIR) AND
+     (EXISTS "${MYSQL_DIR}/bin/mysql_config"))
+    set(MYSQL_CONFIG_EXECUTABLE "${MYSQL_DIR}/bin/mysql_config")
+    set(_mysql_config_in_mysql_dir 1)
+  endif()
+endif()
+
+##########################################################################
+#
+# Data and basic settings
+#
+##########################################################################
+
+# Set sub directory to search in
+# dist = for mysql binary distributions
+# build = for custom built tree
+
+if(CMAKE_BUILD_TYPE STREQUAL Debug)
+  set(_lib_suffix_dist debug)
+  set(_lib_suffix_build Debug)
+else()
+  set(_lib_suffix_dist opt)
+  set(_lib_suffix_build Release)
+  add_definitions(-DDBUG_OFF)   # FIXME what?!
+endif()
+
+set(_exe_fallback_path
+    /usr/bin
+    /usr/local/bin
+    /opt/mysql/mysql/bin
+    /usr/local/mysql/bin
+)
+
+set(_include_fallback_path
+    /usr/include/mysql
+    /usr/local/include/mysql
+    /opt/mysql/mysql/include
+    /opt/mysql/mysql/include/mysql
+    /usr/local/mysql/include
+    /usr/local/mysql/include/mysql
+    $ENV{ProgramFiles}/MySQL/*/include
+    $ENV{SystemDrive}/MySQL/*/include
+)
+
+set(_lib_fallback_path
+    /usr/lib/mysql
+    /usr/local/lib/mysql
+    /usr/local/mysql/lib
+    /usr/local/mysql/lib/mysql
+    /opt/mysql/mysql/lib
+    /opt/mysql/mysql/lib/mysql
+    $ENV{ProgramFiles}/MySQL/*/lib/${_lib_suffix_dist}
+    $ENV{ProgramFiles}/MySQL/*/lib
+    $ENV{SystemDrive}/MySQL/*/lib/${_lib_suffix_dist}
+    $ENV{SystemDrive}/MySQL/*/lib
+)
+
+set(_lib_subdirs
+    # Paths in build tree, really being too nice
+    libmysql/${_lib_suffix_build}
+    client/${_lib_suffix_build}
+    libmysql_r/.libs
+    libmysql/.libs
+    libmysql
+    # Install sub directories
+    lib/mysql
+    lib/${_lib_suffix_dist}   # Need to be before "lib"
+    lib
+)
+
+set(_static_subdirs
+    mysql
+    ${_lib_suffix_dist}
+)
+
+if(MSVC90)
+  set(_vs_subdir vs9)
+elseif(MSVC10)
+  set(_vs_subdir vs10)
+elseif(MSVC11)
+  set(_vs_subdir vs11)
+elseif(MSVC12)
+  set(_vs_subdir vs12)
+elseif(MSVC13)
+  set(_vs_subdir vs13)
+elseif(MSVC14)
+  set(_vs_subdir vs14)
+elseif(MSVC15)
+  set(_vs_subdir vs15)
+endif()
+
+if(_vs_subdir)
+  if("${_lib_suffix_dist}" STREQUAL "debug")
+    set(_vs_subdir "${_vs_subdir}/debug")
+  endif()
+  list(INSERT _lib_subdirs 0 "lib/${_vs_subdir}")
+endif()
+
+# For Windows, the client library name differs, so easy to
+# make sure find_library() picks the right one. For Unix, it
+# is the file extension that differs. In the static library
+# case we know it is ".a", so we add it to the library name
+# we search for to make sure it is picked in the static case.
+if(WIN32)
+  set(_dynamic_libs   "libmysql")
+  set(_static_libs    "mysqlclient")
+  set(_static_lib_ext ".lib")   # Careful, can be import library for DLL
+elseif(MYSQLCLIENT_NO_THREADS)
+  # In 5.1 and below there is a single threaded library
+  set(_dynamic_libs   "mysqlclient")
+  set(_static_libs    "libmysqlclient.a")
+  set(_static_lib_ext ".a")
+else()
+  # We try the multithreaded "libmysqlclient_r" first and if not
+  # there, pick "libmysqlclient" that in 5.5 and up is multithreaded
+  # anyway (soft link "libmysqlclient_r" is not installed MySQL Server
+  # 5.6 and Debian/Ubuntu and might go in 5.7 for all installs)
+  set(_dynamic_libs   "mysqlclient_r"      "mysqlclient")
+  set(_static_libs    "libmysqlclient_r.a" "libmysqlclient.a")
+  set(_static_lib_ext ".a")
+endif()
+
+if(MYSQLCLIENT_STATIC_LINKING)
+  set(_link_type   "static")
+  set(_search_libs ${_static_libs})
+else()
+  set(_link_type   "dynamic")
+  set(_search_libs ${_dynamic_libs})
+endif()
+
+# Just to pretty print in error messages
+string(REPLACE ";" " " _pp_search_libs           "${_search_libs}")
+string(REPLACE ";" " " _pp_lib_subdirs           "${_lib_subdirs}")
+string(REPLACE ";" " " _pp_lib_fallback_path     "${_lib_fallback_path}")
+string(REPLACE ";" " " _pp_include_fallback_path "${_include_fallback_path}")
+
+message(STATUS "You will link ${_link_type}ally to the MySQL client"
+               " library (set with -DMYSQLCLIENT_STATIC_LINKING=<bool>)")
+message(STATUS "Searching for ${_link_type} libraries with the base name(s) \"${_pp_search_libs}\"")
+
+##########################################################################
+#
+# Macros
+#
+##########################################################################
+
+# ----------------------------------------------------------------------
+#
+# Macro that runs "mysql_config ${_opt}" and return the line after
+# trimming away ending space/newline.
+#
+# _mysql_conf(
+#   _var    - output variable name, will contain a ';' separated list
+#   _opt    - the flag to give to mysql_config
+#
+# ----------------------------------------------------------------------
+
+macro(_mysql_conf _var _opt)
+  execute_process(
+    COMMAND ${MYSQL_CONFIG_EXECUTABLE} ${_opt}
+    OUTPUT_VARIABLE ${_var}
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+endmacro()
+
+# ----------------------------------------------------------------------
+#
+# Macro that runs "mysql_config ${_opt}", selects output args using a
+# regex, and clean it up a bit removing space/tab/newline before
+# setting it to a variable.
+#
+# _mysql_config(
+#   _var    - output variable name, will contain a ';' separated list
+#   _regex  - regular expression matching the prefix of args to select
+#   _opt    - the flag to give to mysql_config
+#
+# ----------------------------------------------------------------------
+
+macro(_mysql_config _var _regex _opt)
+  _mysql_conf(_mysql_config_output ${_opt})
+  string(REGEX MATCHALL "${_regex}([^ ]+)" _mysql_config_output "${_mysql_config_output}")
+  string(REGEX REPLACE "^[ \t]+" "" _mysql_config_output "${_mysql_config_output}")
+  IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
+    string(REGEX REPLACE " -latomic" "" _mysql_config_output "${_mysql_config_output}")
+  ENDIF()
+  string(REGEX REPLACE "${_regex}" "" _mysql_config_output "${_mysql_config_output}")
+  separate_arguments(_mysql_config_output)
+  set(${_var} ${_mysql_config_output})
+endmacro()
+
+# ----------------------------------------------------------------------
+#
+# Macro that runs "mysql_config ${_opt}" and selects output using a
+# prefix regex. Cleans it up a bit removing space/tab/newline. Then
+# removes the prefix on all in the list, and finally replace what
+# matches another regular expression with a replacement string.
+#
+# _mysql_config_replace(
+#   _var     - output variable name, will contain a ';' separated list
+#   _regex1  - regular expression to match out arguments
+#   _replace - what to replace match _regex1 with
+#   _regex2  - regular expression matching the prefix of args to select
+#   _opt     - the flag to give to mysql_config
+#
+# ----------------------------------------------------------------------
+
+macro(_mysql_config_replace _var _regex1 _replace _regex2 _opt)
+  _mysql_conf(_mysql_config_output ${_opt})
+  string(REGEX MATCHALL "${_regex2}([^ ]+)" _mysql_config_output "${_mysql_config_output}")
+  string(REGEX REPLACE "^[ \t]+" "" _mysql_config_output "${_mysql_config_output}")
+  IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
+    string(REGEX REPLACE " -latomic" "" _mysql_config_output "${_mysql_config_output}")
+  ENDIF()
+  string(REGEX REPLACE "${_regex2}" "" _mysql_config_output "${_mysql_config_output}")
+  string(REGEX REPLACE "${_regex1}" "${_replace}" _mysql_config_output "${_mysql_config_output}")
+  separate_arguments(_mysql_config_output)
+  set(${_var} ${_mysql_config_output})
+endmacro()
+
+# ----------------------------------------------------------------------
+#
+# Macro to check that we found a library and that we got the right type
+#
+# ----------------------------------------------------------------------
+
+macro(_check_lib_search_error _lib_dir_var _lib_var _exta_err_string)
+
+  set(_lib     "${${_lib_var}}")
+  set(_lib_dir "${${_lib_dir_var}}")
+
+  if(FINDMYSQL_DEBUG)
+    message("_lib         \"${_lib}\"")
+    message("_lib_dir     \"${_lib_dir}\"")
+    message("_lib_var     \"${_lib_var}\"")
+    message("_lib_dir_var \"${_lib_dir_var}\"")
+  endif()
+
+  set(_err_string "Could not find ${_link_type} "
+                  "\"${_pp_search_libs}\" in ${_lib_dir_var} "
+                  "\"${_lib_dir}\" ${_exta_err_string}")
+
+  if(NOT ${_lib_var})
+    message(FATAL_ERROR ${_err_string})
+  endif()
+
+  # find_library() try find a shared library first, then a static
+  # one. For Windows the library has a different name, but for
+  # Unix only the extension differs. So we check here that we
+  # got the library kind we expected.
+  if(NOT WIN32)
+    if(NOT MYSQLCLIENT_STATIC_LINKING)
+      get_filename_component(_ext ${_lib} EXT)
+      if(${_ext} STREQUAL ${_static_lib_ext})
+        message(FATAL_ERROR ${_err_string})
+      endif()
+    endif()
+  endif()
+endmacro()
+
+
+##########################################################################
+#
+# Try find MYSQL_CONFIG_EXECUTABLE if not set, and find version
+#
+##########################################################################
+
+if(NOT WIN32)
+
+  if(NOT MYSQL_CONFIG_EXECUTABLE)
+    find_program(MYSQL_CONFIG_EXECUTABLE
+      NAMES
+        mysql_config
+      DOC
+        "full path of mysql_config"
+      PATHS
+        ${_exe_fallback_path}
+    )
+  endif()
+
+  if(MYSQL_CONFIG_EXECUTABLE)
+    message(STATUS "mysql_config was found ${MYSQL_CONFIG_EXECUTABLE}")
+
+    _mysql_conf(MYSQL_VERSION "--version")
+  endif()
+
+endif()
+
+##########################################################################
+#
+# Find MYSQL_INCLUDE_DIR
+#
+##########################################################################
+
+if(FINDMYSQL_DEBUG AND MYSQL_INCLUDE_DIR)
+  message("DBG: User gave MYSQL_INCLUDE_DIR = \"${MYSQL_INCLUDE_DIR}\"")
+endif()
+
+if(FINDMYSQL_DEBUG AND MYSQL_DIR)
+  message("DBG: User gave MYSQL_DIR = \"${MYSQL_DIR}\"")
+endif()
+
+if(MYSQL_INCLUDE_DIR)
+
+  if(FINDMYSQL_DEBUG)
+    message("DBG: Using MYSQL_INCLUDE_DIR to find \"mysql.h\"")
+  endif()
+
+  if(NOT EXISTS "${MYSQL_INCLUDE_DIR}/mysql.h")
+    message(FATAL_ERROR "MYSQL_INCLUDE_DIR given, but no \"mysql.h\" "
+                        "in \"${MYSQL_INCLUDE_DIR}\"")
+  endif()
+
+elseif(MYSQL_DIR AND
+       (NOT _mysql_config_in_mysql_dir) AND
+       (NOT _mysql_config_set_by_user))
+
+  if(FINDMYSQL_DEBUG)
+    message("DBG: Using MYSQL_DIR without \"mysql_config\" to find \"mysql.h\"")
+  endif()
+
+  set(MYSQL_INCLUDE_DIR "${MYSQL_DIR}/include")
+  if(NOT EXISTS "${MYSQL_INCLUDE_DIR}/mysql.h")
+    message(FATAL_ERROR "MYSQL_DIR given, but no \"mysql.h\" "
+                        "in \"${MYSQL_INCLUDE_DIR}\"")
+  endif()
+
+elseif(MYSQL_CONFIG_EXECUTABLE)
+
+  if(FINDMYSQL_DEBUG)
+    message("DBG: Using \"mysql_config\" to find \"mysql.h\"")
+  endif()
+
+  # This code assumes there is just one "-I...." and that
+  # no space between "-I" and the path
+  _mysql_config(MYSQL_INCLUDE_DIR "(^| )-I" "--include")
+  if(NOT MYSQL_INCLUDE_DIR)
+    message(FATAL_ERROR "Could not find the include dir from running "
+                        "\"${MYSQL_CONFIG_EXECUTABLE}\"")
+  endif()
+
+  if(NOT EXISTS "${MYSQL_INCLUDE_DIR}/mysql.h")
+    message(FATAL_ERROR "Could not find \"mysql.h\" in \"${MYSQL_INCLUDE_DIR}\" "
+                        "found from running \"${MYSQL_CONFIG_EXECUTABLE}\"")
+  endif()
+
+else()
+
+  if(FINDMYSQL_DEBUG)
+    message("DBG: Using find_path() searching "
+            "\"${_pp_include_fallback_path}\" to find \"mysql.h\"")
+  endif()
+
+  # No specific paths, try some common install paths
+  find_path(MYSQL_INCLUDE_DIR mysql.h ${_include_fallback_path})
+
+  if(NOT MYSQL_INCLUDE_DIR)
+    message(FATAL_ERROR "Could not find \"mysql.h\" from searching "
+                        "\"${_pp_include_fallback_path}\"")
+  endif()
+
+endif()
+
+if(FINDMYSQL_DEBUG)
+  message("DBG: MYSQL_INCLUDE_DIR = \"${MYSQL_INCLUDE_DIR}\"")
+endif()
+
+##########################################################################
+#
+# Find MYSQL_LIB_DIR, MYSQL_LIB and MYSQL_LIBRARIES
+#
+##########################################################################
+
+if(FINDMYSQL_DEBUG AND MYSQL_LIB_DIR)
+  message("DBG: User gave MYSQL_LIB_DIR = \"${MYSQL_LIB_DIR}\"")
+endif()
+
+if(MYSQL_LIB_DIR)
+
+  if(FINDMYSQL_DEBUG)
+    message("DBG: Using find_library() searching MYSQL_LIB_DIR")
+  endif()
+
+  find_library(MYSQL_LIB
+    NAMES
+      ${_search_libs}
+    PATHS
+      "${MYSQL_LIB_DIR}"
+    NO_DEFAULT_PATH
+  )
+  _check_lib_search_error(MYSQL_LIB_DIR MYSQL_LIB "")
+  set(MYSQL_LIBRARIES ${MYSQL_LIB})
+
+elseif(MYSQL_DIR AND
+       (NOT _mysql_config_in_mysql_dir) AND 
+       (NOT _mysql_config_set_by_user))
+
+  if(FINDMYSQL_DEBUG)
+    message("DBG: Using find_library() searching "
+            "MYSQL_DIR and \"${_pp_lib_subdirs}\"")
+  endif()
+
+  find_library(MYSQL_LIB
+    NAMES
+      ${_search_libs}
+    PATHS
+      "${MYSQL_DIR}"
+    PATH_SUFFIXES
+      ${_lib_subdirs}
+    NO_DEFAULT_PATH
+  )
+  _check_lib_search_error(MYSQL_DIR MYSQL_LIB "in \"${_pp_lib_subdirs}\"")
+  get_filename_component(MYSQL_LIB_DIR "${MYSQL_LIB}" PATH)
+  set(MYSQL_LIBRARIES "${MYSQL_LIB}")
+
+elseif(MYSQL_CONFIG_EXECUTABLE)
+
+  if(FINDMYSQL_DEBUG)
+    message("DBG: Using \"mysql_config\" to find the libraries")
+  endif()
+
+  # This code assumes there is just one "-L...." and that
+  # no space between "-L" and the path
+  _mysql_config(MYSQL_LIB_DIR "(^| )-L" "--libs")
+
+  IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
+    # This is needed to make Solaris binaries using the default runtime lib path
+    _mysql_config(DEV_STUDIO_RUNTIME_DIR "(^| )-R" "--libs")
+  ENDIF()
+
+
+  # In case mysql_config returns two paths: (0) runtime and (1) libmysqlclient
+  LIST(LENGTH MYSQL_LIB_DIR n)
+  IF( ${n} GREATER 1)
+    LIST(GET MYSQL_LIB_DIR 1 MYSQL_LIB_DIR)
+  ENDIF()
+
+  if(NOT MYSQL_LIB_DIR)
+    message(FATAL_ERROR "Could not find the library dir from running "
+                        "\"${MYSQL_CONFIG_EXECUTABLE}\"")
+  endif()
+
+  if(NOT EXISTS "${MYSQL_LIB_DIR}")
+    message(FATAL_ERROR "Could not find the directory \"${MYSQL_LIB_DIR}\" "
+                        "found from running \"${MYSQL_CONFIG_EXECUTABLE}\"")
+  endif()
+
+  # We have the assumed MYSQL_LIB_DIR. The output from "mysql_config"
+  # might not be correct for static libraries, so we might need to
+  # adjust MYSQL_LIB_DIR later on.
+
+  if(MYSQLCLIENT_STATIC_LINKING)
+
+    # Find the static library, might be one level down
+    find_library(MYSQL_LIB
+      NAMES
+        ${_search_libs}
+      PATHS
+        ${MYSQL_LIB_DIR}
+      PATH_SUFFIXES
+        ${_static_subdirs}
+      NO_DEFAULT_PATH
+    )
+    _check_lib_search_error(MYSQL_LIB_DIR MYSQL_LIB "in \"${_static_subdirs}\"")
+
+    # Adjust MYSQL_LIB_DIR in case it changes
+    get_filename_component(MYSQL_LIB_DIR "${MYSQL_LIB}" PATH)
+
+    # Replace the current library references with the full path
+    # to the library, i.e. the -L will be ignored
+    _mysql_config_replace(MYSQL_LIBRARIES
+           "(mysqlclient|mysqlclient_r)" "${MYSQL_LIB}" "(^| )-l" "--libs")
+
+  else()
+
+    _mysql_config(MYSQL_LIBRARIES "(^| )-l" "--libs")
+    FOREACH(__lib IN LISTS MYSQL_LIBRARIES)
+      string(REGEX MATCH "mysqlclient([^ ]*)" _matched_lib __lib)
+      IF(_matched_lib)
+        set(_search_libs ${matched_lib})
+      ENDIF()
+    ENDFOREACH()
+    # First library is assumed to be the client library
+    # list(GET MYSQL_LIBRARIES 0 _search_libs)
+    find_library(MYSQL_LIB
+      NAMES
+        ${_search_libs}
+      PATHS
+        ${MYSQL_LIB_DIR}
+      NO_DEFAULT_PATH
+    )
+    _check_lib_search_error(MYSQL_LIB_DIR MYSQL_LIB "")
+
+  endif()
+
+else()
+
+  if(FINDMYSQL_DEBUG)
+    message("DBG: Using find_library() searching "
+            "\"${_pp_lib_fallback_path}\" to find the client library")
+  endif()
+
+  # Search standard places
+  find_library(MYSQL_LIB
+    NAMES
+      ${_search_libs}
+    PATHS
+      ${_lib_fallback_path}
+  )
+  if(NOT MYSQL_LIB)
+    message(FATAL_ERROR "Could not find \"${_pp_search_libs}\" from searching "
+                        "\"${_pp_lib_fallback_path}\"")
+  endif()
+
+  get_filename_component(MYSQL_LIB_DIR "${MYSQL_LIB}" PATH)
+
+endif()
+
+##########################################################################
+#
+# Add more libraries to MYSQL_LIBRARIES
+#
+##########################################################################
+
+# FIXME needed?!
+if(MYSQLCLIENT_STATIC_LINKING AND
+   NOT WIN32 AND
+   NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+  list(APPEND MYSQL_LIBRARIES "rt")
+endif()
+
+if(MYSQL_EXTRA_LIBRARIES)
+  separate_arguments(MYSQL_EXTRA_LIBRARIES)
+  list(APPEND MYSQL_LIBRARIES ${MYSQL_EXTRA_LIBRARIES})
+endif()
+
+# For compatibility
+SET(MYSQL_CLIENT_LIBS ${MYSQL_LIBRARIES})
+
+##########################################################################
+#
+# If not found MySQL Serverv version, compile a small client app
+# and let it write a small cmake file with the settings
+#
+##########################################################################
+
+if(MYSQL_INCLUDE_DIR AND NOT MYSQL_VERSION)
+
+  # Write the C source file that will include the MySQL headers
+  set(GETMYSQLVERSION_SOURCEFILE "${CMAKE_CURRENT_BINARY_DIR}/getmysqlversion.c")
+  file(WRITE "${GETMYSQLVERSION_SOURCEFILE}"
+       "#include <mysql.h>\n"
+       "#include <stdio.h>\n"
+       "int main() {\n"
+       "  printf(\"%s\", MYSQL_SERVER_VERSION);\n"
+       "}\n"
+  )
+
+  # Compile and run the created executable, store output in MYSQL_VERSION
+  try_run(_run_result _compile_result
+    "${CMAKE_BINARY_DIR}"
+    "${GETMYSQLVERSION_SOURCEFILE}"
+    CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${MYSQL_INCLUDE_DIR}"
+    RUN_OUTPUT_VARIABLE MYSQL_VERSION
+  )
+
+  if(FINDMYSQL_DEBUG)
+    if(NOT _compile_result)
+      message("DBG: Could not compile \"getmysqlversion.c\"")
+    endif()
+    if(_run_result)
+      message("DBG: Running \"getmysqlversion\" returned ${_run_result}")
+    endif()
+  endif()
+
+endif()
+
+##########################################################################
+#
+# Clean up MYSQL_VERSION and create MYSQL_VERSION_ID/MYSQL_NUM_VERSION
+#
+##########################################################################
+
+if(NOT MYSQL_VERSION)
+  message(FATAL_ERROR "Could not determine the MySQL Server version")
+endif()
+
+# Clean up so only numeric, in case of "-alpha" or similar
+string(REGEX MATCHALL "([0-9]+.[0-9]+.[0-9]+)" MYSQL_VERSION "${MYSQL_VERSION}")
+# To create a fully numeric version, first normalize so N.NN.NN
+string(REGEX REPLACE "[.]([0-9])[.]" ".0\\1." MYSQL_VERSION_ID "${MYSQL_VERSION}")
+string(REGEX REPLACE "[.]([0-9])$"   ".0\\1"  MYSQL_VERSION_ID "${MYSQL_VERSION_ID}")
+# Finally remove the dot
+string(REGEX REPLACE "[.]" "" MYSQL_VERSION_ID "${MYSQL_VERSION_ID}")
+set(MYSQL_NUM_VERSION ${MYSQL_VERSION_ID})
+
+##########################################################################
+#
+# Try determine if to use C++ linkage, and also find C++ flags
+#
+##########################################################################
+
+if(NOT WIN32)
+
+  if(MYSQL_CONFIG_EXECUTABLE)
+
+    if(NOT MYSQL_CFLAGS)
+      _mysql_conf(MYSQL_CFLAGS "--cflags")
+    endif()
+
+    if(NOT MYSQL_CXXFLAGS)
+      if(MYSQL_CXX_LINKAGE OR MYSQL_VERSION_ID GREATER 50603)
+        _mysql_conf(MYSQL_CXXFLAGS "--cxxflags")
+        set(MYSQL_CXX_LINKAGE 1)
+      else()
+        set(MYSQL_CXXFLAGS "${MYSQL_CFLAGS}")
+      endif()
+    endif()
+
+# FIXME this should not be needed, caller of this module should set
+#       it's own flags and just use the library on it's on terms
+#       (change the infe message if enabling this code)
+#   if(NOT MYSQL_LINK_FLAGS)
+#     # Find -mcpu -march -mt -m32 -m64 and other flags starting with "-m"
+#     string(REGEX MATCHALL "(^| )-m([^\r\n ]+)" MYSQL_LINK_FLAGS "${MYSQL_CXXFLAGS}")
+#     string(REGEX REPLACE "^ " ""  MYSQL_LINK_FLAGS "${MYSQL_LINK_FLAGS}")
+#     string(REGEX REPLACE "; " ";" MYSQL_LINK_FLAGS "${MYSQL_LINK_FLAGS}")
+#   endif()
+
+  endif()
+
+endif()
+
+##########################################################################
+#
+# Inform CMake where to look for headers and libraries
+#
+##########################################################################
+
+# string(TOUPPER "${CMAKE_BUILD_TYPE}" CMAKEBT)
+# set(CMAKE_CXX_FLAGS                "${CMAKE_CXX_FLAGS} ${MYSQL_CXXFLAGS}")
+# set(CMAKE_CXX_FLAGS_${CMAKEBT}     "${CMAKE_CXX_FLAGS_${CMAKEBT}} ${MYSQL_CXXFLAGS}")
+
+include_directories("${MYSQL_INCLUDE_DIR}")
+link_directories("${MYSQL_LIB_DIR}")
+
+##########################################################################
+#
+# Report
+#
+##########################################################################
+
+message(STATUS "MySQL client environment/cmake variables set that the user can override")
+
+message(STATUS "  MYSQL_DIR                   : ${MYSQL_DIR}")
+message(STATUS "  MYSQL_INCLUDE_DIR           : ${MYSQL_INCLUDE_DIR}")
+message(STATUS "  MYSQL_LIB_DIR               : ${MYSQL_LIB_DIR}")
+message(STATUS "  MYSQL_CONFIG_EXECUTABLE     : ${MYSQL_CONFIG_EXECUTABLE}")
+message(STATUS "  MYSQL_CXX_LINKAGE           : ${MYSQL_CXX_LINKAGE}")
+message(STATUS "  MYSQL_CFLAGS                : ${MYSQL_CFLAGS}")
+message(STATUS "  MYSQL_CXXFLAGS              : ${MYSQL_CXXFLAGS}")
+message(STATUS "  MYSQLCLIENT_STATIC_LINKING  : ${MYSQLCLIENT_STATIC_LINKING}")
+message(STATUS "  MYSQLCLIENT_NO_THREADS      : ${MYSQLCLIENT_NO_THREADS}")
+
+message(STATUS "MySQL client optional environment/cmake variables set by the user")
+
+message(STATUS "  MYSQL_EXTRA_LIBRARIES       : ${MYSQL_EXTRA_LIBRARIES}")
+message(STATUS "  MYSQL_LINK_FLAGS            : ${MYSQL_LINK_FLAGS}")
+
+message(STATUS "MySQL client settings that the user can't override")
+
+message(STATUS "  MYSQL_VERSION               : ${MYSQL_VERSION}")
+message(STATUS "  MYSQL_VERSION_ID            : ${MYSQL_VERSION_ID}")
+message(STATUS "  MYSQL_LIB                   : ${MYSQL_LIB}")
+message(STATUS "  MYSQL_LIBRARIES             : ${MYSQL_LIBRARIES}")

cmake/Modules/Pod2Man.cmake

@@ -21,7 +21,7 @@
 # To use it, include this file in CMakeLists.txt and
 # invoke POD2MAN(<podfile> <manfile> <section>)
 
-MACRO(POD2MAN PODFILE MANFILE SECTION MANPAGE_DEST_PREFIX)
+MACRO(POD2MAN PODFILE MANFILE SECTION)
 	FIND_PROGRAM(POD2MAN pod2man)
 	FIND_PROGRAM(GZIP gzip)
 
@@ -53,13 +53,14 @@ MACRO(POD2MAN PODFILE MANFILE SECTION MANPAGE_DEST_PREFIX)
 
 	SET(MANPAGE_TARGET "man-${MANFILE}")
 
-	ADD_CUSTOM_TARGET(${MANPAGE_TARGET} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}.gz)
+	ADD_CUSTOM_TARGET(${MANPAGE_TARGET} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}.gz)
+	ADD_DEPENDENCIES(man ${MANPAGE_TARGET})
 
 	INSTALL(
 		FILES ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}.gz
-		DESTINATION ${MANPAGE_DEST_PREFIX}/man${SECTION}
+		DESTINATION share/man/man${SECTION}
     	)
-ENDMACRO(POD2MAN PODFILE MANFILE SECTION MANPAGE_DEST_PREFIX)
+ENDMACRO(POD2MAN PODFILE MANFILE SECTION)
 
 MACRO(ADD_MANPAGE_TARGET)
 	# It is not possible add a dependency to target 'install'

cmake/compiler/clang/settings.cmake

@@ -1,43 +0,0 @@
-target_compile_options(zm-warning-interface
-  INTERFACE
-    -Wall
-    -Wextra
-    -Wimplicit-fallthrough
-    -Wno-unused-parameter
-    -Wvla)
-
-if(ENABLE_WERROR)
-  target_compile_options(zm-warning-interface
-    INTERFACE
-      -Werror)
-endif()
-
-if(ASAN)
-  target_compile_options(zm-compile-option-interface
-    INTERFACE
-      -fno-omit-frame-pointer
-      -fsanitize=address
-      -fsanitize-recover=address
-      -fsanitize-address-use-after-scope)
-
-  target_link_options(zm-compile-option-interface
-    INTERFACE
-      -fno-omit-frame-pointer
-      -fsanitize=address
-      -fsanitize-recover=address
-      -fsanitize-address-use-after-scope)
-
-  message(STATUS "Clang: Enabled AddressSanitizer (ASan)")
-endif()
-
-if(TSAN)
-  target_compile_options(zm-compile-option-interface
-    INTERFACE
-      -fsanitize=thread)
-
-  target_link_options(zm-compile-option-interface
-    INTERFACE
-      -fsanitize=thread)
-
-  message(STATUS "Clang: Enabled ThreadSanitizer (TSan)")
-endif()

cmake/compiler/gcc/settings.cmake

@@ -1,48 +0,0 @@
-target_compile_options(zm-warning-interface
-  INTERFACE
-    -Wall
-    $<$<VERSION_GREATER:$<CXX_COMPILER_VERSION>,5.0>:-Wconditionally-supported>
-    -Wextra
-    -Wformat-security
-    -Wno-cast-function-type
-    $<$<VERSION_LESS:$<CXX_COMPILER_VERSION>,11>:-Wno-clobbered>
-    -Wno-unused-parameter
-    -Woverloaded-virtual
-    -Wvla)
-
-if(ENABLE_WERROR)
-  target_compile_options(zm-warning-interface
-    INTERFACE
-      -Werror)
-endif()
-
-if(ASAN)
-  target_compile_options(zm-compile-option-interface
-    INTERFACE
-      -D_GLIBCXX_SANITIZE_VECTOR=1
-      -fno-omit-frame-pointer
-      -fsanitize=address
-      -fsanitize-recover=address
-      -fsanitize-address-use-after-scope)
-
-  target_link_options(zm-compile-option-interface
-    INTERFACE
-      -fno-omit-frame-pointer
-      -fsanitize=address
-      -fsanitize-recover=address
-      -fsanitize-address-use-after-scope)
-
-  message(STATUS "GCC: Enabled AddressSanitizer (ASan)")
-endif()
-
-if(TSAN)
-  target_compile_options(zm-compile-option-interface
-    INTERFACE
-      -fsanitize=thread)
-
-  target_link_options(zm-compile-option-interface
-    INTERFACE
-      -fsanitize=thread)
-
-  message(STATUS "GCC: Enabled ThreadSanitizer (TSan)")
-endif()

cmakecacheimport.sh

@@ -55,9 +55,6 @@ echo "Database host              : $ZM_DB_HOST"
 echo "Database name              : $ZM_DB_NAME"
 echo "Database user              : $ZM_DB_USER"
 echo "Database password          : Not shown"
-echo "Database SSL CA Cert       : $ZM_DB_SSL_CA_CERT"
-echo "Database SSL Client Key    : $ZM_DB_SSL_CLIENT_KEY"
-echo "Database SSL Client Cert   : $ZM_DB_SSL_CLIENT_CERT"
 
 
 CMPATH="CACHE PATH \"Imported by cmakecacheimport.sh\" FORCE"
@@ -75,9 +72,6 @@ echo "set(ZM_DB_HOST \"$ZM_DB_HOST\" $CMSTRING)">>zm_conf.cmake
 echo "set(ZM_DB_NAME \"$ZM_DB_NAME\" $CMSTRING)">>zm_conf.cmake
 echo "set(ZM_DB_USER \"$ZM_DB_USER\" $CMSTRING)">>zm_conf.cmake
 echo "set(ZM_DB_PASS \"$ZM_DB_PASS\" $CMSTRING)">>zm_conf.cmake
-echo "set(ZM_DB_SSL_CA_CERT \"$ZM_DB_SSL_CA_CERT\" $CMSTRING)">>zm_conf.cmake
-echo "set(ZM_DB_SSL_CLIENT_KEY \"$ZM_DB_SSL_CLIENT_KEY\" $CMSTRING)">>zm_conf.cmake
-echo "set(ZM_DB_SSL_CLIENT_CERT \"$ZM_DB_SSL_CLIENT_CERT\" $CMSTRING)">>zm_conf.cmake
 
 echo ""
 echo "Wrote zm_conf.cmake"

conf.d/01-system-paths.conf.in

@@ -1,51 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder System Paths Configuration
-#
-# ==========================================================================
-#
-# This config file contains the variables previously found under Options -> Paths
-#
-# *** DO NOT EDIT THIS FILE ***
-#
-# To make custom changes to the variables below, create a new configuration
-# file, with an extention of .conf, containing your desired modifications.
-#
-
-# Full path to the folder events are recorded to.
-# The web account user must have full read/write permission to this folder.
-ZM_DIR_EVENTS=@ZM_DIR_EVENTS@
-
-# Foldername under the webroot where ZoneMinder looks for optional sound files
-# to play when an alarm is detected.
-ZM_DIR_SOUNDS=@ZM_DIR_SOUNDS@
-
-# Full path to the folder where exported archives are stored
-# The web account user must have full read/write permission to this folder.
-ZM_DIR_EXPORTS=@ZM_TMPDIR@
-
-# ZoneMinder url path to the zms streaming server
-ZM_PATH_ZMS=@ZM_PATH_ZMS@
-
-# Full Path to ZoneMinder's mapped memory files 
-# The web account user must have full read/write permission to this folder.
-ZM_PATH_MAP=@ZM_PATH_MAP@
-
-# Full Path to ZoneMinder's socket folder
-# The web account user must have full read/write permission to this folder.
-ZM_PATH_SOCKS=@ZM_SOCKDIR@
-
-# Full path to ZoneMinder's log folder
-# The web account user must have full read/write permission to this folder.
-ZM_PATH_LOGS=@ZM_LOGDIR@
-
-# Full path to ZoneMinder's swap folder
-# The web account user must have full read/write permission to this folder.
-ZM_PATH_SWAP=@ZM_TMPDIR@
-
-# Full path to optional arp binary
-# ZoneMinder will find the arp binary automatically on most systems
-ZM_PATH_ARP="@ZM_PATH_ARP@"
-
-#Full path to shutdown binary
-ZM_PATH_SHUTDOWN="@ZM_PATH_SHUTDOWN@"

conf.d/02-multiserver.conf

@@ -1,12 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Multiserver Configuration
-#
-# ==========================================================================
-# Do NOT set ZM_SERVER_HOST if you are not using Multi-Server
-# You have been warned
-#
-# The name specified here must have a corresponding entry
-# in the Servers tab under Options
-#ZM_SERVER_HOST=
-

conf.d/zm-server-host.conf

@@ -0,0 +1,7 @@
+# Do NOT set ZM_SERVER_HOST if you are not using Multi-Server
+# You have been warned
+#
+# The name specified here must have a corresponding entry
+# in the Servers tab under Options
+ZM_SERVER_HOST=
+

db/CMakeLists.txt

@@ -2,8 +2,6 @@
 
 # Create files from the .in files
 configure_file(zm_create.sql.in "${CMAKE_CURRENT_BINARY_DIR}/zm_create.sql" @ONLY)
-configure_file(zm_update-1.31.30.sql.in "${CMAKE_CURRENT_BINARY_DIR}/zm_update-1.31.30.sql" @ONLY)
-configure_file(zm_update-1.35.24.sql.in "${CMAKE_CURRENT_BINARY_DIR}/zm_update-1.35.24.sql" @ONLY)
 
 # Glob all database upgrade scripts
 file(GLOB dbfileslist RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "zm_update-*.sql")
@@ -11,14 +9,5 @@ file(GLOB dbfileslist RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "zm_update-*.sql")
 # Install the database upgrade scripts
 install(FILES ${dbfileslist} DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/db")
 
-# install zm_update-1.31.30.sql
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm_update-1.31.30.sql" DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/db")
-# install zm_update-1.35.24.sql
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm_update-1.35.24.sql" DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/db")
-
 # install zm_create.sql
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm_create.sql" DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/db")
-
-# install triggers.sql
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/triggers.sql" DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/db")
-

db/triggers.sql

@@ -1,248 +0,0 @@
-
-delimiter //
-DROP TRIGGER IF EXISTS Events_Hour_delete_trigger//
-CREATE TRIGGER Events_Hour_delete_trigger BEFORE DELETE ON Events_Hour
-FOR EACH ROW BEGIN
-  UPDATE Event_Summaries SET
-  HourEvents = GREATEST(COALESCE(HourEvents,1)-1,0),
-  HourEventDiskSpace=GREATEST(COALESCE(HourEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
-  WHERE Event_Summaries.MonitorId=OLD.MonitorId;
-END; 
-//
-
-DROP TRIGGER IF EXISTS Events_Hour_update_trigger//
-
-CREATE TRIGGER Events_Hour_update_trigger AFTER UPDATE ON Events_Hour
-FOR EACH ROW
-  BEGIN
-    declare diff BIGINT default 0;
-
-    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
-    IF ( diff ) THEN
-      IF ( NEW.MonitorID != OLD.MonitorID ) THEN
-        UPDATE Event_Summaries SET HourEventDiskSpace=GREATEST(COALESCE(HourEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0) WHERE Event_Summaries.MonitorId=OLD.MonitorId;
-        UPDATE Event_Summaries SET HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)+COALESCE(NEW.DiskSpace,0) WHERE Event_Summaries.MonitorId=NEW.MonitorId;
-      ELSE
-        UPDATE Event_Summaries SET HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)+diff WHERE Event_Summaries.MonitorId=NEW.MonitorId;
-      END IF;
-    END IF;
-  END;
-//
-
-DROP TRIGGER IF EXISTS Events_Day_delete_trigger//
-CREATE TRIGGER Events_Day_delete_trigger BEFORE DELETE ON Events_Day
-FOR EACH ROW BEGIN
-  UPDATE Event_Summaries SET
-  DayEvents = GREATEST(COALESCE(DayEvents,1)-1,0),
-  DayEventDiskSpace=GREATEST(COALESCE(DayEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
-  WHERE Event_Summaries.MonitorId=OLD.MonitorId;
-END;
-//
-
-DROP TRIGGER IF EXISTS Events_Day_update_trigger;
-CREATE TRIGGER Events_Day_update_trigger AFTER UPDATE ON Events_Day
-FOR EACH ROW
-  BEGIN
-    declare diff BIGINT default 0;
-
-    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
-    IF ( diff ) THEN
-      IF ( NEW.MonitorID != OLD.MonitorID ) THEN
-        UPDATE Event_Summaries SET DayEventDiskSpace=GREATEST(COALESCE(DayEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0) WHERE Event_Summaries.MonitorId=OLD.MonitorId;
-        UPDATE Event_Summaries SET DayEventDiskSpace=COALESCE(DayEventDiskSpace,0)+COALESCE(NEW.DiskSpace,0) WHERE Event_Summaries.MonitorId=NEW.MonitorId;
-      ELSE
-        UPDATE Event_Summaries SET DayEventDiskSpace=GREATEST(COALESCE(DayEventDiskSpace,0)+diff,0) WHERE Event_Summaries.MonitorId=NEW.MonitorId;
-      END IF;
-    END IF;
-  END;
-  //
-
-
-DROP TRIGGER IF EXISTS Events_Week_delete_trigger//
-CREATE TRIGGER Events_Week_delete_trigger BEFORE DELETE ON Events_Week
-FOR EACH ROW BEGIN
-  UPDATE Event_Summaries SET
-  WeekEvents = GREATEST(COALESCE(WeekEvents,1)-1,0),
-  WeekEventDiskSpace=GREATEST(COALESCE(WeekEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
-  WHERE Event_Summaries.MonitorId=OLD.MonitorId;
-END;
-//
-
-DROP TRIGGER IF EXISTS Events_Week_update_trigger;
-CREATE TRIGGER Events_Week_update_trigger AFTER UPDATE ON Events_Week
-FOR EACH ROW
-  BEGIN
-    declare diff BIGINT default 0;
-
-    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
-    IF ( diff ) THEN
-      IF ( NEW.MonitorID != OLD.MonitorID ) THEN
-        UPDATE Event_Summaries SET WeekEventDiskSpace=GREATEST(COALESCE(WeekEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0) WHERE Event_Summaries.MonitorId=OLD.MonitorId;
-        UPDATE Event_Summaries SET WeekEventDiskSpace=COALESCE(WeekEventDiskSpace,0)+COALESCE(NEW.DiskSpace,0) WHERE Event_Summaries.MonitorId=NEW.MonitorId;
-      ELSE
-        UPDATE Event_Summaries SET WeekEventDiskSpace=GREATEST(COALESCE(WeekEventDiskSpace,0)+diff,0) WHERE Event_Summaries.MonitorId=NEW.MonitorId;
-      END IF;
-    END IF;
-  END;
-  //
-
-DROP TRIGGER IF EXISTS Events_Month_delete_trigger//
-CREATE TRIGGER Events_Month_delete_trigger BEFORE DELETE ON Events_Month
-FOR EACH ROW BEGIN
-  UPDATE Event_Summaries SET
-  MonthEvents = GREATEST(COALESCE(MonthEvents,1)-1,0),
-  MonthEventDiskSpace=GREATEST(COALESCE(MonthEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
-  WHERE Event_Summaries.MonitorId=OLD.MonitorId;
-END;
-//
-
-DROP TRIGGER IF EXISTS Events_Month_update_trigger;
-CREATE TRIGGER Events_Month_update_trigger AFTER UPDATE ON Events_Month
-FOR EACH ROW
-  BEGIN
-    declare diff BIGINT default 0;
-
-    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
-    IF ( diff ) THEN
-      IF ( NEW.MonitorID != OLD.MonitorID ) THEN
-        UPDATE Event_Summaries SET MonthEventDiskSpace=GREATEST(COALESCE(MonthEventDiskSpace,0)-COALESCE(OLD.DiskSpace),0) WHERE Event_Summaries.MonitorId=OLD.MonitorId;
-        UPDATE Event_Summaries SET MonthEventDiskSpace=COALESCE(MonthEventDiskSpace,0)+COALESCE(NEW.DiskSpace) WHERE Event_Summaries.MonitorId=NEW.MonitorId;
-      ELSE
-        UPDATE Event_Summaries SET MonthEventDiskSpace=GREATEST(COALESCE(MonthEventDiskSpace,0)+diff,0) WHERE Event_Summaries.MonitorId=NEW.MonitorId;
-      END IF;
-    END IF;
-  END;
-  //
-
-drop procedure if exists update_storage_stats//
-
-drop trigger if exists event_update_trigger//
-
-CREATE TRIGGER event_update_trigger AFTER UPDATE ON Events 
-FOR EACH ROW
-BEGIN
-  declare diff BIGINT default 0;
-
-  set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
-  IF ( NEW.StorageId = OLD.StorageID ) THEN
-    IF ( diff ) THEN
-      UPDATE Storage SET DiskSpace = GREATEST(COALESCE(DiskSpace,0) + diff,0) WHERE Storage.Id = OLD.StorageId;
-    END IF;
-  ELSE
-    IF ( NEW.DiskSpace ) THEN
-      UPDATE Storage SET DiskSpace = COALESCE(DiskSpace,0) + NEW.DiskSpace WHERE Storage.Id = NEW.StorageId;
-    END IF;
-    IF ( OLD.DiskSpace ) THEN
-      UPDATE Storage SET DiskSpace = GREATEST(COALESCE(DiskSpace,0) - OLD.DiskSpace,0) WHERE Storage.Id = OLD.StorageId;
-    END IF;
-  END IF;
-
-  UPDATE Events_Hour SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-  UPDATE Events_Day SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-  UPDATE Events_Week SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-  UPDATE Events_Month SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-
-  IF ( NEW.Archived != OLD.Archived ) THEN
-    IF ( NEW.Archived ) THEN
-      INSERT INTO Events_Archived (EventId,MonitorId,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.DiskSpace);
-      INSERT INTO Event_Summaries (MonitorId,ArchivedEvents,ArchivedEventDiskSpace) VALUES (NEW.MonitorId,1,NEW.DiskSpace) ON DUPLICATE KEY
-        UPDATE ArchivedEvents = COALESCE(ArchivedEvents,0)+1, ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) + COALESCE(NEW.DiskSpace,0);
-    ELSEIF ( OLD.Archived ) THEN
-      DELETE FROM Events_Archived WHERE EventId=OLD.Id;
-      UPDATE Event_Summaries
-        SET
-          ArchivedEvents = GREATEST(COALESCE(ArchivedEvents,0)-1,0),
-          ArchivedEventDiskSpace = GREATEST(COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0),0)
-        WHERE Event_Summaries.MonitorId=OLD.MonitorId;
-    ELSE
-      IF ( OLD.DiskSpace != NEW.DiskSpace ) THEN
-        UPDATE Events_Archived SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-        UPDATE Event_Summaries SET
-          ArchivedEventDiskSpace = GREATEST(COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0),0)
-          WHERE Event_Summaries.MonitorId=OLD.MonitorId;
-      END IF;
-    END IF;
-  ELSEIF ( NEW.Archived AND diff ) THEN
-    UPDATE Events_Archived SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-  END IF;
-
-  IF ( diff ) THEN
-    UPDATE Event_Summaries
-      SET
-        TotalEventDiskSpace = GREATEST(COALESCE(TotalEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0),0)
-      WHERE Event_Summaries.MonitorId=OLD.MonitorId;
-  END IF;
-
-END;
-
-//
-
-DROP TRIGGER IF EXISTS event_insert_trigger//
-
-/* The assumption is that when an Event is inserted, it has no size yet, so don't bother updating the DiskSpace, just the count.
- * The DiskSpace will get update in the Event Update Trigger
- */
-CREATE TRIGGER event_insert_trigger AFTER INSERT ON Events
-FOR EACH ROW
-  BEGIN
-
-  INSERT INTO Events_Hour (EventId,MonitorId,StartDateTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartDateTime,0);
-  INSERT INTO Events_Day (EventId,MonitorId,StartDateTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartDateTime,0);
-  INSERT INTO Events_Week (EventId,MonitorId,StartDateTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartDateTime,0);
-  INSERT INTO Events_Month (EventId,MonitorId,StartDateTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartDateTime,0);
-  INSERT INTO Event_Summaries (MonitorId,HourEvents,DayEvents,WeekEvents,MonthEvents,TotalEvents) VALUES (NEW.MonitorId,1,1,1,1,1) ON DUPLICATE KEY
-  UPDATE 
-  HourEvents = COALESCE(HourEvents,0)+1,
-  DayEvents = COALESCE(DayEvents,0)+1,
-  WeekEvents = COALESCE(WeekEvents,0)+1,
-  MonthEvents = COALESCE(MonthEvents,0)+1,
-  TotalEvents = COALESCE(TotalEvents,0)+1;
-END;
-//
-
-DROP TRIGGER IF EXISTS event_delete_trigger//
-
-CREATE TRIGGER event_delete_trigger BEFORE DELETE ON Events
-FOR EACH ROW
-BEGIN
-  IF ( OLD.DiskSpace ) THEN
-    UPDATE Storage SET DiskSpace = GREATEST(COALESCE(DiskSpace,0) - COALESCE(OLD.DiskSpace,0),0) WHERE Storage.Id = OLD.StorageId;
-  END IF;
-  DELETE FROM Events_Hour WHERE EventId=OLD.Id;
-  DELETE FROM Events_Day WHERE EventId=OLD.Id;
-  DELETE FROM Events_Week WHERE EventId=OLD.Id;
-  DELETE FROM Events_Month WHERE EventId=OLD.Id;
-  IF ( OLD.Archived ) THEN
-    DELETE FROM Events_Archived WHERE EventId=OLD.Id;
-    UPDATE Event_Summaries SET
-      ArchivedEvents = GREATEST(COALESCE(ArchivedEvents,1) - 1,0),
-      ArchivedEventDiskSpace = GREATEST(COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0),0),
-      TotalEvents = GREATEST(COALESCE(TotalEvents,1) - 1,0),
-      TotalEventDiskSpace = GREATEST(COALESCE(TotalEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0),0)
-      WHERE Event_Summaries.MonitorId=OLD.MonitorId;
-  ELSE
-    UPDATE Event_Summaries SET
-    TotalEvents = GREATEST(COALESCE(TotalEvents,1)-1,0),
-    TotalEventDiskSpace=GREATEST(COALESCE(TotalEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
-    WHERE Event_Summaries.MonitorId=OLD.MonitorId;
-  END IF;
-END;
-
-//
-
-DROP TRIGGER IF EXISTS Zone_Insert_Trigger//
-CREATE TRIGGER Zone_Insert_Trigger AFTER INSERT ON Zones
-FOR EACH ROW
-  BEGIN
-    UPDATE Monitors SET ZoneCount=(SELECT COUNT(*) FROM Zones WHERE MonitorId=NEW.MonitorId) WHERE Monitors.Id=NEW.MonitorID;
-  END
-//
-DROP TRIGGER IF EXISTS Zone_Delete_Trigger//
-CREATE TRIGGER Zone_Delete_Trigger AFTER DELETE ON Zones
-FOR EACH ROW
-  BEGIN
-    UPDATE Monitors SET ZoneCount=(SELECT COUNT(*) FROM Zones WHERE MonitorId=OLD.MonitorId) WHERE Monitors.Id=OLD.MonitorID;
-  END
-//
-
-DELIMITER ;

db/zm_create.sql.in

@@ -63,12 +63,11 @@ DROP TABLE IF EXISTS `Controls`;
 CREATE TABLE `Controls` (
   `Id` int(10) unsigned NOT NULL auto_increment,
   `Name` varchar(64) NOT NULL default '',
-  `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket','VNC') NOT NULL default 'Local',
+  `Type` enum('Local','Remote','Ffmpeg','Libvlc','cURL') NOT NULL default 'Local',
   `Protocol` varchar(64) default NULL,
   `CanWake` tinyint(3) unsigned NOT NULL default '0',
   `CanSleep` tinyint(3) unsigned NOT NULL default '0',
   `CanReset` tinyint(3) unsigned NOT NULL default '0',
-  `CanReboot` tinyint(3) unsigned NOT NULL default '0',
   `CanZoom` tinyint(3) unsigned NOT NULL default '0',
   `CanAutoZoom` tinyint(3) unsigned NOT NULL default '0',
   `CanZoomAbs` tinyint(3) unsigned NOT NULL default '0',
@@ -183,21 +182,18 @@ CREATE TABLE `Devices` (
 
 DROP TABLE IF EXISTS `Events`;
 CREATE TABLE `Events` (
-  `Id` bigint unsigned NOT NULL auto_increment,
+  `Id` int(10) unsigned NOT NULL auto_increment,
   `MonitorId` int(10) unsigned NOT NULL default '0',
-  `StorageId`	smallint(5) unsigned default 0,
-  `SecondaryStorageId`	smallint(5) unsigned default 0,
   `Name` varchar(64) NOT NULL default '',
   `Cause` varchar(32) NOT NULL default '',
-  `StartDateTime` datetime default NULL,
-  `EndDateTime` datetime default NULL,
+  `StartTime` datetime default NULL,
+  `EndTime` datetime default NULL,
   `Width` smallint(5) unsigned NOT NULL default '0',
   `Height` smallint(5) unsigned NOT NULL default '0',
   `Length` decimal(10,2) NOT NULL default '0.00',
   `Frames` int(10) unsigned default NULL,
   `AlarmFrames` int(10) unsigned default NULL,
-  `DefaultVideo` VARCHAR( 64 ) DEFAULT '' NOT NULL,
-  `SaveJPEGs` TINYINT,
+  `DefaultVideo` VARCHAR( 64 ) NOT NULL,
   `TotScore` int(10) unsigned NOT NULL default '0',
   `AvgScore` smallint(5) unsigned default '0',
   `MaxScore` smallint(5) unsigned default '0',
@@ -209,69 +205,11 @@ CREATE TABLE `Events` (
   `Executed` tinyint(3) unsigned NOT NULL default '0',
   `Notes` text,
   `StateId` int(10) unsigned NOT NULL,
-  `Orientation` enum('ROTATE_0','ROTATE_90','ROTATE_180','ROTATE_270','FLIP_HORI','FLIP_VERT') NOT NULL default 'ROTATE_0',
-  `DiskSpace`   bigint unsigned default NULL,
-  `Scheme`   enum('Deep','Medium','Shallow') NOT NULL default 'Medium',
-  `Locked`    BOOLEAN NOT NULL DEFAULT False,
-  PRIMARY KEY (`Id`),
-  KEY `Events_MonitorId_idx` (`MonitorId`),
-  KEY `Events_StorageId_idx` (`StorageId`),
-  KEY `Events_StartDateTime_idx` (`StartDateTime`),
-  KEY `Events_EndDateTime_DiskSpace` (`EndDateTime`,`DiskSpace`)
-) ENGINE=@ZM_MYSQL_ENGINE@;
-
-DROP TABLE IF EXISTS `Events_Hour`;
-CREATE TABLE `Events_Hour` (
-  `EventId` BIGINT unsigned NOT NULL,
-  `MonitorId` int(10) unsigned NOT NULL,
-  `StartDateTime` datetime default NULL,
-  `DiskSpace`   bigint default NULL,
-  PRIMARY KEY (`EventId`),
-  KEY `Events_Hour_MonitorId_idx` (`MonitorId`),
-  KEY `Events_Hour_StartDateTime_idx` (`StartDateTime`)
-) ENGINE=@ZM_MYSQL_ENGINE@;
-
-DROP TABLE IF EXISTS `Events_Day`;
-CREATE TABLE `Events_Day` (
-  `EventId` BIGINT unsigned NOT NULL,
-  `MonitorId` int(10) unsigned NOT NULL,
-  `StartDateTime` datetime default NULL,
-  `DiskSpace`   bigint default NULL,
-  PRIMARY KEY (`EventId`),
-  KEY `Events_Day_MonitorId_idx` (`MonitorId`),
-  KEY `Events_Day_StartDateTime_idx` (`StartDateTime`)
-) ENGINE=@ZM_MYSQL_ENGINE@;
-
-DROP TABLE IF EXISTS `Events_Week`;
-CREATE TABLE `Events_Week` (
-  `EventId` BIGINT unsigned NOT NULL,
-  `MonitorId` int(10) unsigned NOT NULL,
-  `StartDateTime` datetime default NULL,
-  `DiskSpace`   bigint default NULL,
-  PRIMARY KEY (`EventId`),
-  KEY `Events_Week_MonitorId_idx` (`MonitorId`),
-  KEY `Events_Week_StartDateTime_idx` (`StartDateTime`)
-) ENGINE=@ZM_MYSQL_ENGINE@;
-
-DROP TABLE IF EXISTS `Events_Month`;
-CREATE TABLE `Events_Month` (
-  `EventId` BIGINT unsigned NOT NULL,
-  `MonitorId` int(10) unsigned NOT NULL,
-  `StartDateTime` datetime default NULL,
-  `DiskSpace`   bigint default NULL,
-  PRIMARY KEY (`EventId`),
-  KEY `Events_Month_MonitorId_idx` (`MonitorId`),
-  KEY `Events_Month_StartDateTime_idx` (`StartDateTime`)
-) ENGINE=@ZM_MYSQL_ENGINE@;
-
-
-DROP TABLE IF EXISTS `Events_Archived`;
-CREATE TABLE `Events_Archived` (
-  `EventId` BIGINT unsigned NOT NULL,
-  `MonitorId` int(10) unsigned NOT NULL,
-  `DiskSpace`   bigint default NULL,
-  PRIMARY KEY (`EventId`),
-  KEY `Events_Archived_MonitorId_idx` (`MonitorId`)
+  PRIMARY KEY (`Id`,`MonitorId`),
+  KEY `MonitorId` (`MonitorId`),
+  KEY `StartTime` (`StartTime`),
+  KEY `Frames` (`Frames`),
+  KEY `Archived` (`Archived`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
 
 --
@@ -280,32 +218,18 @@ CREATE TABLE `Events_Archived` (
 
 DROP TABLE IF EXISTS `Filters`;
 CREATE TABLE `Filters` (
-  `Id` int(10) unsigned NOT NULL auto_increment,
   `Name` varchar(64) NOT NULL default '',
-  `UserId`  int(10) unsigned,
-  `Query_json` text NOT NULL,
+  `Query` text NOT NULL,
   `AutoArchive` tinyint(3) unsigned NOT NULL default '0',
-  `AutoUnarchive` tinyint(3) unsigned NOT NULL default '0',
   `AutoVideo` tinyint(3) unsigned NOT NULL default '0',
   `AutoUpload` tinyint(3) unsigned NOT NULL default '0',
   `AutoEmail` tinyint(3) unsigned NOT NULL default '0',
-	`EmailTo`				TEXT,
-	`EmailSubject`	TEXT,
-	`EmailBody`			TEXT,
   `AutoMessage` tinyint(3) unsigned NOT NULL default '0',
   `AutoExecute` tinyint(3) unsigned NOT NULL default '0',
   `AutoExecuteCmd` tinytext,
   `AutoDelete` tinyint(3) unsigned NOT NULL default '0',
-  `AutoMove` tinyint(3) unsigned NOT NULL default '0',
-  `AutoMoveTo`	smallint(5) unsigned NOT NULL default 0,
-  `AutoCopy` tinyint(3) unsigned NOT NULL default '0',
-  `AutoCopyTo`	smallint(5) unsigned NOT NULL default 0,
-  `UpdateDiskSpace` tinyint(3) unsigned NOT NULL default '0',
   `Background` tinyint(1) unsigned NOT NULL default '0',
-  `Concurrent` tinyint(1) unsigned NOT NULL default '0',
-  `LockRows` tinyint(1) unsigned NOT NULL default '0',
-  PRIMARY KEY (`Id`),
-  KEY `Name` (`Name`)
+  PRIMARY KEY (`Name`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
 
 --
@@ -314,9 +238,8 @@ CREATE TABLE `Filters` (
 
 DROP TABLE IF EXISTS `Frames`;
 CREATE TABLE `Frames` (
-  `Id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
-  `EventId` BIGINT UNSIGNED NOT NULL default '0',
-  FOREIGN KEY (`EventId`) REFERENCES `Events` (`Id`) ON DELETE CASCADE,
+  `Id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `EventId` int(10) unsigned NOT NULL default '0',
   `FrameId` int(10) unsigned NOT NULL default '0',
   `Type` enum('Normal','Bulk','Alarm') NOT NULL default 'Normal',
   `TimeStamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
@@ -336,35 +259,16 @@ DROP TABLE IF EXISTS `Groups`;
 CREATE TABLE `Groups` (
   `Id` int(10) unsigned NOT NULL auto_increment,
   `Name` varchar(64) NOT NULL default '',
-  `ParentId` int(10) unsigned,
-  FOREIGN KEY (`ParentId`) REFERENCES `Groups` (`Id`) ON DELETE CASCADE,
+  `MonitorIds` tinytext NOT NULL,
   PRIMARY KEY (`Id`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
 
---
--- Table structure for table `Groups_Monitors`
---
-
-DROP TABLE IF EXISTS `Groups_Monitors`;
-CREATE TABLE `Groups_Monitors` (
-    `Id` INT(10) unsigned NOT NULL auto_increment,
-    `GroupId` int(10) unsigned NOT NULL,
-    FOREIGN KEY (`GroupId`) REFERENCES `Groups` (`Id`) ON DELETE CASCADE,
-    `MonitorId` int(10) unsigned NOT NULL,
-    FOREIGN KEY (`MonitorId`) REFERENCES `Monitors` (`Id`) ON DELETE CASCADE,
-    PRIMARY KEY (`Id`)
-) ENGINE=@ZM_MYSQL_ENGINE@;
-
-CREATE INDEX `Groups_Monitors_GroupId_idx` ON `Groups_Monitors` (`GroupId`);
-CREATE INDEX `Groups_Monitors_MonitorId_idx` ON `Groups_Monitors` (`MonitorId`);
-
 --
 -- Table structure for table `Logs`
 --
 
 DROP TABLE IF EXISTS `Logs`;
 CREATE TABLE `Logs` (
-  `Id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `TimeKey` decimal(16,6) NOT NULL,
   `Component` varchar(32) NOT NULL,
   `ServerId` int(10) unsigned,
@@ -374,37 +278,9 @@ CREATE TABLE `Logs` (
   `Message` text NOT NULL,
   `File` varchar(255) DEFAULT NULL,
   `Line` smallint(5) unsigned DEFAULT NULL,
-  PRIMARY KEY (`Id`),
   KEY `TimeKey` (`TimeKey`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
 
-CREATE INDEX `Logs_TimeKey_idx` ON `Logs` (`TimeKey`);
-CREATE INDEX `Logs_Level_idx` ON `Logs` (`Level`);
---
--- Table structure for table `Manufacturers`
---
-
-DROP TABLE IF EXISTS `Manufacturers`;
-CREATE TABLE `Manufacturers` (
-  `Id` int(10) unsigned NOT NULL auto_increment,
-  `Name`  varchar(64) NOT NULL,
-  PRIMARY KEY (`Id`),
-  UNIQUE KEY (`Name`)
-) ENGINE=@ZM_MYSQL_ENGINE@;
-
---
--- Table structure for table `Models`
---
-
-DROP TABLE IF EXISTS `Models`;
-CREATE TABLE `Models` (
-  `Id` int(10) unsigned NOT NULL auto_increment,
-  `Name`  varchar(64) NOT NULL,
-  `ManufacturerId` int(10),
-  PRIMARY KEY (`Id`),
-  UNIQUE KEY (`ManufacturerId`,`Name`)
-) ENGINE=@ZM_MYSQL_ENGINE@;
-
 --
 -- Table structure for table `MonitorPresets`
 --
@@ -413,9 +289,9 @@ DROP TABLE IF EXISTS `MonitorPresets`;
 CREATE TABLE `MonitorPresets` (
   `Id` int(10) unsigned NOT NULL auto_increment,
   `Name` varchar(64) NOT NULL default '',
-  `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket','VNC') NOT NULL default 'Local',
+  `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL') NOT NULL default 'Local',
   `Device` tinytext,
-  `Channel` tinyint(3) unsigned default NULL,
+  `Channel` tinytext,
   `Format` int(10) unsigned default NULL,
   `Protocol` varchar(16) default NULL,
   `Method` varchar(16) default NULL,
@@ -426,7 +302,7 @@ CREATE TABLE `MonitorPresets` (
   `Width` smallint(5) unsigned default NULL,
   `Height` smallint(5) unsigned default NULL,
   `Palette` int(10) unsigned default NULL,
-  `MaxFPS` decimal(5,3) default NULL,
+  `MaxFPS` decimal(5,2) default NULL,
   `Controllable` tinyint(3) unsigned NOT NULL default '0',
   `ControlId` varchar(16) default NULL,
   `ControlDevice` varchar(255) default NULL,
@@ -444,47 +320,34 @@ DROP TABLE IF EXISTS `Monitors`;
 CREATE TABLE `Monitors` (
   `Id` int(10) unsigned NOT NULL auto_increment,
   `Name` varchar(64) NOT NULL default '',
-  `Notes` TEXT,
   `ServerId` int(10) unsigned,
-  `StorageId`	smallint(5) unsigned default 0,
-  `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket','VNC') NOT NULL default 'Local',
+  `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL') NOT NULL default 'Local',
   `Function` enum('None','Monitor','Modect','Record','Mocord','Nodect') NOT NULL default 'Monitor',
   `Enabled` tinyint(3) unsigned NOT NULL default '1',
-  `DecodingEnabled` tinyint(3) unsigned NOT NULL default '1',
   `LinkedMonitors` varchar(255),
   `Triggers` set('X10') NOT NULL default '',
-  `ONVIF_URL` VARCHAR(255) NOT NULL DEFAULT '',
-  `ONVIF_Username` VARCHAR(64) NOT NULL DEFAULT '',
-  `ONVIF_Password` VARCHAR(64) NOT NULL DEFAULT '',
-  `ONVIF_Options` VARCHAR(64) NOT NULL DEFAULT '',
   `Device` tinytext NOT NULL default '',
   `Channel` tinyint(3) unsigned NOT NULL default '0',
   `Format` int(10) unsigned NOT NULL default '0',
   `V4LMultiBuffer`	tinyint(1) unsigned,
   `V4LCapturesPerFrame`	tinyint(3) unsigned,
-  `Protocol` varchar(16),
-  `Method` varchar(16) default '',
+  `Protocol` varchar(16) NOT NULL default '',
+  `Method` varchar(16) NOT NULL default '',
   `Host` varchar(64),
   `Port` varchar(8) NOT NULL default '',
   `SubPath` varchar(64) NOT NULL default '',
   `Path` varchar(255),
-  `SecondPath` varchar(255),
-  `Options` varchar(255),
+  `Options` varchar(255) not null default '',
   `User` varchar(64),
   `Pass` varchar(64),
   `Width` smallint(5) unsigned NOT NULL default '0',
   `Height` smallint(5) unsigned NOT NULL default '0',
   `Colours` tinyint(3) unsigned NOT NULL default '1',
   `Palette` int(10) unsigned NOT NULL default '0',
-  `Orientation` enum('ROTATE_0','ROTATE_90','ROTATE_180','ROTATE_270','FLIP_HORI','FLIP_VERT') NOT NULL default 'ROTATE_0',
+  `Orientation` enum('0','90','180','270','hori','vert') NOT NULL default '0',
   `Deinterlacing` int(10) unsigned NOT NULL default '0',
-  `DecoderHWAccelName`  varchar(64),
-  `DecoderHWAccelDevice`  varchar(255),
   `SaveJPEGs` TINYINT NOT NULL DEFAULT '3' ,
   `VideoWriter` TINYINT NOT NULL DEFAULT '0',
-  `OutputCodec` int(10) unsigned NOT NULL default 0,
-  `Encoder`     varchar(32),
-  `OutputContainer` enum('auto','mp4','mkv'),
   `EncoderParameters` TEXT,
   `RecordAudio` TINYINT NOT NULL DEFAULT '0',
   `RTSPDescribe` tinyint(1) unsigned,
@@ -497,18 +360,16 @@ CREATE TABLE `Monitors` (
   `LabelX` smallint(5) unsigned NOT NULL default '0',
   `LabelY` smallint(5) unsigned NOT NULL default '0',
   `LabelSize` smallint(5) unsigned NOT NULL DEFAULT '1',
-  `ImageBufferCount` smallint(5) unsigned NOT NULL default '3',
-  `MaxImageBufferCount` smallint(5) unsigned NOT NULL default '0',
-  `WarmupCount` smallint(5) unsigned NOT NULL default '0',
+  `ImageBufferCount` smallint(5) unsigned NOT NULL default '100',
+  `WarmupCount` smallint(5) unsigned NOT NULL default '25',
   `PreEventCount` smallint(5) unsigned NOT NULL default '10',
   `PostEventCount` smallint(5) unsigned NOT NULL default '10',
-  `StreamReplayBuffer` int(10) unsigned NOT NULL default '0',
+  `StreamReplayBuffer` int(10) unsigned NOT NULL default '1000',
   `AlarmFrameCount` smallint(5) unsigned NOT NULL default '1',
   `SectionLength` int(10) unsigned NOT NULL default '600',
-  `MinSectionLength` int(10) unsigned NOT NULL default '10',
   `FrameSkip` smallint(5) unsigned NOT NULL default '0',
   `MotionFrameSkip` smallint(5) unsigned NOT NULL default '0',
-  `AnalysisFPSLimit` decimal(5,2) default NULL,
+  `AnalysisFPS` decimal(5,2) default NULL,
   `AnalysisUpdateDelay` smallint(5) unsigned NOT NULL default '0',
   `MaxFPS` decimal(5,2) default NULL,
   `AlarmMaxFPS` decimal(5,2) default NULL,
@@ -524,55 +385,16 @@ CREATE TABLE `Monitors` (
   `TrackDelay` smallint(5) unsigned,
   `ReturnLocation` tinyint(3) NOT NULL default '-1',
   `ReturnDelay` smallint(5) unsigned,
-  `ModectDuringPTZ` tinyint(3) unsigned NOT NULL default '0',
+  `DefaultView` enum('Events','Control') NOT NULL default 'Events',
   `DefaultRate` smallint(5) unsigned NOT NULL default '100',
   `DefaultScale` smallint(5) unsigned NOT NULL default '100',
-  `DefaultCodec` enum('auto','MP4','MJPEG') NOT NULL default 'auto',
-  `SignalCheckPoints` INT UNSIGNED NOT NULL default '0',
   `SignalCheckColour` varchar(32) NOT NULL default '#0000BE',
   `WebColour` varchar(32) NOT NULL default 'red',
   `Exif` tinyint(1) unsigned NOT NULL default '0',
   `Sequence` smallint(5) unsigned default NULL,
-  `ZoneCount` TINYINT NOT NULL DEFAULT 0,
-  `Refresh` int(10) unsigned default NULL,
-  `Latitude`  DECIMAL(10,8),
-  `Longitude`  DECIMAL(11,8),
-  `RTSPServer`  BOOLEAN NOT NULL DEFAULT FALSE,
-  `RTSPStreamName`  varchar(255) NOT NULL default '',
-  `Importance`  enum('Normal','Less','Not') NOT NULL default 'Normal',
   PRIMARY KEY (`Id`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
 
-CREATE INDEX `Monitors_ServerId_idx` ON `Monitors` (`ServerId`);
-
-DROP TABLE IF EXISTS `Monitor_Status`;
-CREATE TABLE `Monitor_Status` (
-  `MonitorId` int(10) unsigned NOT NULL,
-  `Status`  enum('Unknown','NotRunning','Running','Connected','Signal') NOT NULL default 'Unknown',
-  `CaptureFPS`  DECIMAL(10,2) NOT NULL default 0,
-  `AnalysisFPS`  DECIMAL(5,2) NOT NULL default 0,
-  `CaptureBandwidth`  INT NOT NULL default 0,
-  PRIMARY KEY (`MonitorId`)
-) ENGINE=@ZM_MYSQL_ENGINE@;
-
-DROP TABLE IF EXISTS `Event_Summaries`;
-CREATE TABLE `Event_Summaries` (
-  `MonitorId` int(10) unsigned NOT NULL,
-  `TotalEvents` int(10) default NULL,
-  `TotalEventDiskSpace` bigint default NULL,
-  `HourEvents` int(10) default NULL,
-  `HourEventDiskSpace` bigint default NULL,
-  `DayEvents` int(10) default NULL,
-  `DayEventDiskSpace` bigint default NULL,
-  `WeekEvents` int(10) default NULL,
-  `WeekEventDiskSpace` bigint default NULL,
-  `MonthEvents` int(10) default NULL,
-  `MonthEventDiskSpace` bigint default NULL,
-  `ArchivedEvents` int(10) default NULL,
-  `ArchivedEventDiskSpace` bigint default NULL,
-  PRIMARY KEY (`MonitorId`)
-) ENGINE=@ZM_MYSQL_ENGINE@;
-
 --
 -- Table structure for table `States`
 -- PP - Added IsActive to track custom run states
@@ -597,42 +419,20 @@ INSERT INTO States (Name,Definition,IsActive) VALUES ('default','','1');
 DROP TABLE IF EXISTS `Servers`;
 CREATE TABLE `Servers` (
   `Id` int(10) unsigned NOT NULL auto_increment,
-  `Protocol`  TEXT,
   `Hostname` TEXT,
-  `Port`      INTEGER UNSIGNED,
-  `PathToIndex`  TEXT,
-  `PathToZMS`  TEXT,
-  `PathToApi`  TEXT,
   `Name` varchar(64) NOT NULL default '',
   `State_Id`	int(10) unsigned,
-  `Status` enum('Unknown','NotRunning','Running') NOT NULL default 'Unknown',
-  `CpuLoad` DECIMAL(5,1) default NULL,
-  `TotalMem` bigint unsigned default null,
-  `FreeMem` bigint unsigned default null,
-  `TotalSwap` bigint  unsigned default null,
-  `FreeSwap` bigint unsigned default null, 
-  `zmstats`  BOOLEAN NOT NULL DEFAULT FALSE,
-  `zmaudit`  BOOLEAN NOT NULL DEFAULT FALSE,
-  `zmtrigger`  BOOLEAN NOT NULL DEFAULT FALSE,
-  `zmeventnotification`  BOOLEAN NOT NULL DEFAULT FALSE,
   PRIMARY KEY (`Id`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
-
-CREATE INDEX `Servers_Name_idx` ON `Servers` (`Name`);
-
 --
 -- Table structure for table `Stats`
 --
 
 DROP TABLE IF EXISTS `Stats`;
 CREATE TABLE `Stats` (
-  `Id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `MonitorId` int(10) unsigned NOT NULL default '0',
-  FOREIGN KEY (`MonitorId`) REFERENCES `Monitors` (`Id`) ON DELETE CASCADE,
   `ZoneId` int(10) unsigned NOT NULL default '0',
-  FOREIGN KEY (`ZoneId`) REFERENCES `Zones` (`Id`) ON DELETE CASCADE,
-  `EventId` BIGINT UNSIGNED NOT NULL,
-  FOREIGN KEY (`EventId`) REFERENCES `Events` (`Id`) ON DELETE CASCADE,
+  `EventId` int(10) unsigned NOT NULL default '0',
   `FrameId` int(10) unsigned NOT NULL default '0',
   `PixelDiff` tinyint(3) unsigned NOT NULL default '0',
   `AlarmPixels` int(10) unsigned NOT NULL default '0',
@@ -646,7 +446,6 @@ CREATE TABLE `Stats` (
   `MinY` smallint(5) unsigned NOT NULL default '0',
   `MaxY` smallint(5) unsigned NOT NULL default '0',
   `Score` smallint(5) unsigned NOT NULL default '0',
-  PRIMARY KEY (`Id`),
   KEY `EventId` (`EventId`),
   KEY `MonitorId` (`MonitorId`),
   KEY `ZoneId` (`ZoneId`)
@@ -682,13 +481,9 @@ CREATE TABLE `Users` (
   `Monitors` enum('None','View','Edit') NOT NULL default 'None',
   `Groups` enum('None','View','Edit') NOT NULL default 'None',
   `Devices` enum('None','View','Edit') NOT NULL default 'None',
-  `Snapshots` enum('None','View','Edit') NOT NULL default 'None',
   `System` enum('None','View','Edit') NOT NULL default 'None',
   `MaxBandwidth` varchar(16),
-  `MonitorIds` text,
-  `TokenMinExpiry`   BIGINT UNSIGNED NOT NULL DEFAULT 0,
-  `APIEnabled`  tinyint(3) UNSIGNED NOT NULL default 1,
-  `HomeView`  varchar(64) NOT NULL DEFAULT '',
+  `MonitorIds` tinytext,
   PRIMARY KEY (`Id`),
   UNIQUE KEY `UC_Username` (`Username`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
@@ -729,7 +524,6 @@ DROP TABLE IF EXISTS `Zones`;
 CREATE TABLE `Zones` (
   `Id` int(10) unsigned NOT NULL auto_increment,
   `MonitorId` int(10) unsigned NOT NULL default '0',
-  FOREIGN KEY (`MonitorId`) REFERENCES `Monitors` (`Id`) ON DELETE CASCADE,
   `Name` varchar(64) NOT NULL default '',
   `Type` enum('Active','Inclusive','Exclusive','Preclusive','Inactive','Privacy') NOT NULL default 'Active',
   `Units` enum('Pixels','Percent') NOT NULL default 'Pixels',
@@ -756,26 +550,6 @@ CREATE TABLE `Zones` (
   KEY `MonitorId` (`MonitorId`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
 
-DROP TABLE IF EXISTS `Storage`;
-CREATE TABLE `Storage` (
-	`Id`	smallint(5) unsigned NOT NULL auto_increment,
-	`Path`	varchar(64)	NOT NULL default '',
-	`Name`	varchar(64) NOT NULL default '',
-	`Type`	enum('local','s3fs') NOT NULL default 'local',
-  `Url` varchar(255) default NULL,
-  `DiskSpace`   bigint default NULL,
-  `Scheme`   enum('Deep','Medium','Shallow') NOT NULL default 'Medium',
-  `ServerId` int(10) unsigned,
-  `DoDelete`  BOOLEAN NOT NULL DEFAULT true,
-  `Enabled`  BOOLEAN NOT NULL DEFAULT true,
-	PRIMARY KEY (`Id`)
-) ENGINE=@ZM_MYSQL_ENGINE@;
-
---
--- Create a default storage location
---
-insert into Storage VALUES (NULL, '@ZM_DIR_EVENTS@', 'Default', 'local', NULL, NULL, 'Medium', 0, true, true );
-
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
 /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
@@ -791,252 +565,108 @@ insert into Storage VALUES (NULL, '@ZM_DIR_EVENTS@', 'Default', 'local', NULL, N
 --
 -- Create a default admin user.
 --
-INSERT INTO `Users` (
-  `Username`,
-  `Password`,
-  `Language`,
-  `Enabled`,
-  `Stream`,
-  `Events`,
-  `Control`,
-  `Monitors`,
-  `Groups`,
-  `Devices`,
-  `Snapshots`,
-  `System`,
-  `MaxBandwidth`,
-  `MonitorIds`,
-  `TokenMinExpiry`,
-  `APIEnabled`,
-  `HomeView`
-  ) VALUES (
-    'admin',
-    '$2b$12$NHZsm6AM2f2LQVROriz79ul3D6DnmFiZC.ZK5eqbF.ZWfwH9bqUJ6',
-    '' /* Language */,
-    1 /* Enabled */,
-    'View' /* Stream */,
-    'Edit' /* Events */,
-    'Edit' /* Control */,
-    'Edit' /* Monitors */,
-    'Edit' /* Groups */,
-    'Edit' /* Devices */,
-    'Edit' /* Snapshots */,
-    'Edit' /* System */,
-    '' /* Max Bandwidth */,
-    '' /* MonitorIds */,
-    0 /* TokenMinExpiry */,
-    0 /* Api Endabled */,
-    '' /* Homeview */);
+insert into Users VALUES (NULL,'admin',password('admin'),'',1,'View','Edit','Edit','Edit','Edit','Edit','Edit','','');
 
 --
 -- Add a sample filter to purge the oldest 100 events when the disk is 95% full
 --
-
-INSERT INTO `Filters`
-  (
-    `Name`,
-    `Query_json`,
-    `AutoArchive`,
-    `AutoVideo`,
-    `AutoUpload`,
-    `AutoEmail`,
-    `EmailTo`,
-    `EmailSubject`,
-    `EmailBody`,
-    `AutoMessage`,
-    `AutoExecute`,
-    `AutoExecuteCmd`,
-    `AutoDelete`,
-    `AutoMove`,
-    `AutoMoveTo`,
-    `AutoCopy`,
-    `AutoCopyTo`,
-    `UpdateDiskSpace`,
-    `UserId`,
-    `Background`,
-    `Concurrent`
-  )
-  VALUES
-  (
-    'PurgeWhenFull',
-    '{"sort_field":"Id","terms":[{"val":0,"attr":"Archived","op":"="},{"cnj":"and","val":95,"attr":"DiskPercent","op":">="},{"cnj":"and","obr":"0","attr":"EndDateTime","op":"IS NOT","val":"NULL","cbr":"0"}],"limit":100,"sort_asc":1}',
-    0/*AutoArchive*/,
-    0/*AutoVideo*/,
-    0/*AutoUpload*/,
-    0/*AutoEmail*/,
-    ''/*EmailTo*/,
-    ''/*EmailSubject*/,
-    ''/*EmailBody*/,
-    0/*AutoMessage*/,
-    0/*AutoExecute*/,'',
-    1/*AutoDelete*/,
-    0/*AutoMove*/,0/*MoveTo*/,
-    0/*AutoCopy*/,0/*CopyTo*/,
-    0/*UpdateDiskSpace*/,
-    1/*UserId = admin*/,
-    1/*Background*/,
-    0/*Concurrent*/
-  );
-INSERT INTO `Filters`
-  (
-    `Name`,
-    `Query_json`,
-    `AutoArchive`,
-    `AutoVideo`,
-    `AutoUpload`,
-    `AutoEmail`,
-    `EmailTo`,
-    `EmailSubject`,
-    `EmailBody`,
-    `AutoMessage`,
-    `AutoExecute`,
-    `AutoExecuteCmd`,
-    `AutoDelete`,
-    `AutoMove`,
-    `AutoMoveTo`,
-    `AutoCopy`,
-    `AutoCopyTo`,
-    `UpdateDiskSpace`,
-    `UserId`,
-    `Background`,
-    `Concurrent`
-  )
-VALUES (
-  'Update DiskSpace',
-  '{"terms":[{"attr":"DiskSpace","op":"IS","val":"NULL"},{"cnj":"and","obr":"0","attr":"EndDateTime","op":"IS NOT","val":"NULL","cbr":"0"}]}',
-  0/*AutoArchive*/,
-  0/*AutoVideo*/,
-  0/*AutoUpload*/,
-  0/*AutoEmail*/,
-  ''/*EmailTo*/,
-  ''/*EmailSubject*/,
-  ''/*EmailBody*/,
-  0/*AutoMessage*/,
-  0/*AutoExecute*/,'',
-  0/*AutoDelete*/,
-  0/*AutoMove*/,0/*MoveTo*/,
-  0/*AutoCopy*/,0/*CopyTo*/,
-  1/*UpdateDiskSpace*/,
-  1/*UserId=admin*/,
-  1/*Background*/,
-  0/*Concurrent*/
-);
+insert into Filters values ('PurgeWhenFull','{"sort_field":"Id","terms":[{"val":0,"attr":"Archived","op":"="},{"cnj":"and","val":95,"attr":"DiskPercent","op":">="}],"limit":100,"sort_asc":1}',0,0,0,0,0,0,'',1,1);
 
 --
 -- Add in some sample control protocol definitions
 --
-INSERT INTO `Controls` VALUES (NULL,'Pelco-D','Local','PelcoD',1,1,0,0,1,1,0,0,1,NULL,NULL,NULL,NULL,1,0,3,1,1,0,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,20,1,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,63,1,254,1,NULL,NULL,NULL,NULL,1,0,63,1,254,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Pelco-P','Local','PelcoP',1,1,0,0,1,1,0,0,1,NULL,NULL,NULL,NULL,1,0,3,1,1,0,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,20,1,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,63,1,254,1,NULL,NULL,NULL,NULL,1,0,63,1,254,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Sony VISCA','Local','Visca',1,1,0,0,1,0,0,0,1,0,16384,10,4000,1,1,6,1,1,1,0,1,0,1536,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,3,1,1,1,1,0,1,1,0,1,-15578,15578,100,10000,1,1,50,1,254,1,-7789,7789,100,5000,1,1,50,1,254,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Axis API v2','Remote','AxisV2',0,0,0,0,1,0,0,1,0,0,9999,10,2500,0,NULL,NULL,1,1,0,1,0,0,9999,10,2500,0,NULL,NULL,1,1,0,1,0,0,9999,10,2500,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,12,1,1,1,1,1,0,1,0,1,-360,360,1,90,0,NULL,NULL,0,NULL,1,-360,360,1,90,0,NULL,NULL,0,NULL,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Panasonic IP','Remote','PanasonicIP',0,0,0,0,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,8,1,1,1,0,1,0,0,1,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Neu-Fusion NCS370','Remote','Ncs370',0,0,0,0,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,24,1,0,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,0,0);
-INSERT INTO `Controls` VALUES (NULL,'AirLink SkyIPCam 7xx','Remote','SkyIPCam7xx',0,0,1,0,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,8,1,1,1,0,1,0,1,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Pelco-D','Ffmpeg','PelcoD',1,1,0,0,1,1,0,0,1,NULL,NULL,NULL,NULL,1,0,3,1,1,0,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,20,1,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,63,1,254,1,NULL,NULL,NULL,NULL,1,0,63,1,254,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Pelco-P','Ffmpeg','PelcoP',1,1,0,0,1,1,0,0,1,NULL,NULL,NULL,NULL,1,0,3,1,1,0,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,20,1,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,63,1,254,1,NULL,NULL,NULL,NULL,1,0,63,1,254,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Foscam FI8620','Ffmpeg','FI8620_Y2k',0,0,0,0,1,0,0,0,1,1,10,1,10,1,1,63,1,1,0,0,1,1,63,1,63,1,1,63,1,1,0,0,1,0,0,0,0,1,0,255,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,1,0,255,1,8,0,1,1,1,0,0,0,1,1,1,360,1,360,1,1,63,0,0,1,1,90,1,90,1,1,63,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Foscam FI8608W','Ffmpeg','FI8608W_Y2k',1,0,1,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,1,0,255,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,1,0,255,1,8,0,1,1,1,0,0,0,1,1,0,0,0,0,1,1,128,0,0,1,0,0,0,0,1,1,128,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Foscam FI8908W','Remote','FI8908W',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Foscam FI9821W','Ffmpeg','FI9821W_Y2k',1,0,1,0,1,0,0,0,1,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,1,0,100,1,1,0,0,1,0,100,0,100,1,0,100,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,1,0,100,0,100,1,0,100,1,16,0,1,1,1,0,0,0,1,1,0,360,0,360,1,0,4,0,0,1,0,90,0,90,1,0,4,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Loftek Sentinel','Remote','LoftekSentinel',0,0,1,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,255,16,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,6,1,1,0,0,0,1,10,0,1,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Toshiba IK-WB11A','Remote','Toshiba_IK_WB11A',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,10,0,1,1,0,1,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'WanscamPT','Remote','Wanscam',1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,16,0,0,0,0,0,1,16,1,1,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'3S Domo N5071', 'Remote', '3S', 0, 0, 1, 0,1, 0, 1, 1, 0, 0, 9999, 0, 9999, 0, 0, 0, 1, 1, 1, 1, 0, 0, 9999, 20, 9999, 0, 0, 0, 1, 1, 1, 1, 0, 0, 9999, 1, 9999, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 64, 1, 0, 1, 1, 0, 0, 0, 0, 1, -180, 180, 40, 100, 1, 40, 100, 0, 0, 1, -180, 180, 40, 100, 1, 40, 100, 0, 0, 0, 0);
-INSERT INTO `Controls` VALUES (NULL,'ONVIF Camera','Ffmpeg','onvif',0,0,1,1,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,255,16,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,6,1,1,0,0,0,1,10,1,1,1,1,1,0,1,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Foscam 9831W','Ffmpeg','FI9831W',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,16,1,1,1,1,0,0,0,1,1,0,360,0,360,1,0,4,0,0,1,0,90,0,90,0,0,0,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Foscam FI8918W','Ffmpeg','FI8918W',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,8,0,1,1,1,0,0,0,1,1,0,360,0,360,1,0,4,0,0,1,0,90,0,90,1,0,4,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'SunEyes SP-P1802SWPTZ','Libvlc','SPP1802SWPTZ',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,8,0,1,1,0,0,0,0,1,1,0,0,0,0,1,0,64,0,0,1,0,0,0,0,1,0,64,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Wanscam HW0025','Libvlc','WanscamHW0025', 1, 1, 1, 0,1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 16, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 350, 0, 0, 1, 0, 10, 0, 0, 1, 0, 0, 0, 0, 1, 0, 10, 0, 0, 0, 0);
-INSERT INTO `Controls` VALUES (NULL,'IPCC 7210W','Remote','IPCC7210W', 1, 1, 1, 0,1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 16, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-INSERT INTO `Controls` VALUES (NULL,'Vivotek ePTZ','Remote','Vivotek_ePTZ',0,0,1,0,1,0,0,0,1,0,0,0,0,1,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,1,0,0,0,0,1,0,5,0,0,1,0,0,0,0,1,0,5,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Netcat ONVIF','Ffmpeg','Netcat',0,0,1,0,1,0,0,0,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,100,5,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0,100,5,5,0,0,0,1,255,1,1,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Keekoon','Remote','Keekoon', 0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 6, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-INSERT INTO `Controls` VALUES (NULL,'HikVision','Local','',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,20,1,1,1,1,0,0,0,1,1,0,0,0,0,1,1,100,0,0,1,0,0,0,0,1,1,100,1,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Maginon Supra IPC','cURL','MaginonIPC',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,4,0,1,1,1,0,0,1,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Floureon 1080P','Ffmpeg','Floureon',0,0,0,0,1,0,0,0,1,1,18,1,1,0,0,0,1,1,0,0,1,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,20,0,1,1,1,0,0,0,1,1,0,0,0,0,1,1,8,0,0,1,0,0,0,0,1,1,8,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Reolink RLC-423','Ffmpeg','Reolink',0,0,1,0,1,0,0,0,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,64,1,1,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Reolink RLC-411','Ffmpeg','Reolink',0,0,1,0,1,0,0,0,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Reolink RLC-420','Ffmpeg','Reolink',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'D-LINK DCS-3415','Remote','DCS3415',0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'D-Link DCS-5020L','Remote','DCS5020L',1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,24,1,0,1,1,1,0,1,0,1,0,0,1,30,0,0,0,0,0,1,0,0,1,30,0,0,0,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'IOS Camera','Ffmpeg','IPCAMIOS',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,1,0,1,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Dericam P2','Ffmpeg','DericamP2',0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,10,0,1,1,1,0,0,0,1,1,0,0,0,0,1,1,45,0,0,1,0,0,0,0,1,1,45,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Trendnet','Remote','Trendnet',1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'PSIA','Remote','PSIA',0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,20,0,1,1,1,0,0,1,0,1,0,0,0,0,1,-100,100,0,0,1,0,0,0,0,1,-100,100,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Dahua','Ffmpeg','Dahua',0,0,1,1,1,0,0,1,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,20,1,1,1,1,0,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'FOSCAMR2C','Libvlc','FOSCAMR2C',1,1,1,0,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,12,0,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,4,0,NULL,1,NULL,NULL,NULL,NULL,1,0,4,0,NULL,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Amcrest HTTP API','Ffmpeg','Amcrest_HTTP',0,0,1,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,5,0,0,1,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,5);
+INSERT INTO Controls VALUES (NULL,'Pelco-D','Local','PelcoD',1,1,0,1,1,0,0,1,NULL,NULL,NULL,NULL,1,0,3,1,1,0,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,20,1,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,63,1,254,1,NULL,NULL,NULL,NULL,1,0,63,1,254,0,0);
+INSERT INTO Controls VALUES (NULL,'Pelco-P','Local','PelcoP',1,1,0,1,1,0,0,1,NULL,NULL,NULL,NULL,1,0,3,1,1,0,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,20,1,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,63,1,254,1,NULL,NULL,NULL,NULL,1,0,63,1,254,0,0);
+INSERT INTO Controls VALUES (NULL,'Sony VISCA','Local','Visca',1,1,0,1,0,0,0,1,0,16384,10,4000,1,1,6,1,1,1,0,1,0,1536,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,3,1,1,1,1,0,1,1,0,1,-15578,15578,100,10000,1,1,50,1,254,1,-7789,7789,100,5000,1,1,50,1,254,0,0);
+INSERT INTO Controls VALUES (NULL,'Axis API v2','Remote','AxisV2',0,0,0,1,0,0,1,0,0,9999,10,2500,0,NULL,NULL,1,1,0,1,0,0,9999,10,2500,0,NULL,NULL,1,1,0,1,0,0,9999,10,2500,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,12,1,1,1,1,1,0,1,0,1,-360,360,1,90,0,NULL,NULL,0,NULL,1,-360,360,1,90,0,NULL,NULL,0,NULL,0,0);
+INSERT INTO Controls VALUES (NULL,'Panasonic IP','Remote','PanasonicIP',0,0,0,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,8,1,1,1,0,1,0,0,1,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,0,0);
+INSERT INTO Controls VALUES (NULL,'Neu-Fusion NCS370','Remote','Ncs370',0,0,0,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,24,1,0,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,0,0);
+INSERT INTO Controls VALUES (NULL,'AirLink SkyIPCam 7xx','Remote','SkyIPCam7xx',0,0,1,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,8,1,1,1,0,1,0,1,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,0,0);
+INSERT INTO Controls VALUES (NULL,'Pelco-D','Ffmpeg','PelcoD',1,1,0,1,1,0,0,1,NULL,NULL,NULL,NULL,1,0,3,1,1,0,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,20,1,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,63,1,254,1,NULL,NULL,NULL,NULL,1,0,63,1,254,0,0);
+INSERT INTO Controls VALUES (NULL,'Pelco-P','Ffmpeg','PelcoP',1,1,0,1,1,0,0,1,NULL,NULL,NULL,NULL,1,0,3,1,1,0,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,20,1,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,63,1,254,1,NULL,NULL,NULL,NULL,1,0,63,1,254,0,0);
+INSERT INTO Controls VALUES (NULL,'Foscam FI8620','Ffmpeg','FI8620_Y2k',0,0,0,1,0,0,0,1,1,10,1,10,1,1,63,1,1,0,0,1,1,63,1,63,1,1,63,1,1,0,0,1,0,0,0,0,1,0,255,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,1,0,255,1,8,0,1,1,1,0,0,0,1,1,1,360,1,360,1,1,63,0,0,1,1,90,1,90,1,1,63,0,0,0,0);
+INSERT INTO Controls VALUES (NULL,'Foscam FI8608W','Ffmpeg','FI8608W_Y2k',1,0,1,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,1,0,255,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,1,0,255,1,8,0,1,1,1,0,0,0,1,1,0,0,0,0,1,1,128,0,0,1,0,0,0,0,1,1,128,0,0,0,0);
+INSERT INTO Controls VALUES (NULL,'Foscam FI8908W','Remote','FI8908W',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO Controls VALUES (NULL,'Foscam FI9821W','Ffmpeg','FI9821W_Y2k',1,0,1,1,0,0,0,1,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,1,0,100,1,1,0,0,1,0,100,0,100,1,0,100,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,1,0,100,0,100,1,0,100,1,16,0,1,1,1,0,0,0,1,1,0,360,0,360,1,0,4,0,0,1,0,90,0,90,1,0,4,0,0,0,0);
+INSERT INTO Controls VALUES (NULL,'Loftek Sentinel','Remote','LoftekSentinel',0,0,1,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,255,16,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,6,1,1,0,0,0,1,10,0,1,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO Controls VALUES (NULL,'Toshiba IK-WB11A','Remote','Toshiba_IK_WB11A',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,10,0,1,1,0,1,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO Controls VALUES (NULL,'WanscamPT','Remote','Wanscam',1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,16,0,0,0,0,0,1,16,1,1,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO Controls VALUES (NULL,'3S Domo N5071', 'Remote', '3S', 0, 0, 1, 1, 0, 1, 1, 0, 0, 9999, 0, 9999, 0, 0, 0, 1, 1, 1, 1, 0, 0, 9999, 20, 9999, 0, 0, 0, 1, 1, 1, 1, 0, 0, 9999, 1, 9999, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 64, 1, 0, 1, 1, 0, 0, 0, 0, 1, -180, 180, 40, 100, 1, 40, 100, 0, 0, 1, -180, 180, 40, 100, 1, 40, 100, 0, 0, 0, 0);
+INSERT INTO Controls VALUES (NULL,'ONVIF Camera','Ffmpeg','onvif',0,0,1,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,255,16,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,6,1,1,0,0,0,1,10,0,1,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Foscam 9831W','Ffmpeg','FI9831W',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,16,1,1,1,1,0,0,0,1,1,0,360,0,360,1,0,4,0,0,1,0,90,0,90,0,0,0,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Foscam FI8918W','Ffmpeg','FI8918W',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,8,0,1,1,1,0,0,0,1,1,0,360,0,360,1,0,4,0,0,1,0,90,0,90,1,0,4,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'SunEyes SP-P1802SWPTZ','Libvlc','SPP1802SWPTZ',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,8,0,1,1,0,0,0,0,1,1,0,0,0,0,1,0,64,0,0,1,0,0,0,0,1,0,64,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Wanscam HW0025','Libvlc','WanscamHW0025', 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 16, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 350, 0, 0, 1, 0, 10, 0, 0, 1, 0, 0, 0, 0, 1, 0, 10, 0, 0, 0, 0);
+INSERT INTO `Controls` VALUES (NULL,'IPCC 7210W','Libvlc','IPCC7210W', 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 16, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 350, 0, 0, 1, 0, 10, 0, 0, 1, 0, 0, 0, 0, 1, 0, 10, 0, 0, 0, 0);
+INSERT INTO `Controls` VALUES (NULL,'Vivotek ePTZ','Remote','Vivotek_ePTZ',0,0,1,1,0,0,0,1,0,0,0,0,1,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,1,0,0,0,0,1,0,5,0,0,1,0,0,0,0,1,0,5,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Netcat ONVIF','Ffmpeg','Netcat',0,0,1,1,0,0,0,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,100,5,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0,100,5,5,0,0,0,1,255,1,1,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Keekoon','Remote','Keekoon', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 6, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+INSERT INTO `Controls` VALUES (NULL,'HikVision','Local','',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,20,1,1,1,1,0,0,0,1,1,0,0,0,0,1,1,100,0,0,1,0,0,0,0,1,1,100,1,0,0,0);
 
 --
 -- Add some monitor preset values
 --
-
-INSERT into MonitorPresets VALUES (NULL,'Amcrest, IP8M-T2499EW 640x480, RTP/RTSP','Ffmpeg','rtsp',0,255,'rtsp','rtpRtsp','NULL',554,'rtsp://<username>:<password>@<ip-address>/cam/realmonitor?channel=1&subtype=1',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT into MonitorPresets VALUES (NULL,'Amcrest, IP8M-T2499EW 3840x2160, RTP/RTSP','Ffmpeg','rtsp',0,255,'rtsp','rtpRtsp','NULL',554,'rtsp://<username>:<password>@<ip-address>/cam/realmonitor?channel=1&subtype=0',NULL,3840,2160,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 320x240, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 320x240, mpjpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240&req_fps=5',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 320x240, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 320x240, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 640x480, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 640x480, mpjpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480&req_fps=5',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 640x480, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 640x480, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 320x240, mpjpeg, B&W','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240&color=0',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 640x480, mpjpeg, B&W','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480&color=0',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 320x240, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240',NULL,320,240,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 320x240, mpjpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240&req_fps=5',NULL,320,240,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 320x240, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 320x240, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,5.0,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 640x480, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480',NULL,640,480,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 640x480, mpjpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480&req_fps=5',NULL,640,480,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 640x480, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 640x480, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,5.0,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT into MonitorPresets VALUES (NULL,'Axis IP, mpeg4, unicast','Remote','rtsp',0,255,'rtsp','rtpUni','<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT into MonitorPresets VALUES (NULL,'Axis IP, mpeg4, multicast','Remote','rtsp',0,255,'rtsp','rtpMulti','<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT into MonitorPresets VALUES (NULL,'Axis IP, mpeg4, RTP/RTSP','Remote','rtsp',0,255,'rtsp','rtpRtsp','<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 320x240, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 320x240, mpjpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240&req_fps=5',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 320x240, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 320x240, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 640x480, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 640x480, mpjpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480&req_fps=5',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 640x480, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 640x480, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 320x240, mpjpeg, B&W','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240&color=0',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 640x480, mpjpeg, B&W','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480&color=0',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 320x240, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240',NULL,320,240,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 320x240, mpjpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240&req_fps=5',NULL,320,240,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 320x240, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 320x240, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,5.0,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 640x480, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480',NULL,640,480,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 640x480, mpjpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480&req_fps=5',NULL,640,480,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 640x480, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 640x480, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,5.0,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT into MonitorPresets VALUES (NULL,'Axis IP, mpeg4, unicast','Remote','rtsp','rtpUni',NULL,NULL,NULL,'<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT into MonitorPresets VALUES (NULL,'Axis IP, mpeg4, multicast','Remote','rtsp','rtpMulti',NULL,NULL,NULL,'<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT into MonitorPresets VALUES (NULL,'Axis IP, mpeg4, RTP/RTSP','Remote','rtsp','rtpRtsp',NULL,NULL,NULL,'<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
 INSERT into MonitorPresets VALUES (NULL,'Axis IP, mpeg4, RTP/RTSP/HTTP','Remote',NULL,NULL,NULL,'rtsp','rtpRtspHttp','<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'D-link DCS-930L, 640x480, mjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/mjpeg.cgi',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'D-Link DCS-5020L, 640x480, mjpeg','Remote','http',0,0,'http','simple','<username>:<pwd>@<ip-address>','80','/video.cgi',NULL,640,480,0,NULL,1,'34',NULL,'<username>:<pwd>@<ip-address>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 320x240, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/nphMotionJpeg?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 320x240, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 320x240, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 640x480, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/nphMotionJpeg?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 640x480, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 640x480, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 320x240, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/nphMotionJpeg?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 320x240, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 320x240, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,5.0,1,5,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 640x480, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/nphMotionJpeg?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 640x480, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 640x480, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,5.0,1,5,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Gadspot IP, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Gadspot IP, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Gadspot IP, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/GetData.cgi',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Gadspot IP, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'IP Webcam by Pavel Khlebovich 1920x1080','Remote','/dev/video<?>','0',255,'http','simple','<ip-address>','8080','/video','',1920,1080,0,NULL,0,'0','','',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'VEO Observer, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Blue Net Video Server, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/cgi-bin/image.cgi?control=0&id=admin&passwd=admin',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 320x240, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/nphMotionJpeg?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 320x240, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 320x240, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 640x480, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/nphMotionJpeg?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 640x480, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 640x480, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 320x240, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/nphMotionJpeg?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 320x240, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 320x240, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,5.0,1,5,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 640x480, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/nphMotionJpeg?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 640x480, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 640x480, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,5.0,1,5,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Gadspot IP, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Gadspot IP, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Gadspot IP, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/GetData.cgi',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Gadspot IP, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'VEO Observer, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Blue Net Video Server, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/cgi-bin/image.cgi?control=0&id=admin&passwd=admin',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
 INSERT into MonitorPresets VALUES (NULL,'ACTi IP, mpeg4, unicast','Remote',NULL,NULL,NULL,'rtsp','rtpUni','<ip-address>',7070,'','/track',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Axis FFMPEG H.264','Ffmpeg',NULL,NULL,NULL,NULL,NULL,'rtsp://<host/address>/axis-media/media.amp?videocodec=h264',NULL,NULL,NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Vivotek FFMPEG','Ffmpeg',NULL,NULL,NULL,NULL,NULL,'rtsp://<host/address>:554/live.sdp',NULL,NULL,NULL,352,240,NULL,NULL,0,NULL,NULL,NULL,100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Axis FFMPEG','Ffmpeg',NULL,NULL,NULL,NULL,NULL,'rtsp://<host/address>/axis-media/media.amp',NULL,NULL,NULL,640,480,NULL,NULL,0,NULL,NULL,NULL,100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'ACTi TCM FFMPEG','Ffmpeg',NULL,NULL,NULL,NULL,NULL,'rtsp://admin:123456@<host/address>:7070',NULL,NULL,NULL,320,240,NULL,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), PAL, 320x240','Local','/dev/video<?>',0,255,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), PAL, 320x240, max 5 FPS','Local','/dev/video<?>',0,255,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), PAL, 640x480','Local','/dev/video<?>',0,255,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), PAL, 640x480, max 5 FPS','Local','/dev/video<?>',0,255,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), NTSC, 320x240','Local','/dev/video<?>',0,45056,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), NTSC, 320x240, max 5 FPS','Local','/dev/video<?>',0,45056,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), NTSC, 640x480','Local','/dev/video<?>',0,45056,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), NTSC, 640x480, max 5 FPS','Local','/dev/video<?>',0,45056,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), PAL, 320x240','Local','/dev/video<?>',0,0,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), PAL, 320x240, max 5 FPS','Local','/dev/video<?>',0,0,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), PAL, 640x480','Local','/dev/video<?>',0,0,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), PAL, 640x480, max 5 FPS','Local','/dev/video<?>',0,0,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), NTSC, 320x240','Local','/dev/video<?>',0,1,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), NTSC, 320x240, max 5 FPS','Local','/dev/video<?>',0,1,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), NTSC, 640x480','Local','/dev/video<?>',0,1,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), NTSC, 640x480, max 5 FPS','Local','/dev/video<?>',0,1,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), PAL, 320x240','Local','/dev/video<?>','<?>',255,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), PAL, 320x240, max 5 FPS','Local','/dev/video<?>','<?>',255,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), PAL, 640x480','Local','/dev/video<?>','<?>',255,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), PAL, 640x480, max 5 FPS','Local','/dev/video<?>','<?>',255,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), NTSC, 320x240','Local','/dev/video<?>','<?>',45056,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), NTSC, 320x240, max 5 FPS','Local','/dev/video<?>','<?>',45056,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), NTSC, 640x480','Local','/dev/video<?>','<?>',45056,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), NTSC, 640x480, max 5 FPS','Local','/dev/video<?>','<?>',45056,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), PAL, 320x240','Local','/dev/video<?>','<?>',0,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), PAL, 320x240, max 5 FPS','Local','/dev/video<?>','<?>',0,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), PAL, 640x480','Local','/dev/video<?>','<?>',0,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), PAL, 640x480, max 5 FPS','Local','/dev/video<?>','<?>',0,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), NTSC, 320x240','Local','/dev/video<?>','<?>',1,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), NTSC, 320x240, max 5 FPS','Local','/dev/video<?>','<?>',1,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), NTSC, 640x480','Local','/dev/video<?>','<?>',1,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), NTSC, 640x480, max 5 FPS','Local','/dev/video<?>','<?>',1,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,5.0,0,NULL,NULL,NULL,100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Remote ZoneMinder','Remote',NULL,NULL,NULL,'http','simple','<ip-address>',80,'/cgi-bin/nph-zms?mode=jpeg&monitor=<monitor-id>&scale=100&maxfps=5&buffer=0',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Foscam FI8620 FFMPEG H.264','Ffmpeg',NULL,NULL,NULL,NULL,'','','','rtsp://<username>:<pwd>@<ip-address>:554/11',NULL,704,576,0,NULL,1,'10','<admin_pwd>','<ip-address>',100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Foscam FI8608W FFMPEG H.264','Ffmpeg',NULL,NULL,NULL,NULL,'','','','rtsp://<username>:<pwd>@<ip-address>:554/11',NULL,640,480,0,NULL,1,'11','<admin_pwd>','<ip-address>',100,100);
@@ -1044,8 +674,8 @@ INSERT INTO MonitorPresets VALUES (NULL,'Foscam FI9821W FFMPEG H.264','Ffmpeg',N
 INSERT INTO MonitorPresets VALUES (NULL,'Loftek Sentinel PTZ, 640x480, mjpeg','Remote','http',0,0,NULL,NULL,'<ip-address>','80','/videostream.cgi?user=<username>&pwd=<password>&resolution=32&rate=11',NULL,640,480,4,NULL,1,'13','','<username>:<pwd>@<ip-address>',100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Airlink 777W PTZ, 640x480, mjpeg','Remote','http',0,0,NULL,NULL,'<username>:<password>@<ip-address>','80','/cgi/mjpg/mjpg.cgi',NULL,640,480,4,NULL,1,'7','','<username>:<pwd>@<ip-address>',100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'SunEyes SP-P1802SWPTZ','Libvlc','/dev/video<?>','0',255,'','rtpMulti','','80','rtsp://<ip-address>:554/11','',1920,1080,0,0.00,1,'16','-speed=64','<ip-address>:<port>',100,33);
-INSERT INTO MonitorPresets VALUES (NULL,'Qihan IP, 1280x720, RTP/RTSP','Ffmpeg','rtsp',0,255,'rtsp','rtpRtsp',NULL,554,'rtsp://<ip-address>/tcp_live/ch0_0',NULL,1280,720,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Qihan IP, 1920x1080, RTP/RTSP','Ffmpeg','rtsp',0,255,'rtsp','rtpRtsp',NULL,554,'rtsp://<ip-address>/tcp_live/ch0_0',NULL,1920,1080,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Qihan IP, 1280x720, RTP/RTSP','Ffmpeg','rtsp','rtpRtsp',255,'rtsp','rtpRtsp',NULL,554,'rtsp://<ip-address>/tcp_live/ch0_0',NULL,1280,720,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Qihan IP, 1920x1080, RTP/RTSP','Ffmpeg','rtsp','rtpRtsp',255,'rtsp','rtpRtsp',NULL,554,'rtsp://<ip-address>/tcp_live/ch0_0',NULL,1920,1080,3,NULL,0,NULL,NULL,NULL,100,100);
 
 --
 -- Add some zone preset values
@@ -1058,63 +688,6 @@ INSERT INTO ZonePresets VALUES (5,'Best, low sensitivity','Active','Percent','Bl
 INSERT INTO ZonePresets VALUES (6,'Best, medium sensitivity','Active','Percent','Blobs',40,NULL,16,NULL,5,5,12,NULL,10,NULL,1,NULL,0,0);
 INSERT INTO ZonePresets VALUES (7,'Best, high sensitivity','Active','Percent','Blobs',20,NULL,8,NULL,3,3,6,NULL,5,NULL,1,NULL,0,0);
 
-DROP TABLE IF EXISTS Maps;
-
-CREATE TABLE Maps (
-  `Id` int(10) unsigned NOT NULL auto_increment,
-  `Name`      VARCHAR(64) NOT NULL,
-  `Filename`  VARCHAR(64) NOT NULL default '',
-  `NumCoords` tinyint(3) unsigned NOT NULL default '0',
-  `Coords` tinytext NOT NULL,
-  `ParentId`   int(1) unsigned,
-  PRIMARY KEY (`Id`)
-);
-
-DROP TABLE IF EXISTS MontageLayouts;
-
-CREATE TABLE MontageLayouts (
-  `Id` int(10) unsigned NOT NULL auto_increment,
-  `Name`    TEXT  NOT NULL,
-  `Positions` LONGTEXT,
-  /*`Positions` JSON,*/
-  PRIMARY KEY (`Id`)
-);
-
-INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('Freeform', '{ "default":{"float":"left","left":"0px","right":"0px","top":"0px","bottom":"0px"} }' );
-INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('2 Wide', '{ "default":{"float":"left", "width":"49%","left":"0px","right":"0px","top":"0px","bottom":"0px"} }' );
-INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('3 Wide', '{ "default":{"float":"left", "width":"33%","left":"0px","right":"0px","top":"0px","bottom":"0px"} }' );
-INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('4 Wide', '{ "default":{"float":"left", "width":"24.5%","left":"0px","right":"0px","top":"0px","bottom":"0px"} }' );
-INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('5 Wide', '{ "default":{"float":"left", "width":"19%","left":"0px","right":"0px","top":"0px","bottom":"0px"} }' );
-
-CREATE TABLE Sessions (
-  id char(32) not null,
-  access INT(10) UNSIGNED DEFAULT NULL,
-  data text,
-  PRIMARY KEY(id)
-) ENGINE=InnoDB;
-
-CREATE TABLE Snapshots (
-  `Id` int(10) unsigned NOT NULL auto_increment,
-  `Name`  VARCHAR(64),
-  `Description` TEXT,
-  `CreatedBy`   int(10),
-  `CreatedOn`   datetime default NULL,
-  PRIMARY KEY(Id)
-) ENGINE=InnoDB;
-
-CREATE TABLE Snapshot_Events (
-  `Id` int(10) unsigned NOT NULL auto_increment,
-  `SnapshotId` int(10) unsigned NOT NULL,
-  FOREIGN KEY (`SnapshotId`) REFERENCES `Snapshots` (`Id`) ON DELETE CASCADE,
-  `EventId`    bigint unsigned NOT NULL,
-  FOREIGN KEY (`EventId`) REFERENCES `Events` (`Id`) ON DELETE CASCADE,
-  KEY `Snapshot_Events_SnapshotId_idx` (`SnapshotId`),
-  PRIMARY KEY(Id)
-) ENGINE=InnoDB;
-
-
--- We generally don't alter triggers, we drop and re-create them, so let's keep them in a separate file that we can just source in update scripts.
-source @PKGDATADIR@/db/triggers.sql
 --
 -- Apply the initial configuration
 --

db/zm_update-1.27.99.0.sql

@@ -0,0 +1,206 @@
+--
+-- This updates a 1.27.0 database to 1.27.1
+--
+
+--
+-- Add Controls definition for Wanscam
+--
+INSERT INTO Controls 
+SELECT * FROM (SELECT NULL as Id,
+                     'WanscamPT' as Name,
+                     'Remote' as Type,
+                     'Wanscam' as Protocol,
+                     1 as CanWake,
+                     1 as CanSleep,
+                     1 as CanReset,
+                     0 as CanZoom,
+                     0 as CanAutoZoom,
+                     0 as CanZoomAbs,
+                     0 as CanZoomRel,
+                     0 as CanZoomCon,
+                     0 as MinZoomRange,
+                     0 as MaxZoomRange,
+                     0 as MinZoomStep,
+                     0 as MaxZoomStep,
+                     0 as HasZoomSpeed,
+                     0 as MinZoomSpeed,
+                     0 as MaxZoomSpeed,
+                     0 as CanFocus,
+                     0 as CanAutoFocus,
+                     0 as CanFocusAbs,
+                     0 as CanFocusRel,
+                     0 as CanFocusCon,
+                     0 as MinFocusRange,
+                     0 as MaxFocusRange,
+                     0 as MinFocusStep,
+                     0 as MaxFocusStep,
+                     0 as HasFocusSpeed,
+                     0 as MinFocusSpeed,
+                     0 as MaxFocusSpeed,
+                     1 as CanIris,
+                     0 as CanAutoIris,
+                     1 as CanIrisAbs,
+                     0 as CanIrisRel,
+                     0 as CanIrisCon,
+                     0 as MinIrisRange,
+                     16 as MaxIrisRange,
+                     0 as MinIrisStep,
+                     0 as MaxIrisStep,
+                     0 as HasIrisSpeed,
+                     0 as MinIrisSpeed,
+                     0 as MaxIrisSpeed,
+                     0 as CanGain,
+                     0 as CanAutoGain,
+                     0 as CanGainAbs,
+                     0 as CanGainRel,
+                     0 as CanGainCon,
+                     0 as MinGainRange,
+                     0 as MaxGainRange,
+                     0 as MinGainStep,
+                     0 as MaxGainStep,
+                     0 as HasGainSpeed,
+                     0 as MinGainSpeed,
+                     0 as MaxGainSpeed,
+                     1 as CanWhite,
+                     0 as CanAutoWhite,
+                     1 as CanWhiteAbs,
+                     0 as CanWhiteRel,
+                     0 as CanWhiteCon,
+                     0 as MinWhiteRange,
+                     16 as MaxWhiteRange,
+                     0 as MinWhiteStep,
+                     0 as MaxWhiteStep,
+                     0 as HasWhiteSpeed,
+                     0 as MinWhiteSpeed,
+                     0 as MaxWhiteSpeed,
+                     1 as HasPresets,
+                     16 as NumPresets,
+                     1 as HasHomePreset,
+                     1 as CanSetPresets,
+                     1 as CanMove,
+                     1 as CanMoveDiag,
+                     0 as CanMoveMap,
+                     0 as CanMoveAbs,
+                     0 as CanMoveRel,
+                     1 as CanMoveCon,
+                     1 as CanPan,
+                     0 as MinPanRange,
+                     0 as MaxPanRange,
+                     0 as MinPanStep,
+                     0 as MaxPanStep,
+                     0 as HasPanSpeed,
+                     0 as MinPanSpeed,
+                     0 as MaxPanSpeed,
+                     0 as HasTurboPan,
+                     0 as TurboPanSpeed,
+                     1 as CanTilt,
+                     0 as MinTiltRange,
+                     0 as MaxTiltRange,
+                     0 as MinTiltStep,
+                     0 as MaxTiltStep,
+                     0 as HasTiltSpeed,
+                     0 as MinTiltSpeed,
+                     0 as MaxTiltSpeed,
+                     0 as HasTurboTilt,
+                     0 as TurboTiltSpeed,
+                     0 as CanAutoScan,
+                     0 as NumScanPaths) AS tmp
+WHERE NOT EXISTS (
+    SELECT Name FROM Controls WHERE name = 'WanscamPT'
+) LIMIT 1;
+
+-- Add extend alarm frame count to zone definition and Presets
+SET @s = (SELECT IF(
+	(SELECT COUNT(*)
+	FROM INFORMATION_SCHEMA.COLUMNS
+	WHERE table_name = 'Zones'
+	AND table_schema = DATABASE()
+	AND column_name = 'ExtendAlarmFrames'
+	) > 0,
+"SELECT 'Column ExtendAlarmFrames exists in Zones'",
+"ALTER TABLE `Zones` ADD `ExtendAlarmFrames` smallint(5) unsigned not null default 0 AFTER `OverloadFrames`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+	(SELECT COUNT(*)
+	FROM INFORMATION_SCHEMA.COLUMNS
+	WHERE table_name = 'ZonePresets'
+	AND table_schema = DATABASE()
+	AND column_name = 'ExtendAlarmFrames'
+	) > 0,
+"SELECT 'Column ExtendAlarmFrames exists in ZonePresets'",
+"ALTER TABLE `ZonePresets` ADD `ExtendAlarmFrames` smallint(5) unsigned not null default 0 AFTER `OverloadFrames`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+--
+-- Add MotionSkipFrame field for controlling how many frames motion detection should skip.
+--
+
+SET @s = (SELECT IF(
+	(SELECT COUNT(*)
+	FROM INFORMATION_SCHEMA.COLUMNS
+	WHERE table_name = 'Monitors'
+	AND table_schema = DATABASE()
+	AND column_name = 'MotionFrameSkip'
+	) > 0,
+"SELECT 1",
+"ALTER TABLE `Monitors` ADD `MotionFrameSkip` smallint(5) unsigned NOT NULL default '0' AFTER `FrameSkip`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+--
+-- Add Monitor Options field; used for specifying Ffmpeg AVoptions like rtsp_transport http or libVLC options
+--
+SET @s = (SELECT IF(
+	(SELECT COUNT(*)
+	FROM INFORMATION_SCHEMA.COLUMNS
+	WHERE table_name = 'Monitors'
+	AND table_schema = DATABASE()
+	AND column_name = 'Options'
+	) > 0,
+"SELECT 'Column Options already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `Options` varchar(255) not null default '' AFTER `Path`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+--
+-- Add V4LMultiBuffer and V4LCapturesPerFrame to Monitor
+--
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*)
+    FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE table_name = 'Monitors'
+    AND table_schema = DATABASE()
+    AND column_name = 'V4LMultiBuffer'
+    ) > 0,
+"SELECT 'Column V4LMultiBuffer exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `V4LMultiBuffer` tinyint(1) unsigned AFTER `Format`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*)
+    FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE table_name = 'Monitors'
+    AND table_schema = DATABASE()
+    AND column_name = 'V4LCapturesPerFrame'
+    ) > 0,
+"SELECT 'Column V4LCapturesPerFrame exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `V4LCapturesPerFrame` tinyint(3) unsigned AFTER `V4LMultiBuffer`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;

db/zm_update-1.28.110.sql

@@ -2,6 +2,10 @@
 -- This updates a 1.28.109 database to 1.28.110
 --
 
+--
+-- Update Frame table to have a PrimaryKey of ID, insetad of a Composite Primary Key
+-- Used primarially for compatibility with CakePHP
+--
 SET @s = (SELECT IF(
 	(SELECT COUNT(*)
 	FROM INFORMATION_SCHEMA.COLUMNS

db/zm_update-1.28.99.sql

@@ -7,150 +7,322 @@
 -- Add Controls definition for FI9831W
 -- Add Controls definition for FI8918W
 --
-SET @s = (SELECT IF( (SELECT COUNT(*) FROM Controls WHERE Name='ONVIF Camera') > 0,
-"SELECT 'ONVIF Camera Control already exists in Controls'",
-"INSERT INTO Controls (
-  Name,Type,Protocol,
-  CanWake,CanSleep,CanReset,
-  CanZoom,CanAutoZoom, CanZoomAbs,CanZoomRel,CanZoomCon,
-  MinZoomRange, MaxZoomRange, MinZoomStep,MaxZoomStep,HasZoomSpeed,MinZoomSpeed,MaxZoomSpeed,
-  CanFocus,CanAutoFocus,CanFocusAbs,CanFocusRel,CanFocusCon,
-  MinFocusRange,MaxFocusRange,MinFocusStep,MaxFocusStep,HasFocusSpeed,MinFocusSpeed,MaxFocusSpeed,
-  CanIris,CanAutoIris,CanIrisAbs,CanIrisRel,CanIrisCon,
-  MinIrisRange, MaxIrisRange, MinIrisStep, MaxIrisStep,HasIrisSpeed,MinIrisSpeed,MaxIrisSpeed,
-  CanGain,CanAutoGain, CanGainAbs,CanGainRel, CanGainCon,
-  MinGainRange,MaxGainRange,  MinGainStep, MaxGainStep, HasGainSpeed, MinGainSpeed,  MaxGainSpeed,
-  CanWhite, CanAutoWhite, CanWhiteAbs, CanWhiteRel, CanWhiteCon,
-  MinWhiteRange, MaxWhiteRange, MinWhiteStep, MaxWhiteStep, HasWhiteSpeed,MinWhiteSpeed,MaxWhiteSpeed,
-  HasPresets,  NumPresets, HasHomePreset, CanSetPresets,
-  CanMove,  CanMoveDiag, CanMoveMap, CanMoveAbs, CanMoveRel, CanMoveCon,
-  CanPan, MinPanRange, MaxPanRange, MinPanStep, MaxPanStep,
-  HasPanSpeed,MinPanSpeed,MaxPanSpeed,HasTurboPan,TurboPanSpeed,CanTilt, MinTiltRange,MaxTiltRange, MinTiltStep,MaxTiltStep,
-  HasTiltSpeed,MinTiltSpeed,MaxTiltSpeed, HasTurboTilt,TurboTiltSpeed,
-  CanAutoScan,NumScanPaths)
-  VALUES
-  ('ONVIF Camera', 'Ffmpeg', 'onvif',
-    0, /* as CanWake, */ 0, /* as CanSleep, */ 1, /* as CanReset, */
+INSERT INTO Controls 
+SELECT * FROM (SELECT NULL as Id,
+                     'ONVIF Camera' as Name,
+                     'Ffmpeg' as Type,
+                     'onvif' as Protocol,
+                     0 as CanWake,
+                     0 as CanSleep,
+                     1 as CanReset,
+                     1 as CanZoom,
+                     0 as CanAutoZoom,
+                     0 as CanZoomAbs,
+                     0 as CanZoomRel,
+                     1 as CanZoomCon,
+                     0 as MinZoomRange,
+                     0 as MaxZoomRange,
+                     0 as MinZoomStep,
+                     0 as MaxZoomStep,
+                     0 as HasZoomSpeed,
+                     0 as MinZoomSpeed,
+                     0 as MaxZoomSpeed,
+                     0 as CanFocus,
+                     0 as CanAutoFocus,
+                     0 as CanFocusAbs,
+                     0 as CanFocusRel,
+                     0 as CanFocusCon,
+                     0 as MinFocusRange,
+                     0 as MaxFocusRange,
+                     0 as MinFocusStep,
+                     0 as MaxFocusStep,
+                     0 as HasFocusSpeed,
+                     0 as MinFocusSpeed,
+                     0 as MaxFocusSpeed,
+                     1 as CanIris,
+                     0 as CanAutoIris,
+                     1 as CanIrisAbs,
+                     0 as CanIrisRel,
+                     0 as CanIrisCon,
+                     0 as MinIrisRange,
+                     255 as MaxIrisRange,
+                     16 as MinIrisStep,
+                     16 as MaxIrisStep,
+                     0 as HasIrisSpeed,
+                     0 as MinIrisSpeed,
+                     0 as MaxIrisSpeed,
+                     0 as CanGain,
+                     0 as CanAutoGain,
+                     0 as CanGainAbs,
+                     0 as CanGainRel,
+                     0 as CanGainCon,
+                     0 as MinGainRange,
+                     0 as MaxGainRange,
+                     0 as MinGainStep,
+                     0 as MaxGainStep,
+                     0 as HasGainSpeed,
+                     0 as MinGainSpeed,
+                     0 as MaxGainSpeed,
+                     1 as CanWhite,
+                     0 as CanAutoWhite,
+                     1 as CanWhiteAbs,
+                     0 as CanWhiteRel,
+                     0 as CanWhiteCon,
+                     0 as MinWhiteRange,
+                     6 as MaxWhiteRange,
+                     1 as MinWhiteStep,
+                     1 as MaxWhiteStep,
+                     0 as HasWhiteSpeed,
+                     0 as MinWhiteSpeed,
+                     0 as MaxWhiteSpeed,
+                     1 as HasPresets,
+                     10 as NumPresets,
+                     0 as HasHomePreset,
+                     1 as CanSetPresets,
+                     1 as CanMove,
+                     1 as CanMoveDiag,
+                     0 as CanMoveMap,
+                     0 as CanMoveAbs,
+                     0 as CanMoveRel,
+                     1 as CanMoveCon,
+                     1 as CanPan,
+                     0 as MinPanRange,
+                     0 as MaxPanRange,
+                     0 as MinPanStep,
+                     0 as MaxPanStep,
+                     0 as HasPanSpeed,
+                     0 as MinPanSpeed,
+                     0 as MaxPanSpeed,
+                     0 as HasTurboPan,
+                     0 as TurboPanSpeed,
+                     1 as CanTilt,
+                     0 as MinTiltRange,
+                     0 as MaxTiltRange,
+                     0 as MinTiltStep,
+                     0 as MaxTiltStep,
+                     0 as HasTiltSpeed,
+                     0 as MinTiltSpeed,
+                     0 as MaxTiltSpeed,
+                     0 as HasTurboTilt,
+                     0 as TurboTiltSpeed,
+                     0 as CanAutoScan,
+                     0 as NumScanPaths) AS tmp
+WHERE NOT EXISTS (
+    SELECT Name FROM Controls WHERE name = 'ONVIF Camera'
+) LIMIT 1;
 
-    1, /* as CanZoom, */ 0, /* as CanAutoZoom, */ 0, /* as CanZoomAbs, */ 0, /* as CanZoomRel, */ 1, /* as CanZoomCon, */
-    0, /* as MinZoomRange, */ 0, /* as MaxZoomRange, */ 0, /* as MinZoomStep, */ 0, /* as MaxZoomStep, */ 0, /* as HasZoomSpeed, */ 0, /* as MinZoomSpeed, */ 0, /* as MaxZoomSpeed, */
-    0, /* as CanFocus, */ 0, /* as CanAutoFocus, */ 0, /* as CanFocusAbs, */ 0, /* as CanFocusRel, */ 0, /* as CanFocusCon, */
-    0, /* as MinFocusRange, */ 0, /* as MaxFocusRange, */ 0, /* as MinFocusStep, */ 0, /* as MaxFocusStep, */ 0, /* as HasFocusSpeed, */ 0, /* as MinFocusSpeed, */ 0, /* as MaxFocusSpeed, */
-    1, /* as CanIris, */ 0, /* as CanAutoIris, */ 1, /* as CanIrisAbs, */ 0, /* as CanIrisRel, */ 0, /* as CanIrisCon, */
-    0, /* as MinIrisRange, */ 255, /* as MaxIrisRange, */ 16, /* as MinIrisStep, */ 16, /* as MaxIrisStep, */ 0, /* as HasIrisSpeed, */ 0, /* as MinIrisSpeed, */ 0, /* as MaxIrisSpeed, */
-    0, /* as CanGain, */ 0, /* as CanAutoGain, */ 0, /* as CanGainAbs, */ 0, /* as CanGainRel, */ 0, /* as CanGainCon, */
-    0, /* as MinGainRange, */ 0, /* as MaxGainRange, */ 0, /* as MinGainStep, */ 0, /* as MaxGainStep, */ 0, /* as HasGainSpeed, */ 0, /* as MinGainSpeed, */ 0, /* as MaxGainSpeed, */
-    1, /* as CanWhite, */ 0, /* as CanAutoWhite, */ 1, /* as CanWhiteAbs, */ 0, /* as CanWhiteRel, */ 0, /* as CanWhiteCon, */
-    0, /* as MinWhiteRange, */ 6, /* as MaxWhiteRange, */ 1, /* as MinWhiteStep, */ 1, /* as MaxWhiteStep, */ 0, /* as HasWhiteSpeed, */ 0, /* as MinWhiteSpeed, */ 0, /* as MaxWhiteSpeed, */
-    1, /* as HasPresets, */ 10, /* as NumPresets, */ 0, /* as HasHomePreset, */ 1, /* as CanSetPresets, */
-    1, /* as CanMove, */ 1, /* as CanMoveDiag, */ 0, /* as CanMoveMap, */ 0, /* as CanMoveAbs, */ 0, /* as CanMoveRel, */ 1, /* as CanMoveCon, */
-    1, /* as CanPan, */ 0, /* as MinPanRange, */ 0, /* as MaxPanRange, */ 0, /* as MinPanStep, */ 0, /* as MaxPanStep, */
-    0, /* as HasPanSpeed, */ 0, /* as MinPanSpeed, */ 0, /* as MaxPanSpeed, */ 0, /* as HasTurboPan, */ 0, /* as TurboPanSpeed, */
-    1, /* as CanTilt, */ 0, /* as MinTiltRange, */ 0, /* as MaxTiltRange, */ 0, /* as MinTiltStep, */ 0, /* as MaxTiltStep, */
-    0, /* as HasTiltSpeed, */ 0, /* as MinTiltSpeed, */ 0, /* as MaxTiltSpeed, */ 0, /* as HasTurboTilt, */ 0, /* as TurboTiltSpeed, */
-    0, /* as CanAutoScan, */
-    0 /* as NumScanPaths */
-  )"
-));
+INSERT INTO Controls 
+SELECT * FROM (SELECT NULL as Id,
+                     'Foscam 9831W' as Name,
+                     'Ffmpeg' as Type,
+                     'FI9831W' as Protocol,
+                     0 as CanWake,
+                     0 as CanSleep,
+                     1 as CanReset,
+                     0 as CanZoom,
+                     0 as CanAutoZoom,
+                     0 as CanZoomAbs,
+                     0 as CanZoomRel,
+                     0 as CanZoomCon,
+                     0 as MinZoomRange,
+                     0 as MaxZoomRange,
+                     0 as MinZoomStep,
+                     0 as MaxZoomStep,
+                     0 as HasZoomSpeed,
+                     0 as MinZoomSpeed,
+                     0 as MaxZoomSpeed,
+                     0 as CanFocus,
+                     0 as CanAutoFocus,
+                     0 as CanFocusAbs,
+                     0 as CanFocusRel,
+                     0 as CanFocusCon,
+                     0 as MinFocusRange,
+                     0 as MaxFocusRange,
+                     0 as MinFocusStep,
+                     0 as MaxFocusStep,
+                     0 as HasFocusSpeed,
+                     0 as MinFocusSpeed,
+                     0 as MaxFocusSpeed,
+                     0 as CanIris,
+                     0 as CanAutoIris,
+                     0 as CanIrisAbs,
+                     0 as CanIrisRel,
+                     0 as CanIrisCon,
+                     0 as MinIrisRange,
+                     0 as MaxIrisRange,
+                     0 as MinIrisStep,
+                     0 as MaxIrisStep,
+                     0 as HasIrisSpeed,
+                     0 as MinIrisSpeed,
+                     0 as MaxIrisSpeed,
+                     0 as CanGain,
+                     0 as CanAutoGain,
+                     0 as CanGainAbs,
+                     0 as CanGainRel,
+                     0 as CanGainCon,
+                     0 as MinGainRange,
+                     0 as MaxGainRange,
+                     0 as MinGainStep,
+                     0 as MaxGainStep,
+                     0 as HasGainSpeed,
+                     0 as MinGainSpeed,
+                     0 as MaxGainSpeed,
+                     0 as CanWhite,
+                     0 as CanAutoWhite,
+                     0 as CanWhiteAbs,
+                     0 as CanWhiteRel,
+                     0 as CanWhiteCon,
+                     0 as MinWhiteRange,
+                     0 as MaxWhiteRange,
+                     0 as MinWhiteStep,
+                     0 as MaxWhiteStep,
+                     0 as HasWhiteSpeed,
+                     0 as MinWhiteSpeed,
+                     0 as MaxWhiteSpeed,
+                     0 as HasPresets,
+                     16 as NumPresets,
+                     1 as HasHomePreset,
+                     1 as CanSetPresets,
+                     1 as CanMove,
+                     1 as CanMoveDiag,
+                     0 as CanMoveMap,
+                     0 as CanMoveAbs,
+                     0 as CanMoveRel,
+                     1 as CanMoveCon,
+                     1 as CanPan,
+                     0 as MinPanRange,
+                     360 as MaxPanRange,
+                     0 as MinPanStep,
+                     360 as MaxPanStep,
+                     1 as HasPanSpeed,
+                     0 as MinPanSpeed,
+                     4 as MaxPanSpeed,
+                     0 as HasTurboPan,
+                     0 as TurboPanSpeed,
+                     1 as CanTilt,
+                     0 as MinTiltRange,
+                     90 as MaxTiltRange,
+                     0 as MinTiltStep,
+                     90 as MaxTiltStep,
+                     0 as HasTiltSpeed,
+                     0 as MinTiltSpeed,
+                     0 as MaxTiltSpeed,
+                     0 as HasTurboTilt,
+                     0 as TurboTiltSpeed,
+                     0 as CanAutoScan,
+                     0 as NumScanPaths) AS tmp
+WHERE NOT EXISTS (
+    SELECT Name FROM Controls WHERE name = 'Foscam 9831W'
+) LIMIT 1;
 
-PREPARE stmt FROM @s;
-EXECUTE stmt;
+INSERT INTO Controls 
+SELECT * FROM (SELECT NULL as Id,
+                     'Foscam FI8918W' as Name,
+                     'Ffmpeg' as Type,
+                     'FI8918W' as Protocol,
+                     0 as CanWake,
+                     0 as CanSleep,
+                     1 as CanReset,
+                     0 as CanZoom,
+                     0 as CanAutoZoom,
+                     0 as CanZoomAbs,
+                     0 as CanZoomRel,
+                     0 as CanZoomCon,
+                     0 as MinZoomRange,
+                     0 as MaxZoomRange,
+                     0 as MinZoomStep,
+                     0 as MaxZoomStep,
+                     0 as HasZoomSpeed,
+                     0 as MinZoomSpeed,
+                     0 as MaxZoomSpeed,
+                     0 as CanFocus,
+                     0 as CanAutoFocus,
+                     0 as CanFocusAbs,
+                     0 as CanFocusRel,
+                     0 as CanFocusCon,
+                     0 as MinFocusRange,
+                     0 as MaxFocusRange,
+                     0 as MinFocusStep,
+                     0 as MaxFocusStep,
+                     0 as HasFocusSpeed,
+                     0 as MinFocusSpeed,
+                     0 as MaxFocusSpeed,
+                     0 as CanIris,
+                     0 as CanAutoIris,
+                     0 as CanIrisAbs,
+                     0 as CanIrisRel,
+                     0 as CanIrisCon,
+                     0 as MinIrisRange,
+                     0 as MaxIrisRange,
+                     0 as MinIrisStep,
+                     0 as MaxIrisStep,
+                     0 as HasIrisSpeed,
+                     0 as MinIrisSpeed,
+                     0 as MaxIrisSpeed,
+                     0 as CanGain,
+                     0 as CanAutoGain,
+                     0 as CanGainAbs,
+                     0 as CanGainRel,
+                     0 as CanGainCon,
+                     0 as MinGainRange,
+                     0 as MaxGainRange,
+                     0 as MinGainStep,
+                     0 as MaxGainStep,
+                     0 as HasGainSpeed,
+                     0 as MinGainSpeed,
+                     0 as MaxGainSpeed,
+                     0 as CanWhite,
+                     0 as CanAutoWhite,
+                     0 as CanWhiteAbs,
+                     0 as CanWhiteRel,
+                     0 as CanWhiteCon,
+                     0 as MinWhiteRange,
+                     0 as MaxWhiteRange,
+                     0 as MinWhiteStep,
+                     0 as MaxWhiteStep,
+                     0 as HasWhiteSpeed,
+                     0 as MinWhiteSpeed,
+                     0 as MaxWhiteSpeed,
+                     0 as HasPresets,
+                     8 as NumPresets,
+                     0 as HasHomePreset,
+                     1 as CanSetPresets,
+                     1 as CanMove,
+                     1 as CanMoveDiag,
+                     0 as CanMoveMap,
+                     0 as CanMoveAbs,
+                     0 as CanMoveRel,
+                     1 as CanMoveCon,
+                     1 as CanPan,
+                     0 as MinPanRange,
+                     360 as MaxPanRange,
+                     0 as MinPanStep,
+                     360 as MaxPanStep,
+                     1 as HasPanSpeed,
+                     0 as MinPanSpeed,
+                     4 as MaxPanSpeed,
+                     0 as HasTurboPan,
+                     0 as TurboPanSpeed,
+                     1 as CanTilt,
+                     0 as MinTiltRange,
+                     90 as MaxTiltRange,
+                     0 as MinTiltStep,
+                     90 as MaxTiltStep,
+                     0 as HasTiltSpeed,
+                     0 as MinTiltSpeed,
+                     0 as MaxTiltSpeed,
+                     0 as HasTurboTilt,
+                     0 as TurboTiltSpeed,
+                     0 as CanAutoScan,
+                     0 as NumScanPaths) AS tmp
+WHERE NOT EXISTS (
+    SELECT Name FROM Controls WHERE name = 'Foscam FI8918W'
+) LIMIT 1;
 
-SET @s = (SELECT IF( (SELECT COUNT(*) FROM Controls WHERE Name='Foscam 9831W') > 0,
-"SELECT 'Foscam 9831W Camera Control already exists in Controls'",
-"INSERT INTO Controls (
-  Name,Type,Protocol,
-  CanWake,CanSleep,CanReset,
-  CanZoom,CanAutoZoom, CanZoomAbs,CanZoomRel,CanZoomCon,
-  MinZoomRange, MaxZoomRange, MinZoomStep,MaxZoomStep,HasZoomSpeed,MinZoomSpeed,MaxZoomSpeed,
-  CanFocus,CanAutoFocus,CanFocusAbs,CanFocusRel,CanFocusCon,MinFocusRange,MaxFocusRange,MinFocusStep,MaxFocusStep,HasFocusSpeed,MinFocusSpeed,MaxFocusSpeed,
-  CanIris,CanAutoIris,CanIrisAbs,CanIrisRel,CanIrisCon,MinIrisRange, MaxIrisRange, MinIrisStep, MaxIrisStep,HasIrisSpeed,MinIrisSpeed,MaxIrisSpeed,
-  CanGain,CanAutoGain, CanGainAbs,CanGainRel, CanGainCon,
-  MinGainRange,MaxGainRange,  MinGainStep, MaxGainStep, HasGainSpeed, MinGainSpeed,  MaxGainSpeed,
-  CanWhite, CanAutoWhite, CanWhiteAbs, CanWhiteRel, CanWhiteCon,
-  MinWhiteRange, MaxWhiteRange, MinWhiteStep, MaxWhiteStep, HasWhiteSpeed,MinWhiteSpeed,MaxWhiteSpeed,
-  HasPresets,  NumPresets, HasHomePreset, CanSetPresets,
-  CanMove,  CanMoveDiag, CanMoveMap, CanMoveAbs, CanMoveRel, CanMoveCon,
-  CanPan, MinPanRange, MaxPanRange, MinPanStep, MaxPanStep,
-  HasPanSpeed,MinPanSpeed,MaxPanSpeed,HasTurboPan,TurboPanSpeed,CanTilt, MinTiltRange,MaxTiltRange, MinTiltStep,MaxTiltStep,
-  HasTiltSpeed,MinTiltSpeed,MaxTiltSpeed, HasTurboTilt,TurboTiltSpeed,
-  CanAutoScan,NumScanPaths)
-  VALUES
-  ('Foscam 9831W', 'Ffmpeg', 'FI9831W',
-    0, /* as CanWake, */ 0, /* as CanSleep, */ 1, /* as CanReset, */
-    0, /* as CanZoom, */ 0, /* as CanAutoZoom, */ 0, /* as CanZoomAbs, */ 0, /* as CanZoomRel, */ 0, /* as CanZoomCon, */
-    0, /* as MinZoomRange, */ 0, /* as MaxZoomRange, */ 0, /* as MinZoomStep, */ 0, /* as MaxZoomStep, */ 0, /* as HasZoomSpeed, */ 0, /* as MinZoomSpeed, */ 0, /* as MaxZoomSpeed, */
-    0, /* as CanFocus, */ 0, /* as CanAutoFocus, */ 0, /* as CanFocusAbs, */ 0, /* as CanFocusRel, */ 0, /* as CanFocusCon, */
-    0, /* as MinFocusRange, */ 0, /* as MaxFocusRange, */ 0, /* as MinFocusStep, */ 0, /* as MaxFocusStep, */ 0, /* as HasFocusSpeed, */ 0, /* as MinFocusSpeed, */ 0, /* as MaxFocusSpeed, */
-    0, /* as CanIris, */ 0, /* as CanAutoIris, */ 0, /* as CanIrisAbs, */ 0, /* as CanIrisRel, */ 0, /* as CanIrisCon, */
-    0, /* as MinIrisRange, */ 0, /* as MaxIrisRange, */ 0, /* as MinIrisStep, */ 0, /* as MaxIrisStep, */ 0, /* as HasIrisSpeed, */ 0, /* as MinIrisSpeed, */ 0, /* as MaxIrisSpeed, */
-    0, /* as CanGain, */ 0, /* as CanAutoGain, */ 0, /* as CanGainAbs, */ 0, /* as CanGainRel, */ 0, /* as CanGainCon, */
-    0, /* as MinGainRange, */ 0, /* as MaxGainRange, */ 0, /* as MinGainStep, */ 0, /* as MaxGainStep, */ 0, /* as HasGainSpeed, */ 0, /* as MinGainSpeed, */ 0, /* as MaxGainSpeed, */
-    0, /* as CanWhite, */ 0, /* as CanAutoWhite, */ 0, /* as CanWhiteAbs, */ 0, /* as CanWhiteRel, */ 0, /* as CanWhiteCon, */
-    0, /* as MinWhiteRange, */ 0, /* as MaxWhiteRange, */ 0, /* as MinWhiteStep, */ 0, /* as MaxWhiteStep, */ 0, /* as HasWhiteSpeed, */ 0, /* as MinWhiteSpeed, */ 0, /* as MaxWhiteSpeed, */
-    0, /* as HasPresets, */ 16, /* as NumPresets, */ 1, /* as HasHomePreset, */ 1, /* as CanSetPresets, */
-    1, /* as CanMove, */ 1, /* as CanMoveDiag, */ 0, /* as CanMoveMap, */ 0, /* as CanMoveAbs, */ 0, /* as CanMoveRel, */ 1, /* as CanMoveCon, */
-    1, /* as CanPan, */ 0, /* as MinPanRange, */ 360, /* as MaxPanRange, */ 0, /* as MinPanStep, */ 360, /* as MaxPanStep, */
-    1, /* as HasPanSpeed, */ 0, /* as MinPanSpeed, */ 4, /* as MaxPanSpeed, */ 0, /* as HasTurboPan, */ 0, /* as TurboPanSpeed, */
-    1, /* as CanTilt, */ 0, /* as MinTiltRange, */ 90, /* as MaxTiltRange, */ 0, /* as MinTiltStep, */ 90, /* as MaxTiltStep, */
-    0, /* as HasTiltSpeed, */ 0, /* as MinTiltSpeed, */ 0, /* as MaxTiltSpeed, */ 0, /* as HasTurboTilt, */ 0, /* as TurboTiltSpeed, */
-    0, /* as CanAutoScan, */
-    0 /* as NumScanPaths */
-  )"
-  ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF( (SELECT COUNT(*) FROM Controls WHERE Name='Foscam FI8918W') > 0,
-"SELECT 'Foscam 8918W Camera Control already exists in Controls'",
-"INSERT INTO Controls (
-  Name,Type,Protocol,
-  CanWake,CanSleep,CanReset,
-  CanZoom,CanAutoZoom, CanZoomAbs,CanZoomRel,CanZoomCon,
-  MinZoomRange, MaxZoomRange, MinZoomStep,MaxZoomStep,HasZoomSpeed,MinZoomSpeed,MaxZoomSpeed,
-  CanFocus,CanAutoFocus,CanFocusAbs,CanFocusRel,CanFocusCon,MinFocusRange,MaxFocusRange,MinFocusStep,MaxFocusStep,HasFocusSpeed,MinFocusSpeed,MaxFocusSpeed,
-  CanIris,CanAutoIris,CanIrisAbs,CanIrisRel,CanIrisCon,MinIrisRange, MaxIrisRange, MinIrisStep, MaxIrisStep,HasIrisSpeed,MinIrisSpeed,MaxIrisSpeed,
-  CanGain,CanAutoGain, CanGainAbs,CanGainRel, CanGainCon,
-  MinGainRange,MaxGainRange,  MinGainStep, MaxGainStep, HasGainSpeed, MinGainSpeed,  MaxGainSpeed,
-  CanWhite, CanAutoWhite, CanWhiteAbs, CanWhiteRel, CanWhiteCon,
-  MinWhiteRange, MaxWhiteRange, MinWhiteStep, MaxWhiteStep, HasWhiteSpeed,MinWhiteSpeed,MaxWhiteSpeed,
-  HasPresets,  NumPresets, HasHomePreset, CanSetPresets,
-  CanMove,  CanMoveDiag, CanMoveMap, CanMoveAbs, CanMoveRel, CanMoveCon,
-  CanPan, MinPanRange, MaxPanRange, MinPanStep, MaxPanStep,
-  HasPanSpeed,MinPanSpeed,MaxPanSpeed,HasTurboPan,TurboPanSpeed,CanTilt, MinTiltRange,MaxTiltRange, MinTiltStep,MaxTiltStep,
-  HasTiltSpeed,MinTiltSpeed,MaxTiltSpeed, HasTurboTilt,TurboTiltSpeed,
-  CanAutoScan,NumScanPaths)
-  VALUES
-  ('Foscam FI8918W', 'Ffmpeg', 'FI8918W',
-    0, /* as CanWake, */ 0, /* as CanSleep, */ 1, /* as CanReset, */
-    0, /* as CanZoom, */ 0, /* as CanAutoZoom, */ 0, /* as CanZoomAbs, */ 0, /* as CanZoomRel, */ 0, /* as CanZoomCon, */
-    0, /* as MinZoomRange, */ 0, /* as MaxZoomRange, */ 0, /* as MinZoomStep, */ 0, /* as MaxZoomStep, */ 0, /* as HasZoomSpeed, */ 0, /* as MinZoomSpeed, */ 0, /* as MaxZoomSpeed, */
-    0, /* as CanFocus, */ 0, /* as CanAutoFocus, */ 0, /* as CanFocusAbs, */ 0, /* as CanFocusRel, */ 0, /* as CanFocusCon, */
-    0, /* as MinFocusRange, */ 0, /* as MaxFocusRange, */ 0, /* as MinFocusStep, */ 0, /* as MaxFocusStep, */ 0, /* as HasFocusSpeed, */ 0, /* as MinFocusSpeed, */ 0, /* as MaxFocusSpeed, */
-    0, /* as CanIris, */ 0, /* as CanAutoIris, */ 0, /* as CanIrisAbs, */ 0, /* as CanIrisRel, */ 0, /* as CanIrisCon, */
-    0, /* as MinIrisRange, */ 0, /* as MaxIrisRange, */ 0, /* as MinIrisStep, */ 0, /* as MaxIrisStep, */ 0, /* as HasIrisSpeed, */ 0, /* as MinIrisSpeed, */ 0, /* as MaxIrisSpeed, */
-    0, /* as CanGain, */ 0, /* as CanAutoGain, */ 0, /* as CanGainAbs, */ 0, /* as CanGainRel, */ 0, /* as CanGainCon, */
-    0, /* as MinGainRange, */ 0, /* as MaxGainRange, */ 0, /* as MinGainStep, */ 0, /* as MaxGainStep, */ 0, /* as HasGainSpeed, */ 0, /* as MinGainSpeed, */ 0, /* as MaxGainSpeed, */
-    0, /* as CanWhite, */ 0, /* as CanAutoWhite, */ 0, /* as CanWhiteAbs, */ 0, /* as CanWhiteRel, */ 0, /* as CanWhiteCon, */
-    0, /* as MinWhiteRange, */ 0, /* as MaxWhiteRange, */ 0, /* as MinWhiteStep, */ 0, /* as MaxWhiteStep, */ 0, /* as HasWhiteSpeed, */ 0, /* as MinWhiteSpeed, */ 0, /* as MaxWhiteSpeed, */
-    0, /* as HasPresets, */ 8, /* as NumPresets, */ 0, /* as HasHomePreset, */ 1, /* as CanSetPresets, */
-    1, /* as CanMove, */ 1, /* as CanMoveDiag, */ 0, /* as CanMoveMap, */ 0, /* as CanMoveAbs, */ 0, /* as CanMoveRel, */ 1, /* as CanMoveCon, */
-    1, /* as CanPan, */ 0, /* as MinPanRange, */ 360, /* as MaxPanRange, */ 0, /* as MinPanStep, */ 360, /* as MaxPanStep, */
-    1, /* as HasPanSpeed, */ 0, /* as MinPanSpeed, */ 4, /* as MaxPanSpeed, */ 0, /* as HasTurboPan, */ 0, /* as TurboPanSpeed, */
-    1, /* as CanTilt, */ 0, /* as MinTiltRange, */ 90, /* as MaxTiltRange, */ 0, /* as MinTiltStep, */ 90, /* as MaxTiltStep, */
-    0, /* as HasTiltSpeed, */ 0, /* as MinTiltSpeed, */ 0, /* as MaxTiltSpeed, */ 0, /* as HasTurboTilt, */ 0, /* as TurboTiltSpeed, */
-    0, /* as CanAutoScan, */
-    0 /* as NumScanPaths */
-  )"
-  ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
 --
 -- Hide USE_DEEP_STORAGE from user to prevent accidental event loss
 --
-UPDATE Config SET Category='hidden' WHERE Name='ZM_USE_DEEP_STORAGE';
+UPDATE `zm`.`Config` SET `Category`='hidden' WHERE `Name`='ZM_USE_DEEP_STORAGE';
 
 --
 -- Add Id column to State

db/zm_update-1.29.1.sql

@@ -0,0 +1,7 @@
+--
+-- This updates a 1.29.0 database to 1.29.1
+--
+--
+
+-- Increase the size of the Pid field for FreeBSD
+ALTER TABLE Logs MODIFY Pid int(10);

db/zm_update-1.30.1.sql

@@ -1,110 +1,7 @@
 --
--- This updates a 1.28.108 database to 1.28.109
+-- This updates a 1.30.0 database to 1.30.1
+--
+-- Alter type of Messages column from VARCHAR(255) to TEXT
 --
 
---
--- Add Controls definition for Vivotek ePTZ
---
-INSERT INTO Controls 
-SELECT * FROM (SELECT NULL as Id,
-                    'Vivotek ePTZ' as Name,
-                    'Remote' as Type,
-                    'Vivotek_ePTZ' as Protocol,
-                    0 as CanWake,
-                    0 as CanSleep,
-                    1 as CanReset,
-                    1 as CanZoom,
-                    0 as CanAutoZoom,
-                    0 as CanZoomAbs,
-                    0 as CanZoomRel,
-                    1 as CanZoomCon,
-                    0 as MinZoomRange,
-                    0 as MaxZoomRange,
-                    0 as MinZoomStep,
-                    0 as MaxZoomStep,
-                    1 as HasZoomSpeed,
-                    0 as MinZoomSpeed,
-                    5 as MaxZoomSpeed,
-                    0 as CanFocus,
-                    0 as CanAutoFocus,
-                    0 as CanFocusAbs,
-                    0 as CanFocusRel,
-                    0 as CanFocusCon,
-                    0 as MinFocusRange,
-                    0 as MaxFocusRange,
-                    0 as MinFocusStep,
-                    0 as MaxFocusStep,
-                    0 as HasFocusSpeed,
-                    0 as MinFocusSpeed,
-                    0 as MaxFocusSpeed,
-                    0 as CanIris,
-                    0 as CanAutoIris,
-                    0 as CanIrisAbs,
-                    0 as CanIrisRel,
-                    0 as CanIrisCon,
-                    0 as MinIrisRange,
-                    0 as MaxIrisRange,
-                    0 as MinIrisStep,
-                    0 as MaxIrisStep,
-                    0 as HasIrisSpeed,
-                    0 as MinIrisSpeed,
-                    0 as MaxIrisSpeed,
-                    0 as CanGain,
-                    0 as CanAutoGain,
-                    0 as CanGainAbs,
-                    0 as CanGainRel,
-                    0 as CanGainCon,
-                    0 as MinGainRange,
-                    0 as MaxGainRange,
-                    0 as MinGainStep,
-                    0 as MaxGainStep,
-                    0 as HasGainSpeed,
-                    0 as MinGainSpeed,
-                    0 as MaxGainSpeed,
-                    0 as CanWhite,
-                    0 as CanAutoWhite,
-                    0 as CanWhiteAbs,
-                    0 as CanWhiteRel,
-                    0 as CanWhiteCon,
-                    0 as MinWhiteRange,
-                    0 as MaxWhiteRange,
-                    0 as MinWhiteStep,
-                    0 as MaxWhiteStep,
-                    0 as HasWhiteSpeed,
-                    0 as MinWhiteSpeed,
-                    0 as MaxWhiteSpeed,
-                    0 as HasPresets,
-                    0 as NumPresets,
-                    0 as HasHomePreset,
-                    0 as CanSetPresets,
-                    1 as CanMove,
-                    0 as CanMoveDiag,
-                    0 as CanMoveMap,
-                    0 as CanMoveAbs,
-                    0 as CanMoveRel,
-                    1 as CanMoveCon,
-                    1 as CanPan,
-                    0 as MinPanRange,
-                    0 as MaxPanRange,
-                    0 as MinPanStep,
-                    0 as MaxPanStep,
-                    1 as HasPanSpeed,
-                    0 as MinPanSpeed,
-                    5 as MaxPanSpeed,
-                    0 as HasTurboPan,
-                    0 as TurboPanSpeed,
-                    1 as CanTilt,
-                    0 as MinTiltRange,
-                    0 as MaxTiltRange,
-                    0 as MinTiltStep,
-                    0 as MaxTiltStep,
-                    1 as HasTiltSpeed,
-                    0 as MinTiltSpeed,
-                    5 as MaxTiltSpeed,
-                    0 as HasTurboTilt,
-                    0 as TurboTiltSpeed,
-                    0 as CanAutoScan,
-                    0 as NumScanPaths) AS tmp
-WHERE NOT EXISTS (
-    SELECT Name FROM Controls WHERE name = 'Vivotek ePTZ'
-) LIMIT 1;
+ALTER TABLE Logs MODIFY Message TEXT;

db/zm_update-1.31.0.sql

@@ -1,7 +1,7 @@
 --
 -- This updates a 1.29.0 database to 1.30.0
 --
-SELECT 'Checking for SaveJPEGs in Monitors';
+
 SET @s = (SELECT IF(
 	(SELECT COUNT(*)
 	FROM INFORMATION_SCHEMA.COLUMNS
@@ -16,7 +16,6 @@ SET @s = (SELECT IF(
 PREPARE stmt FROM @s;
 EXECUTE stmt;
 
-SELECT 'Checking for VideoWriter in Monitors';
 SET @s = (SELECT IF(
 	(SELECT COUNT(*)
 	FROM INFORMATION_SCHEMA.COLUMNS
@@ -31,7 +30,6 @@ SET @s = (SELECT IF(
 PREPARE stmt FROM @s;
 EXECUTE stmt;
 
-SELECT 'Checking for EncoderParameters in Monitors';
 SET @s = (SELECT IF(
 	(SELECT COUNT(*)
 	FROM INFORMATION_SCHEMA.COLUMNS
@@ -46,7 +44,6 @@ SET @s = (SELECT IF(
 PREPARE stmt FROM @s;
 EXECUTE stmt;
 
-SELECT 'Checking for DefaultVideo in Events';
 SET @s = (SELECT IF(
 	(SELECT COUNT(*)
 	FROM INFORMATION_SCHEMA.COLUMNS
@@ -55,13 +52,12 @@ SET @s = (SELECT IF(
 	AND column_name = 'DefaultVideo'
 	) > 0,
 "SELECT 'Column DefaultVideo exists in Events'",
-"ALTER TABLE `Events` ADD `DefaultVideo` VARCHAR( 64 ) NOT NULL default '' AFTER `AlarmFrames`"
+"ALTER TABLE `Events` ADD `DefaultVideo` VARCHAR( 64 ) NOT NULL AFTER `AlarmFrames`"
 ));
 
 PREPARE stmt FROM @s;
 EXECUTE stmt;
 
-SELECT 'Checking for RecordAudio in Monitors';
 SET @s = (SELECT IF(
 	(SELECT COUNT(*)
 	FROM INFORMATION_SCHEMA.COLUMNS

db/zm_update-1.31.1.sql

@@ -3,7 +3,6 @@
 --
 -- Add StateId Column to Events.
 --
-SELECT 'Checkfor StateId IN Events';
 
 SET @s = (SELECT IF(
     (SELECT COUNT(*)

db/zm_update-1.31.10.sql

@@ -1,122 +0,0 @@
---
--- Add Type column to Storage 
---
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Servers'
-     AND column_name = 'Status'
-    ) > 0,
-"SELECT 'Column Status already exists in Servers'",
-"ALTER TABLE Servers ADD `Status`  enum('Unknown','NotRunning','Running') NOT NULL default 'Unknown' AFTER `State_Id`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Servers'
-     AND column_name = 'CpuLoad'
-    ) > 0,
-"SELECT 'Column CpuLoad already exists in Servers'",
-"ALTER TABLE Servers ADD `CpuLoad` DECIMAL(5,1) default NULL AFTER `Status`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Servers'
-     AND column_name = 'TotalMem'
-    ) > 0,
-"SELECT 'Column TotalMem already exists in Servers'",
-"ALTER TABLE Servers ADD `TotalMem` bigint unsigned default null AFTER `CpuLoad`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Servers'
-     AND column_name = 'FreeMem'
-    ) > 0,
-"SELECT 'Column FreeMem already exists in Servers'",
-"ALTER TABLE Servers ADD `FreeMem` bigint unsigned default null AFTER `TotalMem`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Servers'
-     AND column_name = 'TotalSwap'
-    ) > 0,
-"SELECT 'Column TotalSwap already exists in Servers'",
-"ALTER TABLE Servers ADD `TotalSwap` bigint unsigned default null AFTER `FreeMem`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Servers'
-     AND column_name = 'FreeSwap'
-    ) > 0,
-"SELECT 'Column FreeSwap already exists in Servers'",
-"ALTER TABLE Servers ADD `FreeSwap` bigint unsigned default null AFTER `TotalSwap`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'Status'
-    ) > 0,
-"SELECT 'Column Status already exists in Monitors'",
-"ALTER TABLE Monitors ADD `Status`  enum('Unknown','NotRunning','Running','NoSignal','Signal') NOT NULL default 'Unknown' AFTER `Sequence`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'CaptureFPS'
-    ) > 0,
-"SELECT 'Column CaptureFPS already exists in Monitors'",
-"ALTER TABLE Monitors ADD `CaptureFPS`  DECIMAL(10,2) NOT NULL default 0 AFTER `Status`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'AnalysisFPSLimit'
-    ) > 0,
-"SELECT 'Column AnalysisFPSLimit already exists in Monitors'",
-"ALTER TABLE Monitors CHANGE COLUMN `AnalysisFPS` `AnalysisFPSLimit` DECIMAL(5,2) default NULL"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'AnalysisFPS'
-    ) > 0,
-"SELECT 'Column AnalysisFPS already exists in Monitors'",
-"ALTER TABLE Monitors ADD `AnalysisFPS`  DECIMAL(5,2) NOT NULL default 0 AFTER `CaptureFPS`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;

db/zm_update-1.31.11.sql

@@ -1,70 +0,0 @@
---
--- Add UpdateDiskSpace action to Filters
---
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Filters'
-     AND column_name = 'UpdateDiskSpace'
-    ) > 0,
-"SELECT 'Column UpdateDiskSpace already exists in Filters'",
-"ALTER TABLE Filters ADD `UpdateDiskSpace` tinyint(3) unsigned NOT NULL default '0' AFTER `AutoDelete`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
---
--- Update Logs table to have some Indexes
---
-SET @s = (SELECT IF(
-  (SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.STATISTICS
-  WHERE table_name = 'Logs'
-  AND table_schema = DATABASE()
-  AND index_name = 'Logs_TimeKey_idx'
-  ) > 0,
-"SELECT 'Logs_TimeKey_idx already exists on Logs table'",
-"CREATE INDEX `Logs_TimeKey_idx` ON `Logs` (`TimeKey`)"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-  (SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.STATISTICS
-  WHERE table_name = 'Logs'
-  AND table_schema = DATABASE()
-  AND index_name = 'Logs_Level_idx'
-  ) > 0,
-"SELECT 'Logs_Level_idx already exists on Logs table'",
-"CREATE INDEX `Logs_Level_idx` ON `Logs` (`Level`)"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'OutputCodec'
-    ) > 0,
-"SELECT 'Column OutputCodec already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `OutputCodec`     enum('h264','mjpeg') AFTER `VideoWriter`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'OutputContainer'
-    ) > 0,
-"SELECT 'Column OutputContainer already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `OutputContainer` enum('mp4','mkv') AFTER `OutputCodec`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-

db/zm_update-1.31.12.sql

@@ -1,67 +0,0 @@
---
--- This adds Manufacturers and Models
---
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-      FROM INFORMATION_SCHEMA.TABLES
-      WHERE table_name = 'MontageLayouts'
-      AND table_schema = DATABASE()
-    ) > 0,
-    "SELECT 'MontageLayouts table exists'",
-    "
- CREATE TABLE MontageLayouts (
-  `Id` int(10) unsigned NOT NULL auto_increment,
-  `Name`    TEXT  NOT NULL,
-  `Positions` LONGTEXT,
-  PRIMARY KEY (`Id`)
-);
-"
-  ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-DELETE FROM MontageLayouts WHERE Name IN ('Freeform','2 Wide','3 Wide','4 Wide','5 Wide');
-
-SET @s = ( SELECT IF(
-    (SELECT COUNT(*) FROM MontageLayouts WHERE Name='Freeform') > 0,
-      "SELECT 'Freeform already in layouts'",
-'INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES (\'Freeform\', \'{"default":{"float":"left","position":"relative","left":"0px","right":"0px","top":"0px","bottom":"0px"}}\');' 
-) );
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = ( SELECT IF(
-    (SELECT COUNT(*) FROM MontageLayouts WHERE Name='2 Wide') > 0,
-"SELECT '2 Wide already in layouts'",
-'INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES (\'2 Wide\', \'{"default":{"float":"left","position":"relative","width":"49%","left":"0px","right":"0px","top":"0px","bottom":"0px"}}\');'
-) );
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = ( SELECT IF(
-    (SELECT COUNT(*) FROM MontageLayouts WHERE Name='3 Wide') > 0,
-      "SELECT '3 Wide already in layouts'",
-'INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES (\'3 Wide\', \'{"default":{"float":"left","position":"relative","width":"33%","left":"0px","right":"0px","top":"0px","bottom":"0px"}}\');'
-) );
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = ( SELECT IF(
-    (SELECT COUNT(*) FROM MontageLayouts WHERE Name='4 Wide') > 0,
-      "SELECT '4 Wide already in layouts'",
-'INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES (\'4 Wide\', \'{"default":{"float":"left","position":"relative","width":"24.5%","left":"0px","right":"0px","top":"0px","bottom":"0px"}}\');'
-) );
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = ( SELECT IF(
-    (SELECT COUNT(*) FROM MontageLayouts WHERE Name='5 Wide') > 0,
-      "SELECT '5 Wide already in layouts'",
-      'INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES (\'5 Wide\', \'{"default":{"float":"left","position":"relative","width":"19%"}}\' );'
-) );
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;

db/zm_update-1.31.13.sql

@@ -1,28 +0,0 @@
-ALTER TABLE `Monitors` MODIFY `OutputCodec` enum('h264','mjpeg','mpeg1','mpeg2') default 'h264';
-ALTER TABLE `Monitors` MODIFY `OutputContainer` enum('auto','mp4','mkv') default 'auto';
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Events'
-     AND column_name = 'SaveJPEGs'
-    ) > 0,
-"SELECT 'Column SaveJPEGs already exists in Events'",
-"ALTER TABLE `Events` ADD `SaveJPEGs` TINYINT AFTER `DefaultVideo`"
-));
-
-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'
-     AND column_name = 'DiskSpace'
-    ) > 0,
-"SELECT 'Column DiskSpace already exists in Events'",
-"ALTER TABLE `Storage` ADD `DiskSpace`   bigint unsigned default NULL AFTER `Type`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;

db/zm_update-1.31.14.sql

@@ -1,148 +0,0 @@
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'TotalEvents'
-    ) > 0,
-"SELECT 'Column TotalEvents already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `TotalEvents` INT(10) AFTER `AnalysisFPS`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'TotalEventDiskSpace'
-    ) > 0,
-"SELECT 'Column TotalEventDiskSpace already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `TotalEventDiskSpace` BIGINT AFTER `TotalEvents`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'HourEvents'
-    ) > 0,
-"SELECT 'Column HourEvents already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `HourEvents` INT(10) AFTER `TotalEvents`"
-));
-
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'HourEventDiskSpace'
-    ) > 0,
-"SELECT 'Column HourEventDiskSpace already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `HourEventDiskSpace` BIGINT AFTER `HourEvents`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'DayEvents'
-    ) > 0,
-"SELECT 'Column DayEvents already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `DayEvents` INT(10) AFTER `HourEvents`"
-));
-
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'DayEventDiskSpace'
-    ) > 0,
-"SELECT 'Column DayEventDiskSpace already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `DayEventDiskSpace` BIGINT AFTER `DayEvents`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'WeekEvents'
-    ) > 0,
-"SELECT 'Column WeekEvents already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `WeekEvents` INT(10) AFTER `DayEvents`"
-));
-
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'WeekEventDiskSpace'
-    ) > 0,
-"SELECT 'Column WeekEventDiskSpace already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `WeekEventDiskSpace` BIGINT AFTER `WeekEvents`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'MonthEvents'
-    ) > 0,
-"SELECT 'Column MonthEvents already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `MonthEvents` INT(10) AFTER `WeekEvents`"
-));
-
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'MonthEventDiskSpace'
-    ) > 0,
-"SELECT 'Column MonthEventDiskSpace already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `MonthEventDiskSpace` BIGINT AFTER `MonthEvents`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'ArchivedEvents'
-    ) > 0,
-"SELECT 'Column ArchivedEvents already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `ArchivedEvents` INT(10) AFTER `MonthEvents`"
-));
-
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'ArchivedEventDiskSpace'
-    ) > 0,
-"SELECT 'Column ArchivedEventDiskSpace already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `ArchivedEventDiskSpace` BIGINT AFTER `ArchivedEvents`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;

db/zm_update-1.31.15.sql

@@ -1,14 +0,0 @@
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'ZoneCount'
-    ) > 0,
-"SELECT 'Column ZoneCount already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `ZoneCount` TINYINT NOT NULL DEFAULT 0 AFTER `ArchivedEventDiskSpace`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-UPDATE Monitors SET ZoneCount=(SELECT COUNT(Id) FROM Zones WHERE MonitorId=Monitors.Id);

db/zm_update-1.31.16.sql

@@ -1,94 +0,0 @@
---
--- Add UpdateDiskSpace action to Filters
---
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Filters'
-     AND column_name = 'AutoMove'
-    ) > 0,
-"SELECT 'Column AutoMove already exists in Filters'",
-"ALTER TABLE Filters ADD `AutoMove` tinyint(3) unsigned NOT NULL default '0' AFTER `AutoDelete`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Filters'
-     AND column_name = 'AutoMoveTo'
-    ) > 0,
-"SELECT 'Column AutoMoveTo already exists in Filters'",
-"ALTER TABLE Filters ADD `AutoMoveTo` smallint(5) unsigned NOT NULL default '0' AFTER `AutoMove`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-      FROM INFORMATION_SCHEMA.TABLES
-      WHERE table_name = 'Groups_Monitors'
-      AND table_schema = DATABASE()
-    ) > 0,
-    "SELECT 'Groups_Monitors table exists'",
-    "CREATE TABLE `Groups_Monitors` (
-      `Id` INT(10) unsigned NOT NULL auto_increment,
-      `GroupId` int(10) unsigned NOT NULL,
-      `MonitorId` int(10) unsigned NOT NULL,
-      PRIMARY KEY (`Id`)
-    )"
-  ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-      FROM INFORMATION_SCHEMA.STATISTICS
-      WHERE table_name = 'Groups_Monitors'
-      AND table_schema = DATABASE()
-      AND index_name = 'Groups_Monitors_GroupId_idx'
-    ) > 0,
-    "SELECT 'Groups_Monitors_GroupId_idx already exists on Groups table'",
-    "CREATE INDEX `Groups_Monitors_GroupId_idx` ON `Groups_Monitors` (`GroupId`)"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-      FROM INFORMATION_SCHEMA.STATISTICS
-      WHERE table_name = 'Groups_Monitors'
-      AND table_schema = DATABASE()
-      AND index_name = 'Groups_Monitors_MonitorId_idx'
-    ) > 0,
-    "SELECT 'Groups_Monitors_MonitorId_idx already exists on Groups table'",
-    "CREATE INDEX `Groups_Monitors_MonitorId_idx` ON `Groups_Monitors` (`MonitorId`)"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Groups'
-     AND column_name = 'MonitorIds'
-    ) > 0,
-    "REPLACE INTO Groups_Monitors (GroupId,MonitorId) SELECT Id,SUBSTRING_INDEX(SUBSTRING_INDEX(t.MonitorIds, ',', n.n), ',', -1) value   FROM Groups t CROSS JOIN  (    SELECT a.N + b.N * 10 + 1 n      FROM      (SELECT 0 AS N UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6 UNION ALL SELECT 7 UNION ALL SELECT 8 UNION ALL SELECT 9) a    ,(SELECT 0 AS N UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6 UNION ALL SELECT 7 UNION ALL SELECT 8 UNION ALL SELECT 9) b     ORDER BY n ) n  WHERE t.MonitorIds != '' AND n.n <= 1 + (LENGTH(t.MonitorIds) - LENGTH(REPLACE(t.MonitorIds, ',', '')))  ORDER BY value;",
-    "SELECT 'MonitorIds has already been removed.'"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Groups'
-     AND column_name = 'MonitorIds'
-    ) > 0,
-"ALTER TABLE Groups DROP MonitorIds",
-"SELECT 'MonitorIds has already been removed.'"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;

db/zm_update-1.31.17.sql

@@ -1,40 +0,0 @@
-alter table Events modify Id int(10) unsigned;
-alter table Events DROP Primary key;
-alter table Events Add Primary key(Id);
-alter table Events modify Id int(10) unsigned auto_increment;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Storage'
-      AND column_name = 'DiskSpace'
-    ) > 0,
-    "SELECT 'Column DiskSpace already exists in Storage'",
-    "ALTER TABLE Storage ADD `DiskSpace`  BIGINT default null AFTER `Type`"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Storage'
-      AND column_name = 'Scheme'
-    ) > 0,
-    "SELECT 'Column Scheme already exists in Storage'",
-    "ALTER TABLE Storage ADD `Scheme`   enum('Deep','Medium','Shallow') NOT NULL default 'Medium' AFTER `DiskSpace`"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Events'
-      AND column_name = 'Scheme'
-    ) > 0,
-    "SELECT 'Column Scheme already exists in Events'",
-    "ALTER TABLE Events ADD `Scheme`   enum('Deep','Medium','Shallow') NOT NULL default 'Deep' AFTER `DiskSpace`"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;

db/zm_update-1.31.18.sql

@@ -1,23 +0,0 @@
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Storage'
-      AND column_name = 'ServerId'
-    ) > 0,
-    "SELECT 'Column ServerId already exists in Storage'",
-    "ALTER TABLE Storage ADD `ServerId` int(10) unsigned AFTER `Scheme`"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM Filters WHERE Name = 'Update DiskSpace'
-      AND Query = '{"terms":[{"attr":"DiskSpace","op":"IS","val":"NULL"}]}'
-    ) > 0,
-    "SELECT 'Update Disk Space Filter already exists.'",
-    "INSERT INTO Filters (Name,Query,UpdateDiskSpace,Background) values ('Update DiskSpace','{\"terms\":[{\"attr\":\"DiskSpace\",\"op\":\"IS\",\"val\":\"NULL\"}]}',1,1)"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;

db/zm_update-1.31.19.sql

@@ -1,123 +0,0 @@
-drop procedure if exists update_storage_stats;
-
-delimiter //
-
-create procedure update_storage_stats(IN StorageId smallint(5), IN space BIGINT)
-
-sql security invoker
-
-deterministic
-
-begin
-
-  update Storage set DiskSpace = DiskSpace + space where Id = StorageId;
-
-end;
-
-//
-
-delimiter ;
-
-drop trigger if exists event_update_trigger;
-
-delimiter //
-
-create trigger event_update_trigger
-
-after update
-
-on Events
-
-for each row
-
-begin
-    declare diff BIGINT default 0;
-
-    set diff = NEW.DiskSpace - OLD.DiskSpace;
-  IF ( NEW.StorageId = OLD.StorageID ) THEN
-
-    IF ( diff ) THEN
-    call update_storage_stats(OLD.StorageId, diff);
-    END IF;
-  ELSE
-    IF ( NEW.DiskSpace ) THEN
-    call update_storage_stats(NEW.StorageId, NEW.DiskSpace);
-    END IF;
-    IF ( OLD.DiskSpace ) THEN
-    call update_storage_stats(OLD.StorageId, -OLD.DiskSpace);
-    END IF;
-  END IF;
-
-end;
-
-//
-
-delimiter ;
-
-drop trigger if exists event_insert_trigger;
-
-delimiter //
-/*
-create trigger event_insert_trigger
-
-after insert
-
-on Events
-
-for each row
-
-begin
-
-  call update_storage_stats(NEW.StorageId, NEW.DiskSpace);
-
-end;
-*/
-//
-
-delimiter ;
-
-
-drop trigger if exists event_delete_trigger;
-
-delimiter //
-
-create trigger event_delete_trigger
-
-before delete
-
-on Events
-
-for each row
-
-begin
-
-  call update_storage_stats(OLD.StorageId, -OLD.DiskSpace);
-
-end;
-
-//
-
-delimiter ;
-
-set @exist := (select count(*) from information_schema.statistics where table_name = 'Events' and index_name = 'Archived' and table_schema = database());
-set @sqlstmt := if( @exist > 0, 'DROP INDEX Archived ON Events', "SELECT 'Archived INDEX is already removed.'");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-set @exist := (select count(*) from information_schema.statistics where table_name = 'Events' and index_name = 'Frames' and table_schema = database());
-set @sqlstmt := if( @exist > 0, 'DROP INDEX Frames ON Events', "SELECT 'Frames INDEX is already removed.'");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-set @exist := (select count(*) from information_schema.statistics where table_name = 'Events' and index_name = 'Events_StorageId_idx' and table_schema = database());
-set @sqlstmt := if( @exist > 0, "SELECT 'Index Events_StorageId_idx already exists.'", 'CREATE INDEX Events_StorageId_idx on Events (StorageId)');
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-set @exist := (select count(*) from information_schema.statistics where table_name = 'Events' and index_name = 'Events_EndTime_DiskSpace_idx' and table_schema = database());
-set @sqlstmt := if( @exist > 0, "SELECT 'Index Events_EndTime_DiskSpace_idx already exists.'", 'CREATE INDEX Events_EndTime_DiskSpace_idx on Events (EndTime, DiskSpace)');
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-UPDATE Storage SET DiskSpace=(SELECT SUM(DiskSpace) FROM Events WHERE StorageId=Storage.Id);
-

db/zm_update-1.31.2.sql

@@ -1,18 +0,0 @@
---
--- Update Filters table to have a Concurrent Column
---
-
-SELECT 'Checking for Concurrent in Filters';
-SET @s = (SELECT IF(
-  (SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.COLUMNS
-  WHERE table_name = 'Filters'
-  AND table_schema = DATABASE()
-  AND column_name = 'Concurrent'
-  ) > 0,
-"SELECT 'Column Concurrent already exists in Filters'",
-"ALTER TABLE Filters ADD COLUMN `Concurrent` tinyint(1) unsigned NOT NULL default '0' AFTER Background"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;

db/zm_update-1.31.20.sql

@@ -1,275 +0,0 @@
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-      FROM INFORMATION_SCHEMA.TABLES
-      WHERE table_name = 'Events_Hour'
-      AND table_schema = DATABASE()
-    ) > 0,
-    "SELECT 'Events_Hour table exists'",
-    "
-CREATE TABLE `Events_Hour` (
-  `EventId` int(10) unsigned NOT NULL,
-  `MonitorId` int(10) unsigned NOT NULL,
-  `StartTime` datetime default NULL,
-  `DiskSpace`   bigint unsigned default NULL,
-  PRIMARY KEY (`EventId`),
-  KEY `Events_Hour_MonitorId_StartTime_idx` (`MonitorId`,`StartTime`)
-);
-"
-  ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-      FROM INFORMATION_SCHEMA.TABLES
-      WHERE table_name = 'Events_Day'
-      AND table_schema = DATABASE()
-    ) > 0,
-    "SELECT 'Events_Day table exists'",
-    "
-CREATE TABLE `Events_Day` (
-  `EventId` int(10) unsigned NOT NULL,
-  `MonitorId` int(10) unsigned NOT NULL,
-  `StartTime` datetime default NULL,
-  `DiskSpace`   bigint unsigned default NULL,
-  PRIMARY KEY (`EventId`),
-  KEY `Events_Day_MonitorId_StartTime_idx` (`MonitorId`,`StartTime`)
-);
-"));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-      FROM INFORMATION_SCHEMA.TABLES
-      WHERE table_name = 'Events_Week'
-      AND table_schema = DATABASE()
-    ) > 0,
-    "SELECT 'Events_Week table exists'",
-    "
-CREATE TABLE `Events_Week` (
-  `EventId` int(10) unsigned NOT NULL,
-  `MonitorId` int(10) unsigned NOT NULL,
-  `StartTime` datetime default NULL,
-  `DiskSpace`   bigint unsigned default NULL,
-  PRIMARY KEY (`EventId`),
-  KEY `Events_Week_MonitorId_StartTime_idx` (`MonitorId`,`StartTime`)
-);
-"));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-      FROM INFORMATION_SCHEMA.TABLES
-      WHERE table_name = 'Events_Month'
-      AND table_schema = DATABASE()
-    ) > 0,
-    "SELECT 'Events_Month table exists'",
-    "
-CREATE TABLE `Events_Month` (
-  `EventId` int(10) unsigned NOT NULL,
-  `MonitorId` int(10) unsigned NOT NULL,
-  `StartTime` datetime default NULL,
-  `DiskSpace`   bigint unsigned default NULL,
-  PRIMARY KEY (`EventId`),
-  KEY `Events_Month_MonitorId_StartTime_idx` (`MonitorId`,`StartTime`)
-);
-"));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-      FROM INFORMATION_SCHEMA.TABLES
-      WHERE table_name = 'Events_Archived'
-      AND table_schema = DATABASE()
-    ) > 0,
-    "SELECT 'Events_Archived table exists'",
-    "
-CREATE TABLE `Events_Archived` (
-  `EventId` int(10) unsigned NOT NULL,
-  `MonitorId` int(10) unsigned NOT NULL,
-  `DiskSpace`   bigint unsigned default NULL,
-  PRIMARY KEY (`EventId`),
-  KEY `Events_Month_MonitorId_idx` (`MonitorId`)
-);
-"));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-drop trigger if exists event_update_trigger;
-
-delimiter //
-
-CREATE TRIGGER event_update_trigger AFTER UPDATE ON Events 
-FOR EACH ROW
-BEGIN
-    declare diff BIGINT default 0;
-
-    set diff = NEW.DiskSpace - OLD.DiskSpace;
-  IF ( NEW.StorageId = OLD.StorageID ) THEN
-    IF ( diff ) THEN
-      call update_storage_stats(OLD.StorageId, diff);
-    END IF;
-  ELSE
-    IF ( NEW.DiskSpace ) THEN
-      call update_storage_stats(NEW.StorageId, NEW.DiskSpace);
-    END IF;
-    IF ( OLD.DiskSpace ) THEN
-      call update_storage_stats(OLD.StorageId, -OLD.DiskSpace);
-    END IF;
-  END IF;
-
-  UPDATE Events_Hour SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-  UPDATE Events_Day SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-  UPDATE Events_Week SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-  UPDATE Events_Month SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-  IF ( NEW.Archived != OLD.Archived ) THEN
-    IF ( NEW.Archived ) THEN
-      INSERT INTO Events_Archived (EventId,MonitorId,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.DiskSpace);
-      UPDATE Monitors SET ArchivedEvents = ArchivedEvents+1, ArchivedEventDiskSpace = ArchivedEventDiskSpace + NEW.DiskSpace WHERE Id=NEW.MonitorId;
-    ELSEIF ( OLD.Archived ) THEN
-      DELETE FROM Events_Archived WHERE EventId=OLD.Id;
-      UPDATE Monitors SET ArchivedEvents =ArchivedEvents-1, ArchivedEventDiskSpace = ArchivedEventDiskSpace - OLD.DiskSpace WHERE Id=OLD.MonitorId;
-    ELSE
-      IF ( OLD.DiskSpace != NEW.DiskSpace ) THEN
-        UPDATE Events_Archived SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-        UPDATE Monitors SET
-          ArchivedEventDiskSpace = ArchivedEventDiskSpace - OLD.DiskSpace + NEW.DiskSpace
-          WHERE Id=OLD.MonitorId;
-      END IF;
-    END IF;
-  END IF;
-
-  IF ( OLD.DiskSpace != NEW.DiskSpace ) THEN
-    UPDATE Monitors SET TotalEventDiskSpace = TotalEventDiskSpace - OLD.DiskSpace + NEW.DiskSpace WHERE Id=OLD.MonitorId;
-  END IF;
-
-END;
-
-//
-
-delimiter ;
-
-DROP TRIGGER IF EXISTS event_insert_trigger;
-
-delimiter //
-create trigger event_insert_trigger after insert on Events
-for each row
-  begin
-
-  INSERT INTO Events_Hour (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-  INSERT INTO Events_Day (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-  INSERT INTO Events_Week (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-  INSERT INTO Events_Month (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-end;
-//
-
-delimiter ;
-
-
-drop trigger if exists event_delete_trigger;
-
-delimiter //
-
-CREATE TRIGGER event_delete_trigger BEFORE DELETe on Events
-
-FOR EACH ROW
-BEGIN
-  call update_storage_stats(OLD.StorageId, -OLD.DiskSpace);
-  DELETE FROM Events_Hour WHERE EventId=OLD.Id;
-  DELETE FROM Events_Day WHERE EventId=OLD.Id;
-  DELETE FROM Events_Week WHERE EventId=OLD.Id;
-  DELETE FROM Events_Month WHERE EventId=OLD.Id;
-  IF ( OLD.Archived ) THEN
-    DELETE FROM Events_Archived WHERE EventId=OLD.Id;
-    UPDATE Monitors SET
-      ArchivedEvents = ArchivedEvents - 1,
-      ArchivedEventDiskSpace = ArchivedEventDiskSpace - OLD.DiskSpace,
-      TotalEvents = TotalEvents - 1,
-      TotalEventDiskSpace = TotalEventDiskSpace - OLD.DiskSpace
-      WHERE Id=OLD.MonitorId;
-  ELSE
-    UPDATE Monitors SET
-    TotalEvents = TotalEvents-1,
-    TotalEventDiskSpace=TotalEventDiskSpace-OLD.DiskSpace
-    WHERE Id=OLD.MonitorId;
-  END IF;
-END;
-
-//
-
-delimiter ;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Servers'
-      AND column_name = 'zmstats.pl'
-    ) > 0,
-    "SELECT 'Column zmstats.pl already exists in Servers'",
-    "ALTER TABLE Servers ADD `zmstats.pl` BOOLEAN NOT NULL DEFAULT FALSE AFTER `FreeSwap`"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Servers'
-      AND column_name = 'zmaudit.pl'
-    ) > 0,
-    "SELECT 'Column zmaudit.pl already exists in Servers'",
-    "ALTER TABLE Servers ADD `zmaudit.pl` BOOLEAN NOT NULL DEFAULT FALSE AFTER `zmstats.pl`"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Servers'
-      AND column_name = 'zmtrigger.pl'
-    ) > 0,
-    "SELECT 'Column zmtrigger.pl already exists in Servers'",
-    "ALTER TABLE Servers ADD `zmtrigger.pl` BOOLEAN NOT NULL DEFAULT FALSE AFTER `zmaudit.pl`"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-UPDATE Monitors INNER JOIN (
-  SELECT  MonitorId,
-    COUNT(Id) AS TotalEvents,
-    SUM(DiskSpace) AS TotalEventDiskSpace,
-    SUM(IF(Archived,1,0)) AS ArchivedEvents,
-    SUM(IF(Archived,DiskSpace,0)) AS ArchivedEventDiskSpace,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 hour),1,0)) AS HourEvents,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 hour),DiskSpace,0)) AS HourEventDiskSpace,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 day),1,0)) AS DayEvents,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 day),DiskSpace,0)) AS DayEventDiskSpace,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 week),1,0)) AS WeekEvents,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 week),DiskSpace,0)) AS WeekEventDiskSpace,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 month),1,0)) AS MonthEvents,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 month),DiskSpace,0)) AS MonthEventDiskSpace
-    FROM Events GROUP BY MonitorId
-    ) AS E ON E.MonitorId=Monitors.Id SET
-    Monitors.TotalEvents = E.TotalEvents,
-    Monitors.TotalEventDiskSpace = E.TotalEventDiskSpace,
-    Monitors.ArchivedEvents = E.ArchivedEvents,
-    Monitors.ArchivedEventDiskSpace = E.ArchivedEventDiskSpace,
-    Monitors.HourEvents = E.HourEvents,
-    Monitors.HourEventDiskSpace = E.HourEventDiskSpace,
-    Monitors.DayEvents = E.DayEvents,
-    Monitors.DayEventDiskSpace = E.DayEventDiskSpace,
-    Monitors.WeekEvents = E.WeekEvents,
-    Monitors.WeekEventDiskSpace = E.WeekEventDiskSpace,
-    Monitors.MonthEvents = E.MonthEvents,
-    Monitors.MonthEventDiskSpace = E.MonthEventDiskSpace;

db/zm_update-1.31.21.sql

@@ -1,150 +0,0 @@
-delimiter //
-DROP TRIGGER IF EXISTS Zone_Insert_Trigger//
-CREATE TRIGGER Zone_Insert_Trigger AFTER INSERT ON Zones
-FOR EACH ROW
-  BEGIN
-    UPDATE Monitors SET ZoneCount=(SELECT COUNT(*) FROM Zones WHERE MonitorId=NEW.MonitorId) WHERE Id=NEW.MonitorID;
-  END
-//
-
-DROP TRIGGER IF EXISTS Zone_Delete_Trigger//
-CREATE TRIGGER Zone_Delete_Trigger AFTER DELETE ON Zones
-FOR EACH ROW
-  BEGIN
-    UPDATE Monitors SET ZoneCount=(SELECT COUNT(*) FROM Zones WHERE MonitorId=OLD.MonitorId) WHERE Id=OLD.MonitorID;
-  END
-//
-
-UPDATE Monitors SET ZoneCount=(SELECT COUNT(Id) FROM Zones WHERE MonitorId=Monitors.Id)//
-
-drop trigger if exists event_update_trigger//
-
-CREATE TRIGGER event_update_trigger AFTER UPDATE ON Events 
-FOR EACH ROW
-BEGIN
-    declare diff BIGINT default 0;
-
-    set diff = NEW.DiskSpace - OLD.DiskSpace;
-  IF ( NEW.StorageId = OLD.StorageID ) THEN
-    IF ( diff ) THEN
-      call update_storage_stats(OLD.StorageId, diff);
-    END IF;
-  ELSE
-    IF ( NEW.DiskSpace ) THEN
-      call update_storage_stats(NEW.StorageId, NEW.DiskSpace);
-    END IF;
-    IF ( OLD.DiskSpace ) THEN
-      call update_storage_stats(OLD.StorageId, -OLD.DiskSpace);
-    END IF;
-  END IF;
-
-  UPDATE Events_Hour SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-  UPDATE Events_Day SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-  UPDATE Events_Week SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-  UPDATE Events_Month SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-  IF ( NEW.Archived != OLD.Archived ) THEN
-    IF ( NEW.Archived ) THEN
-      INSERT INTO Events_Archived (EventId,MonitorId,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.DiskSpace);
-      UPDATE Monitors SET ArchivedEvents = ArchivedEvents+1, ArchivedEventDiskSpace = ArchivedEventDiskSpace + NEW.DiskSpace WHERE Id=NEW.MonitorId;
-    ELSEIF ( OLD.Archived ) THEN
-      DELETE FROM Events_Archived WHERE EventId=OLD.Id;
-      UPDATE Monitors SET ArchivedEvents =ArchivedEvents-1, ArchivedEventDiskSpace = ArchivedEventDiskSpace - OLD.DiskSpace WHERE Id=OLD.MonitorId;
-    ELSE
-      IF ( OLD.DiskSpace != NEW.DiskSpace ) THEN
-        UPDATE Events_Archived SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-        UPDATE Monitors SET
-          ArchivedEventDiskSpace = ArchivedEventDiskSpace - OLD.DiskSpace + NEW.DiskSpace
-          WHERE Id=OLD.MonitorId;
-      END IF;
-    END IF;
-  END IF;
-
-  IF ( OLD.DiskSpace != NEW.DiskSpace ) THEN
-    UPDATE Monitors SET TotalEventDiskSpace = TotalEventDiskSpace - OLD.DiskSpace + NEW.DiskSpace WHERE Id=OLD.MonitorId;
-  END IF;
-
-END;
-
-//
-
-delimiter ;
-
-DROP TRIGGER IF EXISTS event_insert_trigger;
-
-delimiter //
-create trigger event_insert_trigger after insert on Events
-for each row
-  begin
-
-  INSERT INTO Events_Hour (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-  INSERT INTO Events_Day (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-  INSERT INTO Events_Week (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-  INSERT INTO Events_Month (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-end;
-//
-
-delimiter ;
-
-
-drop trigger if exists event_delete_trigger;
-
-delimiter //
-
-CREATE TRIGGER event_delete_trigger BEFORE DELETe on Events
-
-FOR EACH ROW
-BEGIN
-  call update_storage_stats(OLD.StorageId, -OLD.DiskSpace);
-  DELETE FROM Events_Hour WHERE EventId=OLD.Id;
-  DELETE FROM Events_Day WHERE EventId=OLD.Id;
-  DELETE FROM Events_Week WHERE EventId=OLD.Id;
-  DELETE FROM Events_Month WHERE EventId=OLD.Id;
-  IF ( OLD.Archived ) THEN
-    DELETE FROM Events_Archived WHERE EventId=OLD.Id;
-    UPDATE Monitors SET
-      ArchivedEvents = ArchivedEvents - 1,
-      ArchivedEventDiskSpace = ArchivedEventDiskSpace - OLD.DiskSpace,
-      TotalEvents = TotalEvents - 1,
-      TotalEventDiskSpace = TotalEventDiskSpace - OLD.DiskSpace
-      WHERE Id=OLD.MonitorId;
-  ELSE
-    UPDATE Monitors SET
-    TotalEvents = TotalEvents-1,
-    TotalEventDiskSpace=TotalEventDiskSpace-OLD.DiskSpace
-    WHERE Id=OLD.MonitorId;
-  END IF;
-END;
-
-//
-
-delimiter ;
-
-UPDATE Monitors INNER JOIN (
-  SELECT  MonitorId,
-    COUNT(Id) AS TotalEvents,
-    SUM(DiskSpace) AS TotalEventDiskSpace,
-    SUM(IF(Archived,1,0)) AS ArchivedEvents,
-    SUM(IF(Archived,DiskSpace,0)) AS ArchivedEventDiskSpace,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 hour),1,0)) AS HourEvents,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 hour),DiskSpace,0)) AS HourEventDiskSpace,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 day),1,0)) AS DayEvents,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 day),DiskSpace,0)) AS DayEventDiskSpace,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 week),1,0)) AS WeekEvents,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 week),DiskSpace,0)) AS WeekEventDiskSpace,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 month),1,0)) AS MonthEvents,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 month),DiskSpace,0)) AS MonthEventDiskSpace
-    FROM Events GROUP BY MonitorId
-    ) AS E ON E.MonitorId=Monitors.Id SET
-    Monitors.TotalEvents = E.TotalEvents,
-    Monitors.TotalEventDiskSpace = E.TotalEventDiskSpace,
-    Monitors.ArchivedEvents = E.ArchivedEvents,
-    Monitors.ArchivedEventDiskSpace = E.ArchivedEventDiskSpace,
-    Monitors.HourEvents = E.HourEvents,
-    Monitors.HourEventDiskSpace = E.HourEventDiskSpace,
-    Monitors.DayEvents = E.DayEvents,
-    Monitors.DayEventDiskSpace = E.DayEventDiskSpace,
-    Monitors.WeekEvents = E.WeekEvents,
-    Monitors.WeekEventDiskSpace = E.WeekEventDiskSpace,
-    Monitors.MonthEvents = E.MonthEvents,
-    Monitors.MonthEventDiskSpace = E.MonthEventDiskSpace;
-

db/zm_update-1.31.22.sql

@@ -1,19 +0,0 @@
-delimiter //
-DROP TRIGGER IF EXISTS Zone_Insert_Trigger//
-CREATE TRIGGER Zone_Insert_Trigger AFTER INSERT ON Zones
-FOR EACH ROW
-  BEGIN
-    UPDATE Monitors SET ZoneCount=(SELECT COUNT(*) FROM Zones WHERE MonitorId=NEW.MonitorId) WHERE Id=NEW.MonitorID;
-  END
-//
-
-DROP TRIGGER IF EXISTS Zone_Delete_Trigger//
-CREATE TRIGGER Zone_Delete_Trigger AFTER DELETE ON Zones
-FOR EACH ROW
-  BEGIN
-    UPDATE Monitors SET ZoneCount=(SELECT COUNT(*) FROM Zones WHERE MonitorId=OLD.MonitorId) WHERE Id=OLD.MonitorID;
-  END
-//
-
-UPDATE Monitors SET ZoneCount=(SELECT COUNT(Id) FROM Zones WHERE MonitorId=Monitors.Id)//
-UPDATE Storage SET DiskSpace=(SELECT SUM(DiskSpace) FROM Events WHERE StorageId=Storage.Id);

db/zm_update-1.31.23.sql

@@ -1,88 +0,0 @@
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Servers'
-      AND column_name = 'zmstats.pl'
-    ) > 0 AND ( SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Servers'
-      AND column_name = 'zmstats'
-    ) = 0
-    ,
-    "ALTER TABLE Servers CHANGE COLUMN `zmstats.pl` `zmstats` BOOLEAN NOT NULL DEFAULT FALSE",
-    "SELECT 'zmstats.pl has already been changed to zmstats'"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Servers'
-      AND column_name = 'zmstats.pl'
-    ) > 0,
-    "ALTER TABLE Servers DROP COLUMN `zmstats.pl`",
-    "SELECT 'zmstats.pl has already been removed'"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Servers'
-      AND column_name = 'zmaudit.pl'
-    ) > 0
-    AND 
-    ( SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Servers'
-      AND column_name = 'zmaudit'
-    ) = 0
-    ,
-    "ALTER TABLE Servers CHANGE COLUMN `zmaudit.pl` `zmaudit` BOOLEAN NOT NULL DEFAULT FALSE",
-    "SELECT 'zmaudit.pl has already been changed to zmaudit'"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Servers'
-      AND column_name = 'zmaudit.pl'
-    ) > 0,
-    "ALTER TABLE Servers DROP COLUMN `zmaudit.pl`",
-    "SELECT 'zmaudit.pl has already been removed'"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Servers'
-      AND column_name = 'zmtrigger.pl'
-    ) > 0
-    AND 
-    ( SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Servers'
-      AND column_name = 'zmtrigger'
-    ) = 0
-    ,
-    "ALTER TABLE Servers CHANGE COLUMN `zmtrigger.pl` `zmtrigger` BOOLEAN NOT NULL DEFAULT FALSE",
-    "SELECT 'zmtrigger.pl has already been changed to zmtrigger'"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Servers'
-      AND column_name = 'zmtrigger.pl'
-    ) > 0,
-    "ALTER TABLE Servers DROP COLUMN `zmtrigger.pl`",
-    "SELECT 'zmtrigger.pl has already been removed'"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;

db/zm_update-1.31.24.sql

@@ -1,61 +0,0 @@
-
-set @exist := (select count(*) from information_schema.statistics where table_name = 'Events_Hour' and index_name = 'Events_Hour_MonitorId_StartTime_idx' and table_schema = database());
-set @sqlstmt := if( @exist > 0, 'DROP INDEX Events_Hour_MonitorId_StartTime_idx ON Events_Hour', "SELECT 'Events_Hour_MonitorId_StartTime_idx INDEX is already removed.'");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-set @exist := (select count(*) from information_schema.statistics where table_name = 'Events_Hour' and index_name = 'Events_Hour_MonitorId_idx' and table_schema = database());
-set @sqlstmt := if( @exist > 0, "SELECT 'Events_Hour_MonitorId_idx INDEX already exists.'", "CREATE INDEX `Events_Hour_MonitorId_idx` ON `Events_Hour` (`MonitorId`)");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-set @exist := (select count(*) from information_schema.statistics where table_name = 'Events_Hour' and index_name = 'Events_Hour_StartTime_idx' and table_schema = database());
-set @sqlstmt := if( @exist > 0, "SELECT 'Events_Hour_StartTime_idx INDEX already exists.'", "CREATE INDEX `Events_Hour_StartTime_idx` ON `Events_Hour` (`StartTime`)");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-set @exist := (select count(*) from information_schema.statistics where table_name = 'Events_Day' and index_name = 'Events_Day_MonitorId_StartTime_idx' and table_schema = database());
-set @sqlstmt := if( @exist > 0, 'DROP INDEX Events_Day_MonitorId_StartTime_idx ON Events_Day', "SELECT 'Events_Day_MonitorId_StartTime_idx INDEX is already removed.'");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-set @exist := (select count(*) from information_schema.statistics where table_name = 'Events_Day' and index_name = 'Events_Day_MonitorId_idx' and table_schema = database());
-set @sqlstmt := if( @exist > 0, "SELECT 'Events_Day_MonitorId_idx INDEX already exists.'", "CREATE INDEX `Events_Day_MonitorId_idx` ON `Events_Day` (`MonitorId`)");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-set @exist := (select count(*) from information_schema.statistics where table_name = 'Events_Day' and index_name = 'Events_Day_StartTime_idx' and table_schema = database());
-set @sqlstmt := if( @exist > 0, "SELECT 'Events_Day_StartTime_idx INDEX already exists.'", "CREATE INDEX `Events_Day_StartTime_idx` ON `Events_Day` (`StartTime`)");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-set @exist := (select count(*) from information_schema.statistics where table_name = 'Events_Week' and index_name = 'Events_Week_MonitorId_StartTime_idx' and table_schema = database());
-set @sqlstmt := if( @exist > 0, 'DROP INDEX Events_Week_MonitorId_StartTime_idx ON Events_Week', "SELECT 'Events_Week_MonitorId_StartTime_idx INDEX is already removed.'");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-set @exist := (select count(*) from information_schema.statistics where table_name = 'Events_Week' and index_name = 'Events_Week_MonitorId_idx' and table_schema = database());
-set @sqlstmt := if( @exist > 0, "SELECT 'Events_Week_MonitorId_idx INDEX already exists.'", "CREATE INDEX `Events_Week_MonitorId_idx` ON `Events_Week` (`MonitorId`)");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-set @exist := (select count(*) from information_schema.statistics where table_name = 'Events_Week' and index_name = 'Events_Week_StartTime_idx' and table_schema = database());
-set @sqlstmt := if( @exist > 0, "SELECT 'Events_Week_StartTime_idx INDEX already exists.'", "CREATE INDEX `Events_Week_StartTime_idx` ON `Events_Week` (`StartTime`)");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-
-set @exist := (select count(*) from information_schema.statistics where table_name = 'Events_Month' and index_name = 'Events_Month_MonitorId_StartTime_idx' and table_schema = database());
-set @sqlstmt := if( @exist > 0, 'DROP INDEX Events_Month_MonitorId_StartTime_idx ON Events_Month', "SELECT 'Events_Month_MonitorId_StartTime_idx INDEX is already removed.'");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-set @exist := (select count(*) from information_schema.statistics where table_name = 'Events_Month' and index_name = 'Events_Month_MonitorId_idx' and table_schema = database());
-set @sqlstmt := if( @exist > 0, "SELECT 'Events_Month_MonitorId_idx INDEX already exists.'", "CREATE INDEX `Events_Month_MonitorId_idx` ON `Events_Month` (`MonitorId`)");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-set @exist := (select count(*) from information_schema.statistics where table_name = 'Events_Month' and index_name = 'Events_Month_StartTime_idx' and table_schema = database());
-set @sqlstmt := if( @exist > 0, "SELECT 'Events_Month_StartTime_idx INDEX already exists.'", "CREATE INDEX `Events_Month_StartTime_idx` ON `Events_Month` (`StartTime`)");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;

db/zm_update-1.31.25.sql

@@ -1,45 +0,0 @@
-delimiter //
-
-DROP TRIGGER IF EXISTS event_insert_trigger//
-
-create trigger event_insert_trigger after insert on Events
-for each row
-  begin
-
-  INSERT INTO Events_Hour (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-  INSERT INTO Events_Day (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-  INSERT INTO Events_Week (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-  INSERT INTO Events_Month (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-  UPDATE Monitors SET TotalEvents = TotalEvents+1 WHERE Id=NEW.MonitorId;
-end;
-//
-
-UPDATE Monitors INNER JOIN (
-  SELECT  MonitorId,
-    COUNT(Id) AS TotalEvents,
-    SUM(DiskSpace) AS TotalEventDiskSpace,
-    SUM(IF(Archived,1,0)) AS ArchivedEvents,
-    SUM(IF(Archived,DiskSpace,0)) AS ArchivedEventDiskSpace,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 hour),1,0)) AS HourEvents,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 hour),DiskSpace,0)) AS HourEventDiskSpace,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 day),1,0)) AS DayEvents,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 day),DiskSpace,0)) AS DayEventDiskSpace,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 week),1,0)) AS WeekEvents,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 week),DiskSpace,0)) AS WeekEventDiskSpace,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 month),1,0)) AS MonthEvents,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 month),DiskSpace,0)) AS MonthEventDiskSpace
-    FROM Events GROUP BY MonitorId
-    ) AS E ON E.MonitorId=Monitors.Id SET
-    Monitors.TotalEvents = E.TotalEvents,
-    Monitors.TotalEventDiskSpace = E.TotalEventDiskSpace,
-    Monitors.ArchivedEvents = E.ArchivedEvents,
-    Monitors.ArchivedEventDiskSpace = E.ArchivedEventDiskSpace,
-    Monitors.HourEvents = E.HourEvents,
-    Monitors.HourEventDiskSpace = E.HourEventDiskSpace,
-    Monitors.DayEvents = E.DayEvents,
-    Monitors.DayEventDiskSpace = E.DayEventDiskSpace,
-    Monitors.WeekEvents = E.WeekEvents,
-    Monitors.WeekEventDiskSpace = E.WeekEventDiskSpace,
-    Monitors.MonthEvents = E.MonthEvents,
-    Monitors.MonthEventDiskSpace = E.MonthEventDiskSpace//
-

db/zm_update-1.31.26.sql

@@ -1,95 +0,0 @@
-delimiter //
-DROP TRIGGER IF EXISTS event_update_trigger;
-
-CREATE TRIGGER event_update_trigger AFTER UPDATE ON Events
-FOR EACH ROW
-BEGIN
-    declare diff BIGINT default 0;
-
-    set diff = NEW.DiskSpace - OLD.DiskSpace;
-  IF ( NEW.StorageId = OLD.StorageID ) THEN
-    IF ( diff ) THEN
-      call update_storage_stats(OLD.StorageId, diff);
-    END IF;
-  ELSE
-    IF ( NEW.DiskSpace ) THEN
-      call update_storage_stats(NEW.StorageId, NEW.DiskSpace);
-    END IF;
-    IF ( OLD.DiskSpace ) THEN
-      call update_storage_stats(OLD.StorageId, -OLD.DiskSpace);
-    END IF;
-  END IF;
-
-  UPDATE Events_Hour SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-  UPDATE Events_Day SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-  UPDATE Events_Week SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-  UPDATE Events_Month SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-  IF ( NEW.Archived != OLD.Archived ) THEN
-    IF ( NEW.Archived ) THEN
-      INSERT INTO Events_Archived (EventId,MonitorId,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.DiskSpace);
-      UPDATE Monitors SET ArchivedEvents = COALESCE(ArchivedEvents,0)+1, ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) + COALESCE(NEW.DiskSpace,0) WHERE Id=NEW.MonitorId;
-    ELSEIF ( OLD.Archived ) THEN
-      DELETE FROM Events_Archived WHERE EventId=OLD.Id;
-      UPDATE Monitors SET ArchivedEvents = COALESCE(ArchivedEvents,0)-1, ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) WHERE Id=OLD.MonitorId;
-    ELSE
-      IF ( OLD.DiskSpace != NEW.DiskSpace ) THEN
-        UPDATE Events_Archived SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-        UPDATE Monitors SET
-          ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0)
-          WHERE Id=OLD.MonitorId;
-      END IF;
-    END IF;
-  END IF;
-
-  IF ( OLD.DiskSpace != NEW.DiskSpace ) THEN
-    UPDATE Monitors SET TotalEventDiskSpace = COALESCE(TotalEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0) WHERE Id=OLD.MonitorId;
-  END IF;
-
-END;
-
-//
-
-DROP TRIGGER IF EXISTS event_insert_trigger;
-
-create trigger event_insert_trigger after insert on Events
-for each row
-  begin
-
-  INSERT INTO Events_Hour (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-  INSERT INTO Events_Day (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-  INSERT INTO Events_Week (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-  INSERT INTO Events_Month (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-  UPDATE Monitors SET TotalEvents = COALESCE(TotalEvents,0)+1 WHERE Id=NEW.MonitorId;
-end;
-//
-
-UPDATE Monitors INNER JOIN (
-  SELECT  MonitorId,
-    COUNT(Id) AS TotalEvents,
-    SUM(DiskSpace) AS TotalEventDiskSpace,
-    SUM(IF(Archived,1,0)) AS ArchivedEvents,
-    SUM(IF(Archived,DiskSpace,0)) AS ArchivedEventDiskSpace,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 hour),1,0)) AS HourEvents,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 hour),DiskSpace,0)) AS HourEventDiskSpace,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 day),1,0)) AS DayEvents,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 day),DiskSpace,0)) AS DayEventDiskSpace,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 week),1,0)) AS WeekEvents,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 week),DiskSpace,0)) AS WeekEventDiskSpace,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 month),1,0)) AS MonthEvents,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 month),DiskSpace,0)) AS MonthEventDiskSpace
-    FROM Events GROUP BY MonitorId
-    ) AS E ON E.MonitorId=Monitors.Id SET
-    Monitors.TotalEvents = E.TotalEvents,
-    Monitors.TotalEventDiskSpace = E.TotalEventDiskSpace,
-    Monitors.ArchivedEvents = E.ArchivedEvents,
-    Monitors.ArchivedEventDiskSpace = E.ArchivedEventDiskSpace,
-    Monitors.HourEvents = E.HourEvents,
-    Monitors.HourEventDiskSpace = E.HourEventDiskSpace,
-    Monitors.DayEvents = E.DayEvents,
-    Monitors.DayEventDiskSpace = E.DayEventDiskSpace,
-    Monitors.WeekEvents = E.WeekEvents,
-    Monitors.WeekEventDiskSpace = E.WeekEventDiskSpace,
-    Monitors.MonthEvents = E.MonthEvents,
-    Monitors.MonthEventDiskSpace = E.MonthEventDiskSpace//
-
-

db/zm_update-1.31.27.sql

@@ -1,100 +0,0 @@
-delimiter //
-DROP TRIGGER IF EXISTS event_update_trigger;
-
-CREATE TRIGGER event_update_trigger AFTER UPDATE ON Events
-FOR EACH ROW
-BEGIN
-    declare diff BIGINT default 0;
-
-    set diff = NEW.DiskSpace - OLD.DiskSpace;
-  IF ( NEW.StorageId = OLD.StorageID ) THEN
-    IF ( diff ) THEN
-      call update_storage_stats(OLD.StorageId, diff);
-    END IF;
-  ELSE
-    IF ( NEW.DiskSpace ) THEN
-      call update_storage_stats(NEW.StorageId, NEW.DiskSpace);
-    END IF;
-    IF ( OLD.DiskSpace ) THEN
-      call update_storage_stats(OLD.StorageId, -OLD.DiskSpace);
-    END IF;
-  END IF;
-
-  UPDATE Events_Hour SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-  UPDATE Events_Day SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-  UPDATE Events_Week SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-  UPDATE Events_Month SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-  IF ( NEW.Archived != OLD.Archived ) THEN
-    IF ( NEW.Archived ) THEN
-      INSERT INTO Events_Archived (EventId,MonitorId,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.DiskSpace);
-      UPDATE Monitors SET ArchivedEvents = COALESCE(ArchivedEvents,0)+1, ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) + COALESCE(NEW.DiskSpace,0) WHERE Id=NEW.MonitorId;
-    ELSEIF ( OLD.Archived ) THEN
-      DELETE FROM Events_Archived WHERE EventId=OLD.Id;
-      UPDATE Monitors SET ArchivedEvents = COALESCE(ArchivedEvents,0)-1, ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) WHERE Id=OLD.MonitorId;
-    ELSE
-      IF ( OLD.DiskSpace != NEW.DiskSpace ) THEN
-        UPDATE Events_Archived SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-        UPDATE Monitors SET
-          ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0)
-          WHERE Id=OLD.MonitorId;
-      END IF;
-    END IF;
-  END IF;
-
-  IF ( 
-    ( (OLD.DiskSpace IS NOT NULL) AND (NEW.DiskSpace IS NULL) )
-    OR
-    ( (OLD.DiskSpace IS NULL) AND (NEW.DiskSpace IS NOT NULL) )
-    OR ( OLD.DiskSpace != NEW.DiskSpace ) 
-    ) THEN
-    UPDATE Monitors SET TotalEventDiskSpace = COALESCE(TotalEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0) WHERE Id=OLD.MonitorId;
-  END IF;
-
-END;
-
-//
-
-DROP TRIGGER IF EXISTS event_insert_trigger;
-
-create trigger event_insert_trigger after insert on Events
-for each row
-  begin
-
-  INSERT INTO Events_Hour (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-  INSERT INTO Events_Day (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-  INSERT INTO Events_Week (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-  INSERT INTO Events_Month (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-  UPDATE Monitors SET TotalEvents = COALESCE(TotalEvents,0)+1 WHERE Id=NEW.MonitorId;
-end;
-//
-
-UPDATE Monitors INNER JOIN (
-  SELECT  MonitorId,
-    COUNT(Id) AS TotalEvents,
-    SUM(DiskSpace) AS TotalEventDiskSpace,
-    SUM(IF(Archived,1,0)) AS ArchivedEvents,
-    SUM(IF(Archived,DiskSpace,0)) AS ArchivedEventDiskSpace,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 hour),1,0)) AS HourEvents,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 hour),DiskSpace,0)) AS HourEventDiskSpace,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 day),1,0)) AS DayEvents,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 day),DiskSpace,0)) AS DayEventDiskSpace,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 week),1,0)) AS WeekEvents,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 week),DiskSpace,0)) AS WeekEventDiskSpace,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 month),1,0)) AS MonthEvents,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 month),DiskSpace,0)) AS MonthEventDiskSpace
-    FROM Events GROUP BY MonitorId
-    ) AS E ON E.MonitorId=Monitors.Id SET
-    Monitors.TotalEvents = E.TotalEvents,
-    Monitors.TotalEventDiskSpace = E.TotalEventDiskSpace,
-    Monitors.ArchivedEvents = E.ArchivedEvents,
-    Monitors.ArchivedEventDiskSpace = E.ArchivedEventDiskSpace,
-    Monitors.HourEvents = E.HourEvents,
-    Monitors.HourEventDiskSpace = E.HourEventDiskSpace,
-    Monitors.DayEvents = E.DayEvents,
-    Monitors.DayEventDiskSpace = E.DayEventDiskSpace,
-    Monitors.WeekEvents = E.WeekEvents,
-    Monitors.WeekEventDiskSpace = E.WeekEventDiskSpace,
-    Monitors.MonthEvents = E.MonthEvents,
-    Monitors.MonthEventDiskSpace = E.MonthEventDiskSpace//
-
-

db/zm_update-1.31.28.sql

@@ -1,57 +0,0 @@
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Monitor_Status'
-    ) > 0
-    ,
-    "SELECT 'Monitor_Status Already exists'",
-    "
-CREATE TABLE `Monitor_Status` (
-  `Id` int(10) unsigned NOT NULL,
-  `Status`  enum('Unknown','NotRunning','Running','NoSignal','Signal') NOT NULL default 'Unknown',
-  `CaptureFPS`  DECIMAL(10,2) NOT NULL default 0,
-  `AnalysisFPS`  DECIMAL(5,2) NOT NULL default 0,
-  PRIMARY KEY (`Id`)
-) ENGINE=MEMORY"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Monitors'
-      AND column_name = 'Status'
-    ) > 0
-    ,
-    "ALTER TABLE Monitors DROP COLUMN Status",
-    "SELECT 'Monitor Status already removed.'"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Monitors'
-      AND column_name = 'CaptureFPS'
-    ) > 0
-    ,
-    "ALTER TABLE Monitors DROP COLUMN CaptureFPS",
-    "SELECT 'Monitor CaptureFPS already removed.'"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Monitors'
-      AND column_name = 'AnalysisFPS'
-    ) > 0
-    ,
-    "ALTER TABLE Monitors DROP COLUMN AnalysisFPS",
-    "SELECT 'Monitor AnalysisFPS already removed.'"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;

db/zm_update-1.31.29.sql

@@ -1,8 +0,0 @@
-DROP TABLE IF EXISTS `Monitor_Status`;
-CREATE TABLE `Monitor_Status` (
-  `MonitorId` int(10) unsigned NOT NULL,
-  `Status`  enum('Unknown','NotRunning','Running','NoSignal','Signal') NOT NULL default 'Unknown',
-  `CaptureFPS`  DECIMAL(10,2) NOT NULL default 0,
-  `AnalysisFPS`  DECIMAL(5,2) NOT NULL default 0,
-  PRIMARY KEY (`MonitorId`)
-) ENGINE=MEMORY;

db/zm_update-1.31.3.sql

@@ -1,146 +0,0 @@
---
--- This adds StorageAreas
---
-
-SELECT 'Checking For Storage Table';
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-    FROM INFORMATION_SCHEMA.TABLES
-    WHERE table_name = 'Storage'
-    AND table_schema = DATABASE()
-    ) > 0,
-"SELECT 'Storage table exists'",
-"CREATE TABLE `Storage` (
-    `Id`    smallint(5) unsigned NOT NULL auto_increment,
-    `Path`  varchar(64) NOT NULL default '',
-    `Name`  varchar(64) NOT NULL default '',
-    PRIMARY KEY (`Id`)
-)"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
---
--- Add StorageId column to Monitors
---
-
-SELECT 'Checking For StorageId in Monitors';
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-    FROM INFORMATION_SCHEMA.COLUMNS
-    WHERE table_name = 'Monitors'
-    AND table_schema = DATABASE()
-    AND column_name = 'StorageId'
-    ) > 0,
-"SELECT 'Column StorageId exists in Monitors'",
-"ALTER TABLE Monitors ADD `StorageId` smallint(5) unsigned NOT NULL default 0 AFTER `ServerId`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
---
--- Add StorageId column to Eventss
---
-
-SELECT 'Checking For StorageId in Events';
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-    FROM INFORMATION_SCHEMA.COLUMNS
-    WHERE table_name = 'Events'
-    AND table_schema = DATABASE()
-    AND column_name = 'StorageId'
-    ) > 0,
-"SELECT 'Column StorageId exists in Events'",
-"ALTER TABLE Events ADD `StorageId` smallint(5) unsigned NOT NULL default 0 AFTER `MonitorId`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SELECT 'Updating Monitors SETTING StorageId to default';
-UPDATE Monitors SET StorageId = 0 WHERE StorageId IS NULL;
-ALTER TABLE Monitors MODIFY `StorageId`	smallint(5) unsigned NOT NULL default 0;
-UPDATE Events SET StorageId = 0 WHERE StorageId IS NULL;
-ALTER TABLE Events MODIFY `StorageId`	smallint(5) unsigned NOT NULL default 0;
-
-SET @s = (SELECT IF(
-  (SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.COLUMNS
-  WHERE table_name = 'Events'
-  AND table_schema = DATABASE()
-  AND column_name = 'Orientation'
-  ) > 0,
-"SELECT 'Column Orientation exists in Events'",
-"ALTER TABLE `Events` ADD `Orientation`  enum('0','90','180','270','hori','vert') NOT NULL default '0' AFTER `Notes`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
---
--- Update Monitors table to have an Index on ServerId
---
-SELECT 'Create Index For ServerId on Monitors';
-SET @s = (SELECT IF(
-  (SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.STATISTICS
-  WHERE table_name = 'Monitors'
-  AND table_schema = DATABASE()
-  AND index_name = 'Monitors_ServerId_idx'
-  ) > 0,
-"SELECT 'Monitors_ServerId Index already exists on Monitors table'",
-"CREATE INDEX `Monitors_ServerId_idx` ON `Monitors` (`ServerId`)"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-
---
--- Update Server table to have an Index on Name
---
-SELECT 'Create Index FOR Name on Servers';
-SET @s = (SELECT IF(
-  (SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.STATISTICS
-  WHERE table_name = 'Servers'
-  AND table_schema = DATABASE()
-  AND index_name = 'Servers_Name_idx'
-  ) > 0,
-"SELECT 'Servers_Name Index already exists on Servers table'",
-"CREATE INDEX `Servers_Name_idx` ON `Servers` (`Name`)"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-
-SELECT 'ALTER TABLE Logs MODIFY Message TEXT NOT NULL';
--- ALTER TABLE Logs ALTER  Message DROP DEFAULT;
-ALTER TABLE Logs MODIFY Message TEXT NOT NULL;
-
-SELECT 'ALTER TABLE Config MODIFY DefaultValue TEXT';
-ALTER TABLE Config MODIFY DefaultValue TEXT;
-
-
--- 
--- Add an Id column and make it the primary key of the Filters table
---
-
-SELECT 'Check for Id column in Filter';
-SET @s = (SELECT IF(
-  (SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.COLUMNS
-  WHERE table_name = 'Filters'
-  AND table_schema = DATABASE()
-  AND column_name = 'Id'
-  ) > 0,
-"SELECT 'Column Id exists in Filters'",
-"ALTER TABLE `Filters` DROP PRIMARY KEY, ADD `Id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY FIRST, ADD KEY `Name` (`Name`);"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-

db/zm_update-1.31.30.sql.in

@@ -1,20 +0,0 @@
-DROP TABLE IF EXISTS `Monitor_Status`;
-CREATE TABLE `Monitor_Status` (
-  `MonitorId` int(10) unsigned NOT NULL,
-  `Status`  enum('Unknown','NotRunning','Running','Connected','Signal') NOT NULL default 'Unknown',
-  `CaptureFPS`  DECIMAL(10,2) NOT NULL default 0,
-  `AnalysisFPS`  DECIMAL(5,2) NOT NULL default 0,
-  PRIMARY KEY (`MonitorId`)
-) ENGINE=MEMORY;
-
-SET SESSION sql_mode='NO_AUTO_VALUE_ON_ZERO';
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM Storage WHERE Name = 'Default' AND Id=0 AND Path='@ZM_DIR_EVENTS@'
-    ) > 0,
-    "SELECT 'Default Storage Area already exists.'",
-    "INSERT INTO Storage (Id,Name,Path,Scheme,ServerId) VALUES (0,'Default','@ZM_DIR_EVENTS@','Medium',NULL)"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;

db/zm_update-1.31.31.sql

@@ -1 +0,0 @@
-ALTER TABLE Storage MODIFY DiskSpace BIGINT default NULL;

db/zm_update-1.31.32.sql

@@ -1,3 +0,0 @@
-ALTER TABLE Monitors MODIFY TotalEventDiskSpace BIGINT default NULL;
-ALTER TABLE Monitors MODIFY Method VARCHAR(16) default NULL;
-

db/zm_update-1.31.33.sql

@@ -1,31 +0,0 @@
-drop trigger if exists event_delete_trigger;
-
-delimiter //
-
-CREATE TRIGGER event_delete_trigger BEFORE DELETe on Events
-
-FOR EACH ROW
-  BEGIN
-    call update_storage_stats(OLD.StorageId, -OLD.DiskSpace);
-    DELETE FROM Events_Hour WHERE EventId=OLD.Id;
-    DELETE FROM Events_Day WHERE EventId=OLD.Id;
-    DELETE FROM Events_Week WHERE EventId=OLD.Id;
-    DELETE FROM Events_Month WHERE EventId=OLD.Id;
-    IF ( OLD.Archived ) THEN
-      DELETE FROM Events_Archived WHERE EventId=OLD.Id;
-      UPDATE Monitors SET
-      ArchivedEvents = ArchivedEvents - 1,
-      ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0),
-      TotalEvents = TotalEvents - 1,
-      TotalEventDiskSpace = COALESCE(TotalEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0)
-      WHERE Id=OLD.MonitorId;
-    ELSE
-      UPDATE Monitors SET
-      TotalEvents = TotalEvents-1,
-      TotalEventDiskSpace=COALESCE(TotalEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
-      WHERE Id=OLD.MonitorId;
-  END IF;
-END;
-
-//
-

db/zm_update-1.31.34.sql

@@ -1,62 +0,0 @@
-delimiter //
-
-DROP TRIGGER IF EXISTS Events_Hour_delete_trigger//
-CREATE TRIGGER Events_Hour_delete_trigger BEFORE DELETE ON Events_Hour
-FOR EACH ROW BEGIN
-  UPDATE Monitors SET
-  HourEvents = COALESCE(HourEvents,1)-1,
-  HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
-  WHERE Id=OLD.MonitorId;
-END;
-//
-
-DROP TRIGGER IF EXISTS Events_Day_delete_trigger//
-CREATE TRIGGER Events_Day_delete_trigger BEFORE DELETE ON Events_Day
-FOR EACH ROW BEGIN
-  UPDATE Monitors SET
-  DayEvents = COALESCE(DayEvents,1)-1,
-  DayEventDiskSpace=COALESCE(DayEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
-  WHERE Id=OLD.MonitorId;
-END;
-//
-
-DROP TRIGGER IF EXISTS Events_Week_delete_trigger//
-CREATE TRIGGER Events_Week_delete_trigger BEFORE DELETE ON Events_Week
-FOR EACH ROW BEGIN
-  UPDATE Monitors SET
-  WeekEvents = COALESCE(WeekEvents,1)-1,
-  WeekEventDiskSpace=COALESCE(WeekEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
-  WHERE Id=OLD.MonitorId;
-END;
-//
-
-DROP TRIGGER IF EXISTS Events_Month_delete_trigger//
-CREATE TRIGGER Events_Month_delete_trigger BEFORE DELETE ON Events_Month
-FOR EACH ROW BEGIN
-  UPDATE Monitors SET
-  MonthEvents = COALESCE(MonthEvents,1)-1,
-  MonthEventDiskSpace=COALESCE(MonthEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
-  WHERE Id=OLD.MonitorId;
-END;
-//
-
-DROP TRIGGER IF EXISTS event_insert_trigger//
-
-CREATE TRIGGER event_insert_trigger AFTER INSERT ON Events
-FOR EACH ROW
-  BEGIN
-    INSERT INTO Events_Hour (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-    INSERT INTO Events_Day (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-    INSERT INTO Events_Week (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-    INSERT INTO Events_Month (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-    UPDATE Monitors SET
-    HourEvents = COALESCE(HourEvents,0)+1,
-    DayEvents = COALESCE(DayEvents,0)+1,
-    WeekEvents = COALESCE(WeekEvents,0)+1,
-    MonthEvents = COALESCE(MonthEvents,0)+1,
-    TotalEvents = COALESCE(TotalEvents,0)+1
-    WHERE Id=NEW.MonitorId;
-  END;
-  //
-
-

db/zm_update-1.31.35.sql

@@ -1,140 +0,0 @@
-delimiter //
-
-DROP TRIGGER IF EXISTS Events_Hour_delete_trigger//
-CREATE TRIGGER Events_Hour_delete_trigger BEFORE DELETE ON Events_Hour
-FOR EACH ROW BEGIN
-  UPDATE Monitors SET
-  HourEvents = COALESCE(HourEvents,1)-1,
-  HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
-  WHERE Id=OLD.MonitorId;
-END;
-//
-
-DROP TRIGGER IF EXISTS Events_Hour_update_trigger;
-CREATE TRIGGER Events_Hour_update_trigger AFTER UPDATE ON Events_Hour
-FOR EACH ROW
-  BEGIN
-    declare diff BIGINT default 0;
-
-    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
-    IF ( diff ) THEN
-      UPDATE Monitors SET HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)+diff WHERE Monitors.Id=MonitorId;
-    END IF;
-END;
-//
-
-DROP TRIGGER IF EXISTS Events_Day_delete_trigger//
-CREATE TRIGGER Events_Day_delete_trigger BEFORE DELETE ON Events_Day
-FOR EACH ROW BEGIN
-  UPDATE Monitors SET
-  DayEvents = COALESCE(DayEvents,1)-1,
-  DayEventDiskSpace=COALESCE(DayEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
-  WHERE Id=OLD.MonitorId;
-END;
-//
-
-DROP TRIGGER IF EXISTS Events_Day_update_trigger;
-CREATE TRIGGER Events_Day_update_trigger AFTER UPDATE ON Events_Day
-FOR EACH ROW
-  BEGIN
-    declare diff BIGINT default 0;
-
-    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
-    IF ( diff ) THEN
-      UPDATE Monitors SET DayEventDiskSpace=COALESCE(DayEventDiskSpace,0)+diff WHERE Monitors.Id=MonitorId;
-    END IF;
-END;
-//
-
-DROP TRIGGER IF EXISTS Events_Week_delete_trigger//
-CREATE TRIGGER Events_Week_delete_trigger BEFORE DELETE ON Events_Week
-FOR EACH ROW BEGIN
-  UPDATE Monitors SET
-  WeekEvents = COALESCE(WeekEvents,1)-1,
-  WeekEventDiskSpace=COALESCE(WeekEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
-  WHERE Id=OLD.MonitorId;
-END;
-//
-
-DROP TRIGGER IF EXISTS Events_Week_update_trigger;
-CREATE TRIGGER Events_Week_update_trigger AFTER UPDATE ON Events_Week
-FOR EACH ROW
-  BEGIN
-    declare diff BIGINT default 0;
-
-    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
-    IF ( diff ) THEN
-      UPDATE Monitors SET WeekEventDiskSpace=COALESCE(WeekEventDiskSpace,0)+diff WHERE Monitors.Id=MonitorId;
-    END IF;
-END;
-//
-
-DROP TRIGGER IF EXISTS Events_Month_delete_trigger//
-CREATE TRIGGER Events_Month_delete_trigger BEFORE DELETE ON Events_Month
-FOR EACH ROW BEGIN
-  UPDATE Monitors SET
-  MonthEvents = COALESCE(MonthEvents,1)-1,
-  MonthEventDiskSpace=COALESCE(MonthEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
-  WHERE Id=OLD.MonitorId;
-END;
-//
-
-DROP TRIGGER IF EXISTS Events_Month_update_trigger;
-CREATE TRIGGER Events_Month_update_trigger AFTER UPDATE ON Events_Month
-FOR EACH ROW
-  BEGIN
-    declare diff BIGINT default 0;
-
-    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
-    IF ( diff ) THEN
-      UPDATE Monitors SET MonthEventDiskSpace=COALESCE(MonthEventDiskSpace,0)+diff WHERE Monitors.Id=MonitorId;
-    END IF;
-END;
-//
-
-DROP TRIGGER IF EXISTS event_insert_trigger//
-
-CREATE TRIGGER event_insert_trigger AFTER INSERT ON Events
-FOR EACH ROW
-  BEGIN
-    INSERT INTO Events_Hour (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-    INSERT INTO Events_Day (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-    INSERT INTO Events_Week (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-    INSERT INTO Events_Month (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-    UPDATE Monitors SET
-    HourEvents = COALESCE(HourEvents,0)+1,
-    DayEvents = COALESCE(DayEvents,0)+1,
-    WeekEvents = COALESCE(WeekEvents,0)+1,
-    MonthEvents = COALESCE(MonthEvents,0)+1,
-    TotalEvents = COALESCE(TotalEvents,0)+1
-    WHERE Id=NEW.MonitorId;
-  END;
-  //
-
-delimiter ;
-SET @s = (SELECT IF(
-  (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-    AND table_name = 'Events'
-    AND column_name = 'Scheme'
-  ) > 0,
-  "SELECT 'Column Scheme already exists in Events'",
-  "ALTER TABLE Events ADD `Scheme`   enum('Deep','Medium','Shallow') NOT NULL default 'Deep' AFTER `DiskSpace`"
-  ));
-
-  PREPARE stmt FROM @s;
-  EXECUTE stmt;
-
-
-UPDATE Monitors SET
-TotalEvents=(SELECT COUNT(Id) FROM Events WHERE MonitorId=Monitors.Id),
-TotalEventDiskSpace=(SELECT SUM(DiskSpace) FROM Events WHERE MonitorId=Monitors.Id AND DiskSpace IS NOT NULL),
-HourEvents=(SELECT COUNT(Id) FROM Events WHERE MonitorId=Monitors.Id AND StartTime > DATE_SUB( NOW(), INTERVAL 1 hour) ),
-HourEventDiskSpace=(SELECT SUM(DiskSpace) FROM Events WHERE MonitorId=Monitors.Id AND StartTime > DATE_SUB(NOW(), INTERVAL 1 hour) AND DiskSpace IS NOT NULL),
-DayEvents=(SELECT COUNT(Id) FROM Events WHERE MonitorId=Monitors.Id AND StartTime > DATE_SUB(NOW(), INTERVAL 1 day)),
-DayEventDiskSpace=(SELECT SUM(DiskSpace) FROM Events WHERE MonitorId=Monitors.Id AND StartTime > DATE_SUB(NOW(), INTERVAL 1 day) AND DiskSpace IS NOT NULL),
-WeekEvents=(SELECT COUNT(Id) FROM Events WHERE MonitorId=Monitors.Id AND StartTime > DATE_SUB(NOW(), INTERVAL 1 week)),
-WeekEventDiskSpace=(SELECT SUM(DiskSpace) FROM Events WHERE MonitorId=Monitors.Id AND StartTime > DATE_SUB(NOW(), INTERVAL 1 week) AND DiskSpace IS NOT NULL),
-MonthEvents=(SELECT COUNT(Id) FROM Events WHERE MonitorId=Monitors.Id AND StartTime > DATE_SUB( NOW(), INTERVAL 1 month)),
-MonthEventDiskSpace=(SELECT SUM(DiskSpace) FROM Events WHERE MonitorId=Monitors.Id AND StartTime > DATE_SUB(NOW(), INTERVAL 1 month) AND DiskSpace IS NOT NULL),
-ArchivedEvents=(SELECT COUNT(Id) FROM Events WHERE MonitorId=Monitors.Id AND Archived=1),
-ArchivedEventDiskSpace=(SELECT SUM(DiskSpace) FROM Events WHERE MonitorId=Monitors.Id AND Archived=1 AND DiskSpace IS NOT NULL)

db/zm_update-1.31.36.sql

@@ -1,148 +0,0 @@
-delimiter //
-
-DROP TRIGGER IF EXISTS Events_Hour_delete_trigger//
-CREATE TRIGGER Events_Hour_delete_trigger BEFORE DELETE ON Events_Hour
-FOR EACH ROW BEGIN
-  UPDATE Monitors SET
-  HourEvents = COALESCE(HourEvents,1)-1,
-  HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
-  WHERE Id=OLD.MonitorId;
-END;
-//
-
-DROP TRIGGER IF EXISTS Events_Hour_update_trigger;
-CREATE TRIGGER Events_Hour_update_trigger AFTER UPDATE ON Events_Hour
-FOR EACH ROW
-  BEGIN
-    declare diff BIGINT default 0;
-
-    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
-    IF ( diff ) THEN
-      IF ( NEW.MonitorID != OLD.MonitorID ) THEN
-        UPDATE Monitors SET HourEventDiskSpace=COALESCE(DayEventDiskSpace,0)-OLD.DiskSpace WHERE Monitors.Id=OLD.MonitorId;
-        UPDATE Monitors SET HourEventDiskSpace=COALESCE(DayEventDiskSpace,0)+NEW.DiskSpace WHERE Monitors.Id=NEW.MonitorId;
-      ELSE 
-        UPDATE Monitors SET HourEventDiskSpace=COALESCE(DayEventDiskSpace,0)+diff WHERE Monitors.Id=NEW.MonitorId;
-    END IF;
-  END IF;
-END;
-//
-
-DROP TRIGGER IF EXISTS Events_Day_delete_trigger//
-CREATE TRIGGER Events_Day_delete_trigger BEFORE DELETE ON Events_Day
-FOR EACH ROW BEGIN
-  UPDATE Monitors SET
-  DayEvents = COALESCE(DayEvents,1)-1,
-  DayEventDiskSpace=COALESCE(DayEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
-  WHERE Id=OLD.MonitorId;
-END;
-//
-
-DROP TRIGGER IF EXISTS Events_Day_update_trigger;
-CREATE TRIGGER Events_Day_update_trigger AFTER UPDATE ON Events_Day
-FOR EACH ROW
-  BEGIN
-    declare diff BIGINT default 0;
-
-    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
-    IF ( diff ) THEN
-      IF ( NEW.MonitorID != OLD.MonitorID ) THEN
-        UPDATE Monitors SET DayEventDiskSpace=COALESCE(DayEventDiskSpace,0)-OLD.DiskSpace WHERE Monitors.Id=OLD.MonitorId;
-        UPDATE Monitors SET DayEventDiskSpace=COALESCE(DayEventDiskSpace,0)+NEW.DiskSpace WHERE Monitors.Id=NEW.MonitorId;
-      ELSE 
-        UPDATE Monitors SET DayEventDiskSpace=COALESCE(DayEventDiskSpace,0)+diff WHERE Monitors.Id=NEW.MonitorId;
-      END IF;
-    END IF;
-END;
-//
-
-DROP TRIGGER IF EXISTS Events_Week_delete_trigger//
-CREATE TRIGGER Events_Week_delete_trigger BEFORE DELETE ON Events_Week
-FOR EACH ROW BEGIN
-  UPDATE Monitors SET
-  WeekEvents = COALESCE(WeekEvents,1)-1,
-  WeekEventDiskSpace=COALESCE(WeekEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
-  WHERE Id=OLD.MonitorId;
-END;
-//
-
-DROP TRIGGER IF EXISTS Events_Week_update_trigger;
-CREATE TRIGGER Events_Week_update_trigger AFTER UPDATE ON Events_Week
-FOR EACH ROW
-  BEGIN
-    declare diff BIGINT default 0;
-
-    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
-    IF ( diff ) THEN
-      IF ( NEW.MonitorID != OLD.MonitorID ) THEN
-        UPDATE Monitors SET WeekEventDiskSpace=COALESCE(WeekEventDiskSpace,0)-OLD.DiskSpace WHERE Monitors.Id=OLD.MonitorId;
-        UPDATE Monitors SET WeekEventDiskSpace=COALESCE(WeekEventDiskSpace,0)+NEW.DiskSpace WHERE Monitors.Id=NEW.MonitorId;
-      ELSE 
-        UPDATE Monitors SET WeekEventDiskSpace=COALESCE(WeekEventDiskSpace,0)+diff WHERE Monitors.Id=NEW.MonitorId;
-      END IF;
-    END IF;
-END;
-//
-
-DROP TRIGGER IF EXISTS Events_Month_delete_trigger//
-CREATE TRIGGER Events_Month_delete_trigger BEFORE DELETE ON Events_Month
-FOR EACH ROW BEGIN
-  UPDATE Monitors SET
-  MonthEvents = COALESCE(MonthEvents,1)-1,
-  MonthEventDiskSpace=COALESCE(MonthEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
-  WHERE Id=OLD.MonitorId;
-END;
-//
-
-DROP TRIGGER IF EXISTS Events_Month_update_trigger;
-CREATE TRIGGER Events_Month_update_trigger AFTER UPDATE ON Events_Month
-FOR EACH ROW
-  BEGIN
-    declare diff BIGINT default 0;
-
-    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
-    IF ( diff ) THEN
-      IF ( NEW.MonitorID != OLD.MonitorID ) THEN
-        UPDATE Monitors SET MonthEventDiskSpace=COALESCE(MonthEventDiskSpace,0)-OLD.DiskSpace WHERE Monitors.Id=OLD.MonitorId;
-        UPDATE Monitors SET MonthEventDiskSpace=COALESCE(MonthEventDiskSpace,0)+NEW.DiskSpace WHERE Monitors.Id=NEW.MonitorId;
-      ELSE 
-        UPDATE Monitors SET MonthEventDiskSpace=COALESCE(MonthEventDiskSpace,0)+diff WHERE Monitors.Id=NEW.MonitorId;
-      END IF;
-    END IF;
-END;
-//
-
-DROP TRIGGER IF EXISTS event_insert_trigger//
-
-CREATE TRIGGER event_insert_trigger AFTER INSERT ON Events
-FOR EACH ROW
-  BEGIN
-    INSERT INTO Events_Hour (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-    INSERT INTO Events_Day (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-    INSERT INTO Events_Week (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-    INSERT INTO Events_Month (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-    UPDATE Monitors SET
-    HourEvents = COALESCE(HourEvents,0)+1,
-    DayEvents = COALESCE(DayEvents,0)+1,
-    WeekEvents = COALESCE(WeekEvents,0)+1,
-    MonthEvents = COALESCE(MonthEvents,0)+1,
-    TotalEvents = COALESCE(TotalEvents,0)+1
-    WHERE Id=NEW.MonitorId;
-  END;
-  //
-
-delimiter ;
-
-UPDATE Monitors SET
-TotalEvents=(SELECT COUNT(Id) FROM Events WHERE MonitorId=Monitors.Id),
-TotalEventDiskSpace=(SELECT SUM(DiskSpace) FROM Events WHERE MonitorId=Monitors.Id AND DiskSpace IS NOT NULL),
-HourEvents=(SELECT COUNT(Id) FROM Events WHERE MonitorId=Monitors.Id AND StartTime > DATE_SUB( NOW(), INTERVAL 1 hour) ),
-HourEventDiskSpace=(SELECT SUM(DiskSpace) FROM Events WHERE MonitorId=Monitors.Id AND StartTime > DATE_SUB(NOW(), INTERVAL 1 hour) AND DiskSpace IS NOT NULL),
-DayEvents=(SELECT COUNT(Id) FROM Events WHERE MonitorId=Monitors.Id AND StartTime > DATE_SUB(NOW(), INTERVAL 1 day)),
-DayEventDiskSpace=(SELECT SUM(DiskSpace) FROM Events WHERE MonitorId=Monitors.Id AND StartTime > DATE_SUB(NOW(), INTERVAL 1 day) AND DiskSpace IS NOT NULL),
-WeekEvents=(SELECT COUNT(Id) FROM Events WHERE MonitorId=Monitors.Id AND StartTime > DATE_SUB(NOW(), INTERVAL 1 week)),
-WeekEventDiskSpace=(SELECT SUM(DiskSpace) FROM Events WHERE MonitorId=Monitors.Id AND StartTime > DATE_SUB(NOW(), INTERVAL 1 week) AND DiskSpace IS NOT NULL),
-MonthEvents=(SELECT COUNT(Id) FROM Events WHERE MonitorId=Monitors.Id AND StartTime > DATE_SUB( NOW(), INTERVAL 1 month)),
-MonthEventDiskSpace=(SELECT SUM(DiskSpace) FROM Events WHERE MonitorId=Monitors.Id AND StartTime > DATE_SUB(NOW(), INTERVAL 1 month) AND DiskSpace IS NOT NULL),
-ArchivedEvents=(SELECT COUNT(Id) FROM Events WHERE MonitorId=Monitors.Id AND Archived=1),
-ArchivedEventDiskSpace=(SELECT SUM(DiskSpace) FROM Events WHERE MonitorId=Monitors.Id AND Archived=1 AND DiskSpace IS NOT NULL);

db/zm_update-1.31.37.sql

@@ -1,49 +0,0 @@
-DROP PROCEDURE IF EXISTS update_storage_stats;
-
-DELIMITER //
-
-CREATE PROCEDURE update_storage_stats(IN StorageId smallint(5), IN space BIGINT)
-
-sql security invoker
-
-deterministic
-
-begin
-
-    update Storage set DiskSpace = COALESCE(DiskSpace,0) + COALESCE(space,0) where Id = StorageId;
-
-end;
-
-//
-
-DROP TRIGGER IF EXISTS event_delete_trigger//
-
-CREATE TRIGGER event_delete_trigger BEFORE DELETE ON Events
-FOR EACH ROW
-  BEGIN
-    IF ( OLD.DiskSpace ) THEN
-      call update_storage_stats(OLD.StorageId, -OLD.DiskSpace);
-    END IF;
-    DELETE FROM Events_Hour WHERE EventId=OLD.Id;
-    DELETE FROM Events_Day WHERE EventId=OLD.Id;
-    DELETE FROM Events_Week WHERE EventId=OLD.Id;
-    DELETE FROM Events_Month WHERE EventId=OLD.Id;
-    IF ( OLD.Archived ) THEN
-      DELETE FROM Events_Archived WHERE EventId=OLD.Id;
-      UPDATE Monitors SET
-      ArchivedEvents = ArchivedEvents - 1,
-      ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0),
-      TotalEvents = TotalEvents - 1,
-      TotalEventDiskSpace = COALESCE(TotalEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0)
-      WHERE Id=OLD.MonitorId;
-    ELSE
-      UPDATE Monitors SET
-      TotalEvents = TotalEvents-1,
-      TotalEventDiskSpace=COALESCE(TotalEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
-      WHERE Id=OLD.MonitorId;
-    END IF;
-  END;
-
-//
-
-UPDATE Storage SET DiskSpace=(SELECT SUM(COALESCE(DiskSpace,0)) FROM Events WHERE StorageId=Storage.Id)//

db/zm_update-1.31.38.sql

@@ -1,277 +0,0 @@
-
-delimiter //
-DROP TRIGGER IF EXISTS Events_Hour_delete_trigger//
-CREATE TRIGGER Events_Hour_delete_trigger BEFORE DELETE ON Events_Hour
-FOR EACH ROW BEGIN
-  UPDATE Monitors SET
-  HourEvents = COALESCE(HourEvents,1)-1,
-  HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
-  WHERE Id=OLD.MonitorId;
-END; 
-//
-
-DROP TRIGGER IF EXISTS Events_Hour_update_trigger//
-
-CREATE TRIGGER Events_Hour_update_trigger AFTER UPDATE ON Events_Hour
-FOR EACH ROW
-  BEGIN
-    declare diff BIGINT default 0;
-
-    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
-    IF ( diff ) THEN
-      IF ( NEW.MonitorID != OLD.MonitorID ) THEN
-        UPDATE Monitors SET HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0) WHERE Monitors.Id=OLD.MonitorId;
-        UPDATE Monitors SET HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)-COALESCE(NEW.DiskSpace,0) WHERE Monitors.Id=NEW.MonitorId;
-      ELSE
-        UPDATE Monitors SET HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)+diff WHERE Monitors.Id=NEW.MonitorId;
-      END IF;
-    END IF;
-  END;
-//
-DELIMITER ;
-
-delimiter //
-DROP TRIGGER IF EXISTS Events_Day_delete_trigger//
-CREATE TRIGGER Events_Day_delete_trigger BEFORE DELETE ON Events_Day
-FOR EACH ROW BEGIN
-  UPDATE Monitors SET
-  DayEvents = COALESCE(DayEvents,1)-1,
-  DayEventDiskSpace=COALESCE(DayEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
-  WHERE Id=OLD.MonitorId;
-END;
-//
-
-DROP TRIGGER IF EXISTS Events_Day_update_trigger;
-CREATE TRIGGER Events_Day_update_trigger AFTER UPDATE ON Events_Day
-FOR EACH ROW
-  BEGIN
-    declare diff BIGINT default 0;
-
-    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
-    IF ( diff ) THEN
-      IF ( NEW.MonitorID != OLD.MonitorID ) THEN
-        UPDATE Monitors SET DayEventDiskSpace=COALESCE(DayEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0) WHERE Monitors.Id=OLD.MonitorId;
-        UPDATE Monitors SET DayEventDiskSpace=COALESCE(DayEventDiskSpace,0)+COALESCE(NEW.DiskSpace,0) WHERE Monitors.Id=NEW.MonitorId;
-      ELSE
-        UPDATE Monitors SET DayEventDiskSpace=COALESCE(DayEventDiskSpace,0)+diff WHERE Monitors.Id=NEW.MonitorId;
-      END IF;
-    END IF;
-  END;
-  //
-
-
-delimiter //
-DROP TRIGGER IF EXISTS Events_Week_delete_trigger//
-CREATE TRIGGER Events_Week_delete_trigger BEFORE DELETE ON Events_Week
-FOR EACH ROW BEGIN
-  UPDATE Monitors SET
-  WeekEvents = COALESCE(WeekEvents,1)-1,
-  WeekEventDiskSpace=COALESCE(WeekEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
-  WHERE Id=OLD.MonitorId;
-END;
-//
-
-DROP TRIGGER IF EXISTS Events_Week_update_trigger;
-CREATE TRIGGER Events_Week_update_trigger AFTER UPDATE ON Events_Week
-FOR EACH ROW
-  BEGIN
-    declare diff BIGINT default 0;
-
-    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
-    IF ( diff ) THEN
-      IF ( NEW.MonitorID != OLD.MonitorID ) THEN
-        UPDATE Monitors SET WeekEventDiskSpace=COALESCE(WeekEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0) WHERE Monitors.Id=OLD.MonitorId;
-        UPDATE Monitors SET WeekEventDiskSpace=COALESCE(WeekEventDiskSpace,0)+COALESCE(NEW.DiskSpace,0) WHERE Monitors.Id=NEW.MonitorId;
-      ELSE
-        UPDATE Monitors SET WeekEventDiskSpace=COALESCE(WeekEventDiskSpace,0)+diff WHERE Monitors.Id=NEW.MonitorId;
-      END IF;
-    END IF;
-  END;
-  //
-
-DELIMITER ;
-
-delimiter //
-DROP TRIGGER IF EXISTS Events_Month_delete_trigger//
-CREATE TRIGGER Events_Month_delete_trigger BEFORE DELETE ON Events_Month
-FOR EACH ROW BEGIN
-  UPDATE Monitors SET
-  MonthEvents = COALESCE(MonthEvents,1)-1,
-  MonthEventDiskSpace=COALESCE(MonthEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
-  WHERE Id=OLD.MonitorId;
-END;
-//
-
-DROP TRIGGER IF EXISTS Events_Month_update_trigger;
-CREATE TRIGGER Events_Month_update_trigger AFTER UPDATE ON Events_Month
-FOR EACH ROW
-  BEGIN
-    declare diff BIGINT default 0;
-
-    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
-    IF ( diff ) THEN
-      IF ( NEW.MonitorID != OLD.MonitorID ) THEN
-        UPDATE Monitors SET MonthEventDiskSpace=COALESCE(MonthEventDiskSpace,0)-COALESCE(OLD.DiskSpace) WHERE Monitors.Id=OLD.MonitorId;
-        UPDATE Monitors SET MonthEventDiskSpace=COALESCE(MonthEventDiskSpace,0)+COALESCE(NEW.DiskSpace) WHERE Monitors.Id=NEW.MonitorId;
-      ELSE
-        UPDATE Monitors SET MonthEventDiskSpace=COALESCE(MonthEventDiskSpace,0)+diff WHERE Monitors.Id=NEW.MonitorId;
-      END IF;
-    END IF;
-  END;
-  //
-
-drop procedure if exists update_storage_stats;
-create procedure update_storage_stats(IN StorageId smallint(5), IN space BIGINT)
-
-sql security invoker
-
-deterministic
-
-begin
-
-  update Storage set DiskSpace = COALESCE(DiskSpace,0) + COALESCE(space,0) where Id = StorageId;
-
-end;
-
-//
-
-drop trigger if exists event_update_trigger//
-
-CREATE TRIGGER event_update_trigger AFTER UPDATE ON Events 
-FOR EACH ROW
-BEGIN
-    declare diff BIGINT default 0;
-
-    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
-  IF ( NEW.StorageId = OLD.StorageID ) THEN
-    IF ( diff ) THEN
-      call update_storage_stats(OLD.StorageId, diff);
-    END IF;
-  ELSE
-    IF ( NEW.DiskSpace ) THEN
-      call update_storage_stats(NEW.StorageId, NEW.DiskSpace);
-    END IF;
-    IF ( OLD.DiskSpace ) THEN
-      call update_storage_stats(OLD.StorageId, -OLD.DiskSpace);
-    END IF;
-  END IF;
-
-  UPDATE Events_Hour SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-  UPDATE Events_Day SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-  UPDATE Events_Week SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-  UPDATE Events_Month SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-
-  IF ( NEW.Archived != OLD.Archived ) THEN
-    IF ( NEW.Archived ) THEN
-      INSERT INTO Events_Archived (EventId,MonitorId,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.DiskSpace);
-      UPDATE Monitors SET ArchivedEvents = COALESCE(ArchivedEvents,0)+1, ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) + COALESCE(NEW.DiskSpace,0) WHERE Id=NEW.MonitorId;
-    ELSEIF ( OLD.Archived ) THEN
-      DELETE FROM Events_Archived WHERE EventId=OLD.Id;
-      UPDATE Monitors SET ArchivedEvents = COALESCE(ArchivedEvents,0)-1, ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) WHERE Id=OLD.MonitorId;
-    ELSE
-      IF ( OLD.DiskSpace != NEW.DiskSpace ) THEN
-        UPDATE Events_Archived SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-        UPDATE Monitors SET
-          ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0)
-          WHERE Id=OLD.MonitorId;
-      END IF;
-    END IF;
-  ELSE
-    IF ( NEW.Archived AND diff ) THEN
-      UPDATE Events_Archived SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-    END IF;
-  END IF;
-
-  IF ( diff ) THEN
-    UPDATE Monitors SET TotalEventDiskSpace = COALESCE(TotalEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0) WHERE Id=OLD.MonitorId;
-  END IF;
-
-END;
-//
-
-delimiter ;
-
-DROP TRIGGER IF EXISTS event_insert_trigger;
-
-delimiter //
-/* The assumption is that when an Event is inserted, it has no size yet, so don't bother updating the DiskSpace, just the count.
- * The DiskSpace will get update in the Event Update Trigger
- */
-CREATE TRIGGER event_insert_trigger AFTER INSERT ON Events
-FOR EACH ROW
-  BEGIN
-
-  INSERT INTO Events_Hour (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-  INSERT INTO Events_Day (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-  INSERT INTO Events_Week (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-  INSERT INTO Events_Month (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-  UPDATE Monitors SET
-  HourEvents = COALESCE(HourEvents,0)+1,
-  DayEvents = COALESCE(DayEvents,0)+1,
-  WeekEvents = COALESCE(WeekEvents,0)+1,
-  MonthEvents = COALESCE(MonthEvents,0)+1,
-  TotalEvents = COALESCE(TotalEvents,0)+1
-  WHERE Id=NEW.MonitorId;
-END;
-//
-
-DROP TRIGGER IF EXISTS event_delete_trigger//
-
-CREATE TRIGGER event_delete_trigger BEFORE DELETE ON Events
-FOR EACH ROW
-BEGIN
-  IF ( OLD.DiskSpace ) THEN
-    call update_storage_stats(OLD.StorageId, -OLD.DiskSpace);
-  END IF;
-  DELETE FROM Events_Hour WHERE EventId=OLD.Id;
-  DELETE FROM Events_Day WHERE EventId=OLD.Id;
-  DELETE FROM Events_Week WHERE EventId=OLD.Id;
-  DELETE FROM Events_Month WHERE EventId=OLD.Id;
-  IF ( OLD.Archived ) THEN
-    DELETE FROM Events_Archived WHERE EventId=OLD.Id;
-    UPDATE Monitors SET
-      ArchivedEvents = COALESCE(ArchivedEvents,1) - 1,
-      ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0),
-      TotalEvents = COALESCE(TotalEvents,1) - 1,
-      TotalEventDiskSpace = COALESCE(TotalEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0)
-      WHERE Id=OLD.MonitorId;
-  ELSE
-    UPDATE Monitors SET
-    TotalEvents = COALESCE(TotalEvents,1)-1,
-    TotalEventDiskSpace=COALESCE(TotalEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
-    WHERE Id=OLD.MonitorId;
-  END IF;
-END;
-
-//
-
-DROP TRIGGER IF EXISTS Zone_Insert_Trigger//
-CREATE TRIGGER Zone_Insert_Trigger AFTER INSERT ON Zones
-FOR EACH ROW
-  BEGIN
-    UPDATE Monitors SET ZoneCount=(SELECT COUNT(*) FROM Zones WHERE MonitorId=NEW.MonitorId) WHERE Id=NEW.MonitorID;
-  END
-//
-DROP TRIGGER IF EXISTS Zone_Delete_Trigger//
-CREATE TRIGGER Zone_Delete_Trigger AFTER DELETE ON Zones
-FOR EACH ROW
-  BEGIN
-    UPDATE Monitors SET ZoneCount=(SELECT COUNT(*) FROM Zones WHERE MonitorId=OLD.MonitorId) WHERE Id=OLD.MonitorID;
-  END
-//
-
-DELIMITER ;
-
-UPDATE Monitors SET
-TotalEvents=(SELECT COUNT(*) FROM Events WHERE MonitorId=Monitors.Id),
-TotalEventDiskSpace=(SELECT SUM(DiskSpace) FROM Events WHERE MonitorId=Monitors.Id AND DiskSpace IS NOT NULL),
-HourEvents=(SELECT COUNT(*) FROM Events_Hour WHERE MonitorId=Monitors.Id),
-HourEventDiskSpace=(SELECT SUM(DiskSpace) FROM Events_Hour WHERE MonitorId=Monitors.Id AND DiskSpace IS NOT NULL),
-DayEvents=(SELECT COUNT(*) FROM Events_Day WHERE MonitorId=Monitors.Id),
-DayEventDiskSpace=(SELECT SUM(DiskSpace) FROM Events_Day WHERE MonitorId=Monitors.Id AND DiskSpace IS NOT NULL),
-WeekEvents=(SELECT COUNT(Id) FROM Events_Week WHERE MonitorId=Monitors.Id),
-WeekEventDiskSpace=(SELECT SUM(DiskSpace) FROM Events_Week WHERE MonitorId=Monitors.Id AND DiskSpace IS NOT NULL),
-MonthEvents=(SELECT COUNT(Id) FROM Events_Month WHERE MonitorId=Monitors.Id),
-MonthEventDiskSpace=(SELECT SUM(DiskSpace) FROM Events_Month WHERE MonitorId=Monitors.Id AND DiskSpace IS NOT NULL),
-ArchivedEvents=(SELECT COUNT(Id) FROM Events_Archived WHERE MonitorId=Monitors.Id),
-ArchivedEventDiskSpace=(SELECT SUM(DiskSpace) FROM Events_Archived WHERE MonitorId=Monitors.Id AND DiskSpace IS NOT NULL);

db/zm_update-1.31.39.sql

@@ -1,275 +0,0 @@
-
-ALTER TABLE `Monitors` MODIFY `HourEvents` INT(10) DEFAULT NULL;
-ALTER TABLE `Monitors` MODIFY `HourEventDiskSpace` BIGINT DEFAULT NULL;
-ALTER TABLE `Monitors` MODIFY `DayEvents` INT(10) DEFAULT NULL;
-ALTER TABLE `Monitors` MODIFY `DayEventDiskSpace` BIGINT DEFAULT NULL;
-ALTER TABLE `Monitors` MODIFY `WeekEvents` INT(10) DEFAULT NULL;
-ALTER TABLE `Monitors` MODIFY `WeekEventDiskSpace` BIGINT DEFAULT NULL;
-ALTER TABLE `Monitors` MODIFY `MonthEvents` INT(10) DEFAULT NULL;
-ALTER TABLE `Monitors` MODIFY `MonthEventDiskSpace` BIGINT DEFAULT NULL;
-ALTER TABLE `Monitors` MODIFY `ArchivedEvents` INT(10) DEFAULT NULL;
-ALTER TABLE `Monitors` MODIFY `ArchivedEventDiskSpace` BIGINT DEFAULT NULL;
-ALTER TABLE `Monitors` MODIFY `TotalEvents` INT(10) DEFAULT NULL;
-ALTER TABLE `Monitors` MODIFY `TotalEventDiskSpace` BIGINT DEFAULT NULL;
-
-delimiter //
-DROP TRIGGER IF EXISTS Events_Hour_delete_trigger//
-CREATE TRIGGER Events_Hour_delete_trigger BEFORE DELETE ON Events_Hour
-FOR EACH ROW BEGIN
-  UPDATE Monitors SET
-  HourEvents = COALESCE(HourEvents,1)-1,
-  HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
-  WHERE Id=OLD.MonitorId;
-END; 
-//
-
-DROP TRIGGER IF EXISTS Events_Hour_update_trigger//
-
-CREATE TRIGGER Events_Hour_update_trigger AFTER UPDATE ON Events_Hour
-FOR EACH ROW
-  BEGIN
-    declare diff BIGINT default 0;
-
-    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
-    IF ( diff ) THEN
-      IF ( NEW.MonitorID != OLD.MonitorID ) THEN
-        UPDATE Monitors SET HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0) WHERE Monitors.Id=OLD.MonitorId;
-        UPDATE Monitors SET HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)-COALESCE(NEW.DiskSpace,0) WHERE Monitors.Id=NEW.MonitorId;
-      ELSE
-        UPDATE Monitors SET HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)+diff WHERE Monitors.Id=NEW.MonitorId;
-      END IF;
-    END IF;
-  END;
-//
-DELIMITER ;
-
-delimiter //
-DROP TRIGGER IF EXISTS Events_Day_delete_trigger//
-CREATE TRIGGER Events_Day_delete_trigger BEFORE DELETE ON Events_Day
-FOR EACH ROW BEGIN
-  UPDATE Monitors SET
-  DayEvents = COALESCE(DayEvents,1)-1,
-  DayEventDiskSpace=COALESCE(DayEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
-  WHERE Id=OLD.MonitorId;
-END;
-//
-
-DROP TRIGGER IF EXISTS Events_Day_update_trigger;
-CREATE TRIGGER Events_Day_update_trigger AFTER UPDATE ON Events_Day
-FOR EACH ROW
-  BEGIN
-    declare diff BIGINT default 0;
-
-    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
-    IF ( diff ) THEN
-      IF ( NEW.MonitorID != OLD.MonitorID ) THEN
-        UPDATE Monitors SET DayEventDiskSpace=COALESCE(DayEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0) WHERE Monitors.Id=OLD.MonitorId;
-        UPDATE Monitors SET DayEventDiskSpace=COALESCE(DayEventDiskSpace,0)+COALESCE(NEW.DiskSpace,0) WHERE Monitors.Id=NEW.MonitorId;
-      ELSE
-        UPDATE Monitors SET DayEventDiskSpace=COALESCE(DayEventDiskSpace,0)+diff WHERE Monitors.Id=NEW.MonitorId;
-      END IF;
-    END IF;
-  END;
-  //
-
-
-delimiter //
-DROP TRIGGER IF EXISTS Events_Week_delete_trigger//
-CREATE TRIGGER Events_Week_delete_trigger BEFORE DELETE ON Events_Week
-FOR EACH ROW BEGIN
-  UPDATE Monitors SET
-  WeekEvents = COALESCE(WeekEvents,1)-1,
-  WeekEventDiskSpace=COALESCE(WeekEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
-  WHERE Id=OLD.MonitorId;
-END;
-//
-
-DROP TRIGGER IF EXISTS Events_Week_update_trigger;
-CREATE TRIGGER Events_Week_update_trigger AFTER UPDATE ON Events_Week
-FOR EACH ROW
-  BEGIN
-    declare diff BIGINT default 0;
-
-    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
-    IF ( diff ) THEN
-      IF ( NEW.MonitorID != OLD.MonitorID ) THEN
-        UPDATE Monitors SET WeekEventDiskSpace=COALESCE(WeekEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0) WHERE Monitors.Id=OLD.MonitorId;
-        UPDATE Monitors SET WeekEventDiskSpace=COALESCE(WeekEventDiskSpace,0)+COALESCE(NEW.DiskSpace,0) WHERE Monitors.Id=NEW.MonitorId;
-      ELSE
-        UPDATE Monitors SET WeekEventDiskSpace=COALESCE(WeekEventDiskSpace,0)+diff WHERE Monitors.Id=NEW.MonitorId;
-      END IF;
-    END IF;
-  END;
-  //
-
-DELIMITER ;
-
-delimiter //
-DROP TRIGGER IF EXISTS Events_Month_delete_trigger//
-CREATE TRIGGER Events_Month_delete_trigger BEFORE DELETE ON Events_Month
-FOR EACH ROW BEGIN
-  UPDATE Monitors SET
-  MonthEvents = COALESCE(MonthEvents,1)-1,
-  MonthEventDiskSpace=COALESCE(MonthEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
-  WHERE Id=OLD.MonitorId;
-END;
-//
-
-DROP TRIGGER IF EXISTS Events_Month_update_trigger;
-CREATE TRIGGER Events_Month_update_trigger AFTER UPDATE ON Events_Month
-FOR EACH ROW
-  BEGIN
-    declare diff BIGINT default 0;
-
-    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
-    IF ( diff ) THEN
-      IF ( NEW.MonitorID != OLD.MonitorID ) THEN
-        UPDATE Monitors SET MonthEventDiskSpace=COALESCE(MonthEventDiskSpace,0)-COALESCE(OLD.DiskSpace) WHERE Monitors.Id=OLD.MonitorId;
-        UPDATE Monitors SET MonthEventDiskSpace=COALESCE(MonthEventDiskSpace,0)+COALESCE(NEW.DiskSpace) WHERE Monitors.Id=NEW.MonitorId;
-      ELSE
-        UPDATE Monitors SET MonthEventDiskSpace=COALESCE(MonthEventDiskSpace,0)+diff WHERE Monitors.Id=NEW.MonitorId;
-      END IF;
-    END IF;
-  END;
-  //
-
-drop procedure if exists update_storage_stats;
-create procedure update_storage_stats(IN StorageId smallint(5), IN space BIGINT)
-
-sql security invoker
-
-deterministic
-
-begin
-
-  update Storage set DiskSpace = COALESCE(DiskSpace,0) + COALESCE(space,0) where Id = StorageId;
-
-end;
-
-//
-
-drop trigger if exists event_update_trigger//
-
-CREATE TRIGGER event_update_trigger AFTER UPDATE ON Events 
-FOR EACH ROW
-BEGIN
-    declare diff BIGINT default 0;
-
-    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
-  IF ( NEW.StorageId = OLD.StorageID ) THEN
-    IF ( diff ) THEN
-      call update_storage_stats(OLD.StorageId, diff);
-    END IF;
-  ELSE
-    IF ( NEW.DiskSpace ) THEN
-      call update_storage_stats(NEW.StorageId, NEW.DiskSpace);
-    END IF;
-    IF ( OLD.DiskSpace ) THEN
-      call update_storage_stats(OLD.StorageId, -OLD.DiskSpace);
-    END IF;
-  END IF;
-
-  UPDATE Events_Hour SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-  UPDATE Events_Day SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-  UPDATE Events_Week SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-  UPDATE Events_Month SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-
-  IF ( NEW.Archived != OLD.Archived ) THEN
-    IF ( NEW.Archived ) THEN
-      INSERT INTO Events_Archived (EventId,MonitorId,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.DiskSpace);
-      UPDATE Monitors SET ArchivedEvents = COALESCE(ArchivedEvents,0)+1, ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) + COALESCE(NEW.DiskSpace,0) WHERE Id=NEW.MonitorId;
-    ELSEIF ( OLD.Archived ) THEN
-      DELETE FROM Events_Archived WHERE EventId=OLD.Id;
-      UPDATE Monitors SET ArchivedEvents = COALESCE(ArchivedEvents,0)-1, ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) WHERE Id=OLD.MonitorId;
-    ELSE
-      IF ( OLD.DiskSpace != NEW.DiskSpace ) THEN
-        UPDATE Events_Archived SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-        UPDATE Monitors SET
-          ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0)
-          WHERE Id=OLD.MonitorId;
-      END IF;
-    END IF;
-  ELSEIF ( NEW.Archived AND diff ) THEN
-    UPDATE Events_Archived SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-  END IF;
-
-  IF ( diff ) THEN
-    UPDATE Monitors SET TotalEventDiskSpace = COALESCE(TotalEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0) WHERE Id=OLD.MonitorId;
-  END IF;
-
-END;
-
-//
-
-delimiter ;
-
-DROP TRIGGER IF EXISTS event_insert_trigger;
-
-delimiter //
-/* The assumption is that when an Event is inserted, it has no size yet, so don't bother updating the DiskSpace, just the count.
- * The DiskSpace will get update in the Event Update Trigger
- */
-CREATE TRIGGER event_insert_trigger AFTER INSERT ON Events
-FOR EACH ROW
-  BEGIN
-
-  INSERT INTO Events_Hour (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-  INSERT INTO Events_Day (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-  INSERT INTO Events_Week (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-  INSERT INTO Events_Month (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-  UPDATE Monitors SET
-  HourEvents = COALESCE(HourEvents,0)+1,
-  DayEvents = COALESCE(DayEvents,0)+1,
-  WeekEvents = COALESCE(WeekEvents,0)+1,
-  MonthEvents = COALESCE(MonthEvents,0)+1,
-  TotalEvents = COALESCE(TotalEvents,0)+1
-  WHERE Id=NEW.MonitorId;
-END;
-//
-
-DROP TRIGGER IF EXISTS event_delete_trigger//
-
-CREATE TRIGGER event_delete_trigger BEFORE DELETE ON Events
-FOR EACH ROW
-BEGIN
-  IF ( OLD.DiskSpace ) THEN
-    call update_storage_stats(OLD.StorageId, -OLD.DiskSpace);
-  END IF;
-  DELETE FROM Events_Hour WHERE EventId=OLD.Id;
-  DELETE FROM Events_Day WHERE EventId=OLD.Id;
-  DELETE FROM Events_Week WHERE EventId=OLD.Id;
-  DELETE FROM Events_Month WHERE EventId=OLD.Id;
-  IF ( OLD.Archived ) THEN
-    DELETE FROM Events_Archived WHERE EventId=OLD.Id;
-    UPDATE Monitors SET
-      ArchivedEvents = COALESCE(ArchivedEvents,1) - 1,
-      ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0),
-      TotalEvents = COALESCE(TotalEvents,1) - 1,
-      TotalEventDiskSpace = COALESCE(TotalEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0)
-      WHERE Id=OLD.MonitorId;
-  ELSE
-    UPDATE Monitors SET
-    TotalEvents = COALESCE(TotalEvents,1)-1,
-    TotalEventDiskSpace=COALESCE(TotalEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
-    WHERE Id=OLD.MonitorId;
-  END IF;
-END;
-
-//
-
-DROP TRIGGER IF EXISTS Zone_Insert_Trigger//
-CREATE TRIGGER Zone_Insert_Trigger AFTER INSERT ON Zones
-FOR EACH ROW
-  BEGIN
-    UPDATE Monitors SET ZoneCount=(SELECT COUNT(*) FROM Zones WHERE MonitorId=NEW.MonitorId) WHERE Id=NEW.MonitorID;
-  END
-//
-DROP TRIGGER IF EXISTS Zone_Delete_Trigger//
-CREATE TRIGGER Zone_Delete_Trigger AFTER DELETE ON Zones
-FOR EACH ROW
-  BEGIN
-    UPDATE Monitors SET ZoneCount=(SELECT COUNT(*) FROM Zones WHERE MonitorId=OLD.MonitorId) WHERE Id=OLD.MonitorID;
-  END
-//
-
-DELIMITER ;

db/zm_update-1.31.4.sql

@@ -1,42 +0,0 @@
---
--- This adds Manufacturers and Models
---
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-      FROM INFORMATION_SCHEMA.TABLES
-      WHERE table_name = 'Manufacturers'
-      AND table_schema = DATABASE()
-    ) > 0,
-    "SELECT 'Manufacturers table exists'",
-    "
-    CREATE TABLE `Manufacturers` (
-      `Id` int(10) unsigned NOT NULL auto_increment,
-      `Name`  varchar(64) NOT NULL,
-      PRIMARY KEY (`Id`),
-      UNIQUE KEY (`Name`)
-    )"
-  ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-      FROM INFORMATION_SCHEMA.TABLES
-      WHERE table_name = 'Models'
-      AND table_schema = DATABASE()
-    ) > 0,
-    "SELECT 'Models table exists'",
-    "CREATE TABLE `Models` (
-      `Id` int(10) unsigned NOT NULL auto_increment,
-      `Name`  varchar(64) NOT NULL,
-      `ManufacturerId` int(10),
-      PRIMARY KEY (`Id`),
-      UNIQUE KEY (`ManufacturerId`,`Name`)
-    )"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-

db/zm_update-1.31.40.sql

@@ -1,27 +0,0 @@
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Storage'
-     AND column_name = 'Url'
-    ) > 0,
-"SELECT 'Column Url already exists in Storage'",
-"ALTER TABLE `Storage` ADD `Url` VARCHAR(255) default NULL AFTER `Type`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-
-ALTER TABLE `Monitors` MODIFY `OutputCodec`     INT UNSIGNED default 0;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'Encoder'
-    ) > 0,
-"SELECT 'Column Encoder already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `Encoder`     enum('auto','h264','h264_omx','mjpeg','mpeg1','mpeg2')  AFTER `OutputCodec`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;

db/zm_update-1.31.41.sql

@@ -1,25 +0,0 @@
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Storage'
-     AND column_name = 'DoDelete'
-    ) > 0,
-"SELECT 'Column DoDelete already exists in Storage'",
-"ALTER TABLE `Storage` ADD `DoDelete` BOOLEAN NOT NULL default true AFTER `ServerId`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Events'
-     AND column_name = 'Locked'
-    ) > 0,
-"SELECT 'Column Locked already exists in Events'",
-"ALTER TABLE `Events` ADD `Locked` BOOLEAN NOT NULL default false AFTER `Scheme`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-

db/zm_update-1.31.42.sql

@@ -1,12 +0,0 @@
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'SignalCheckPoints'
-    ) > 0,
-"SELECT 'Column SignalCheckPoints already exists in Storage'",
-"ALTER TABLE `Monitors` ADD `SignalCheckPoints` INT UNSIGNED NOT NULL default '0' AFTER `DefaultScale`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;

db/zm_update-1.31.43.sql

@@ -1,24 +0,0 @@
---
--- This updates a 1.31.42 database to 1.31.43
---
--- Add WebSite enum to Monitor.Type
--- Add Refresh column to Monitors table
---
-
-ALTER TABLE `Monitors` 
-CHANGE COLUMN `Type` `Type` ENUM('Local', 'Remote', 'File', 'Ffmpeg', 'Libvlc', 'cURL', 'WebSite') NOT NULL DEFAULT 'Local' ;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-    FROM INFORMATION_SCHEMA.COLUMNS
-    WHERE table_name = 'Monitors'
-    AND table_schema = DATABASE()
-    AND column_name = 'Refresh'
-    ) > 0,
-"SELECT 'Column Refresh exists in Monitors'",
-"ALTER TABLE Monitors ADD `Refresh` int(10) unsigned default NULL AFTER `ZoneCount`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-

db/zm_update-1.31.44.sql

@@ -1,12 +0,0 @@
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitor_Status'
-     AND column_name = 'CaptureBandwidth'
-    ) > 0,
-"SELECT 'Column CaptureBandwidth already exists in Monitor_Status'",
-"ALTER TABLE `Monitor_Status` ADD `CaptureBandwidth`  INT NOT NULL default 0 AFTER `AnalysisFPS`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;

db/zm_update-1.31.45.sql

@@ -1,23 +0,0 @@
---
--- This updates a 1.31.44 database to 1.31.45
---
--- Add WebSite enum to Monitor.Type
--- Add Refresh column to Monitors table
-
--- This is the same as the update to 1.31.43, but due to Refresh not being added to zm_create.sql.in we need to have it 
--- again in order to fix people who did a fresh install from 1.31.43 or 1.31.44.  
---
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-    FROM INFORMATION_SCHEMA.COLUMNS
-    WHERE table_name = 'Monitors'
-    AND table_schema = DATABASE()
-    AND column_name = 'Refresh'
-    ) > 0,
-"SELECT 'Column Refresh exists in Monitors'",
-"ALTER TABLE Monitors ADD `Refresh` int(10) unsigned default NULL AFTER `ZoneCount`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;

db/zm_update-1.31.46.sql

@@ -1,2 +0,0 @@
-ALTER TABLE Stats MODIFY COLUMN EventId bigint unsigned NOT NULL;
-

db/zm_update-1.31.47.sql

@@ -1 +0,0 @@
-ALTER TABLE Frames MODIFY COLUMN EventId bigint unsigned NOT NULL;

db/zm_update-1.31.5.sql

@@ -1,17 +0,0 @@
---
--- Add StorageId column to Monitors
---
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-    FROM INFORMATION_SCHEMA.COLUMNS
-    WHERE table_name = 'Groups'
-    AND table_schema = DATABASE()
-    AND column_name = 'ParentId'
-    ) > 0,
-"SELECT 'Column GroupId exists in Groups'",
-"ALTER TABLE `Groups` ADD `ParentId` int(10) unsigned AFTER `Name`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;

db/zm_update-1.31.6.sql

@@ -1 +0,0 @@
-ALTER TABLE Monitors MODIFY `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','NVSocket') NOT NULL default 'Local';

db/zm_update-1.31.7.sql

@@ -1,12 +0,0 @@
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Groups'
-      AND column_name = 'MonitorIds'
-    ) > 0,
-    "ALTER TABLE `Groups` MODIFY `MonitorIds` text NOT NULL",
-    "SELECT 'Groups no longer has MonitorIds'"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-

db/zm_update-1.31.8.sql

@@ -1,17 +0,0 @@
---
--- Add StorageId column to Monitors
---
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-    FROM INFORMATION_SCHEMA.COLUMNS
-    WHERE table_name = 'Events'
-    AND table_schema = DATABASE()
-    AND column_name = 'DiskSpace'
-    ) > 0,
-"SELECT 'Column DiskSpace exists in Events'",
-"ALTER TABLE Events ADD `DiskSpace` bigint unsigned default null AFTER `Orientation`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;

db/zm_update-1.31.9.sql

@@ -1,17 +0,0 @@
---
--- Add Type column to Storage 
---
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-    FROM INFORMATION_SCHEMA.COLUMNS
-    WHERE table_name = 'Storage'
-    AND table_schema = DATABASE()
-    AND column_name = 'Type'
-    ) > 0,
-"SELECT 'Column Type already exists in Storage'",
-"ALTER TABLE Storage ADD `Type`  enum('local','s3fs') NOT NULL default 'local' AFTER `Name`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;

db/zm_update-1.32.0.sql

@@ -1,5 +0,0 @@
---
--- This updates a 1.31.47 database to 1.32.0
---
--- No changes required
---

db/zm_update-1.32.1.sql

@@ -1,5 +0,0 @@
---
--- This updates a 1.32.0 database to 1.32.1
---
--- No changes required
---

db/zm_update-1.32.2.sql

@@ -1,5 +0,0 @@
---
--- This updates a 1.32.1 database to 1.32.2
---
--- No changes required
---

db/zm_update-1.32.3.sql

@@ -1,362 +0,0 @@
---
--- This updates a 1.32.2 database to 1.32.3
---
-
-delimiter //
-DROP TRIGGER IF EXISTS Events_Hour_delete_trigger//
-CREATE TRIGGER Events_Hour_delete_trigger BEFORE DELETE ON Events_Hour
-FOR EACH ROW BEGIN
-  UPDATE Monitors SET
-  HourEvents = COALESCE(HourEvents,1)-1,
-  HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
-  WHERE Id=OLD.MonitorId;
-END; 
-//
-
-DROP TRIGGER IF EXISTS Events_Hour_update_trigger//
-
-CREATE TRIGGER Events_Hour_update_trigger AFTER UPDATE ON Events_Hour
-FOR EACH ROW
-  BEGIN
-    declare diff BIGINT default 0;
-
-    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
-    IF ( diff ) THEN
-      IF ( NEW.MonitorID != OLD.MonitorID ) THEN
-        UPDATE Monitors SET HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0) WHERE Monitors.Id=OLD.MonitorId;
-        UPDATE Monitors SET HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)-COALESCE(NEW.DiskSpace,0) WHERE Monitors.Id=NEW.MonitorId;
-      ELSE
-        UPDATE Monitors SET HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)+diff WHERE Monitors.Id=NEW.MonitorId;
-      END IF;
-    END IF;
-  END;
-//
-DELIMITER ;
-
-delimiter //
-DROP TRIGGER IF EXISTS Events_Day_delete_trigger//
-CREATE TRIGGER Events_Day_delete_trigger BEFORE DELETE ON Events_Day
-FOR EACH ROW BEGIN
-  UPDATE Monitors SET
-  DayEvents = COALESCE(DayEvents,1)-1,
-  DayEventDiskSpace=COALESCE(DayEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
-  WHERE Id=OLD.MonitorId;
-END;
-//
-
-DROP TRIGGER IF EXISTS Events_Day_update_trigger;
-CREATE TRIGGER Events_Day_update_trigger AFTER UPDATE ON Events_Day
-FOR EACH ROW
-  BEGIN
-    declare diff BIGINT default 0;
-
-    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
-    IF ( diff ) THEN
-      IF ( NEW.MonitorID != OLD.MonitorID ) THEN
-        UPDATE Monitors SET DayEventDiskSpace=COALESCE(DayEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0) WHERE Monitors.Id=OLD.MonitorId;
-        UPDATE Monitors SET DayEventDiskSpace=COALESCE(DayEventDiskSpace,0)+COALESCE(NEW.DiskSpace,0) WHERE Monitors.Id=NEW.MonitorId;
-      ELSE
-        UPDATE Monitors SET DayEventDiskSpace=COALESCE(DayEventDiskSpace,0)+diff WHERE Monitors.Id=NEW.MonitorId;
-      END IF;
-    END IF;
-  END;
-  //
-
-
-DROP TRIGGER IF EXISTS Events_Week_delete_trigger//
-CREATE TRIGGER Events_Week_delete_trigger BEFORE DELETE ON Events_Week
-FOR EACH ROW BEGIN
-  UPDATE Monitors SET
-  WeekEvents = COALESCE(WeekEvents,1)-1,
-  WeekEventDiskSpace=COALESCE(WeekEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
-  WHERE Id=OLD.MonitorId;
-END;
-//
-
-DROP TRIGGER IF EXISTS Events_Week_update_trigger;
-CREATE TRIGGER Events_Week_update_trigger AFTER UPDATE ON Events_Week
-FOR EACH ROW
-  BEGIN
-    declare diff BIGINT default 0;
-
-    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
-    IF ( diff ) THEN
-      IF ( NEW.MonitorID != OLD.MonitorID ) THEN
-        UPDATE Monitors SET WeekEventDiskSpace=COALESCE(WeekEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0) WHERE Monitors.Id=OLD.MonitorId;
-        UPDATE Monitors SET WeekEventDiskSpace=COALESCE(WeekEventDiskSpace,0)+COALESCE(NEW.DiskSpace,0) WHERE Monitors.Id=NEW.MonitorId;
-      ELSE
-        UPDATE Monitors SET WeekEventDiskSpace=COALESCE(WeekEventDiskSpace,0)+diff WHERE Monitors.Id=NEW.MonitorId;
-      END IF;
-    END IF;
-  END;
-  //
-
-DROP TRIGGER IF EXISTS Events_Month_delete_trigger//
-CREATE TRIGGER Events_Month_delete_trigger BEFORE DELETE ON Events_Month
-FOR EACH ROW BEGIN
-  UPDATE Monitors SET
-  MonthEvents = COALESCE(MonthEvents,1)-1,
-  MonthEventDiskSpace=COALESCE(MonthEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
-  WHERE Id=OLD.MonitorId;
-END;
-//
-
-DROP TRIGGER IF EXISTS Events_Month_update_trigger;
-CREATE TRIGGER Events_Month_update_trigger AFTER UPDATE ON Events_Month
-FOR EACH ROW
-  BEGIN
-    declare diff BIGINT default 0;
-
-    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
-    IF ( diff ) THEN
-      IF ( NEW.MonitorID != OLD.MonitorID ) THEN
-        UPDATE Monitors SET MonthEventDiskSpace=COALESCE(MonthEventDiskSpace,0)-COALESCE(OLD.DiskSpace) WHERE Monitors.Id=OLD.MonitorId;
-        UPDATE Monitors SET MonthEventDiskSpace=COALESCE(MonthEventDiskSpace,0)+COALESCE(NEW.DiskSpace) WHERE Monitors.Id=NEW.MonitorId;
-      ELSE
-        UPDATE Monitors SET MonthEventDiskSpace=COALESCE(MonthEventDiskSpace,0)+diff WHERE Monitors.Id=NEW.MonitorId;
-      END IF;
-    END IF;
-  END;
-  //
-
-drop procedure if exists update_storage_stats//
-
-drop trigger if exists event_update_trigger//
-
-CREATE TRIGGER event_update_trigger AFTER UPDATE ON Events 
-FOR EACH ROW
-BEGIN
-  declare diff BIGINT default 0;
-
-  set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
-  IF ( NEW.StorageId = OLD.StorageID ) THEN
-    IF ( diff ) THEN
-      UPDATE Storage SET DiskSpace = COALESCE(DiskSpace,0) + diff WHERE Id = OLD.StorageId;
-    END IF;
-  ELSE
-    IF ( NEW.DiskSpace ) THEN
-      UPDATE Storage SET DiskSpace = COALESCE(DiskSpace,0) + NEW.DiskSpace WHERE Id = NEW.StorageId;
-    END IF;
-    IF ( OLD.DiskSpace ) THEN
-      UPDATE Storage SET DiskSpace = COALESCE(DiskSpace,0) - OLD.DiskSpace WHERE Id = OLD.StorageId;
-    END IF;
-  END IF;
-
-  UPDATE Events_Hour SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-  UPDATE Events_Day SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-  UPDATE Events_Week SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-  UPDATE Events_Month SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-
-  IF ( NEW.Archived != OLD.Archived ) THEN
-    IF ( NEW.Archived ) THEN
-      INSERT INTO Events_Archived (EventId,MonitorId,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.DiskSpace);
-      UPDATE Monitors SET ArchivedEvents = COALESCE(ArchivedEvents,0)+1, ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) + COALESCE(NEW.DiskSpace,0) WHERE Id=NEW.MonitorId;
-    ELSEIF ( OLD.Archived ) THEN
-      DELETE FROM Events_Archived WHERE EventId=OLD.Id;
-      UPDATE Monitors SET ArchivedEvents = COALESCE(ArchivedEvents,0)-1, ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) WHERE Id=OLD.MonitorId;
-    ELSE
-      IF ( OLD.DiskSpace != NEW.DiskSpace ) THEN
-        UPDATE Events_Archived SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-        UPDATE Monitors SET
-          ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0)
-          WHERE Id=OLD.MonitorId;
-      END IF;
-    END IF;
-  ELSEIF ( NEW.Archived AND diff ) THEN
-    UPDATE Events_Archived SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-  END IF;
-
-  IF ( diff ) THEN
-    UPDATE Monitors SET TotalEventDiskSpace = COALESCE(TotalEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0) WHERE Id=OLD.MonitorId;
-  END IF;
-
-END;
-
-//
-
-delimiter ;
-
-DROP TRIGGER IF EXISTS event_insert_trigger;
-
-delimiter //
-/* The assumption is that when an Event is inserted, it has no size yet, so don't bother updating the DiskSpace, just the count.
- * The DiskSpace will get update in the Event Update Trigger
- */
-CREATE TRIGGER event_insert_trigger AFTER INSERT ON Events
-FOR EACH ROW
-  BEGIN
-
-  INSERT INTO Events_Hour (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-  INSERT INTO Events_Day (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-  INSERT INTO Events_Week (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-  INSERT INTO Events_Month (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-  UPDATE Monitors SET
-  HourEvents = COALESCE(HourEvents,0)+1,
-  DayEvents = COALESCE(DayEvents,0)+1,
-  WeekEvents = COALESCE(WeekEvents,0)+1,
-  MonthEvents = COALESCE(MonthEvents,0)+1,
-  TotalEvents = COALESCE(TotalEvents,0)+1
-  WHERE Id=NEW.MonitorId;
-END;
-//
-
-DROP TRIGGER IF EXISTS event_delete_trigger//
-
-CREATE TRIGGER event_delete_trigger BEFORE DELETE ON Events
-FOR EACH ROW
-BEGIN
-  IF ( OLD.DiskSpace ) THEN
-    UPDATE Storage SET DiskSpace = COALESCE(DiskSpace,0) - CAST(OLD.DiskSpace AS SIGNED) WHERE Id = OLD.StorageId;
-  END IF;
-  DELETE FROM Events_Hour WHERE EventId=OLD.Id;
-  DELETE FROM Events_Day WHERE EventId=OLD.Id;
-  DELETE FROM Events_Week WHERE EventId=OLD.Id;
-  DELETE FROM Events_Month WHERE EventId=OLD.Id;
-  IF ( OLD.Archived ) THEN
-    DELETE FROM Events_Archived WHERE EventId=OLD.Id;
-    UPDATE Monitors SET
-      ArchivedEvents = COALESCE(ArchivedEvents,1) - 1,
-      ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0),
-      TotalEvents = COALESCE(TotalEvents,1) - 1,
-      TotalEventDiskSpace = COALESCE(TotalEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0)
-      WHERE Id=OLD.MonitorId;
-  ELSE
-    UPDATE Monitors SET
-    TotalEvents = COALESCE(TotalEvents,1)-1,
-    TotalEventDiskSpace=COALESCE(TotalEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
-    WHERE Id=OLD.MonitorId;
-  END IF;
-END;
-
-//
-
-DROP TRIGGER IF EXISTS Zone_Insert_Trigger//
-CREATE TRIGGER Zone_Insert_Trigger AFTER INSERT ON Zones
-FOR EACH ROW
-  BEGIN
-    UPDATE Monitors SET ZoneCount=(SELECT COUNT(*) FROM Zones WHERE MonitorId=NEW.MonitorId) WHERE Id=NEW.MonitorID;
-  END
-//
-DROP TRIGGER IF EXISTS Zone_Delete_Trigger//
-CREATE TRIGGER Zone_Delete_Trigger AFTER DELETE ON Zones
-FOR EACH ROW
-  BEGIN
-    UPDATE Monitors SET ZoneCount=(SELECT COUNT(*) FROM Zones WHERE MonitorId=OLD.MonitorId) WHERE Id=OLD.MonitorID;
-  END
-//
-
-DELIMITER ;
-
-REPLACE INTO Events_Day SELECT Id,MonitorId,StartTime,DiskSpace FROM Events WHERE StartTime > DATE_SUB(NOW(),  INTERVAL 1 day);
-REPLACE INTO Events_Week SELECT Id,MonitorId,StartTime,DiskSpace FROM Events WHERE StartTime > DATE_SUB(NOW(),  INTERVAL 1 week);
-REPLACE INTO Events_Month SELECT Id,MonitorId,StartTime,DiskSpace FROM Events WHERE StartTime > DATE_SUB(NOW(),  INTERVAL 1 month);
-REPLACE INTO Events_Archived SELECT Id,MonitorId,DiskSpace FROM Events WHERE Archived=1;
-
-UPDATE Monitors INNER JOIN (
-  SELECT  MonitorId,
-    COUNT(Id) AS TotalEvents,
-    SUM(DiskSpace) AS TotalEventDiskSpace,
-    SUM(IF(Archived,1,0)) AS ArchivedEvents,
-    SUM(IF(Archived,DiskSpace,0)) AS ArchivedEventDiskSpace,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 hour),1,0)) AS HourEvents,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 hour),DiskSpace,0)) AS HourEventDiskSpace,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 day),1,0)) AS DayEvents,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 day),DiskSpace,0)) AS DayEventDiskSpace,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 week),1,0)) AS WeekEvents,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 week),DiskSpace,0)) AS WeekEventDiskSpace,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 month),1,0)) AS MonthEvents,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 month),DiskSpace,0)) AS MonthEventDiskSpace
-    FROM Events GROUP BY MonitorId
-    ) AS E ON E.MonitorId=Monitors.Id SET
-    Monitors.TotalEvents = E.TotalEvents,
-    Monitors.TotalEventDiskSpace = E.TotalEventDiskSpace,
-    Monitors.ArchivedEvents = E.ArchivedEvents,
-    Monitors.ArchivedEventDiskSpace = E.ArchivedEventDiskSpace,
-    Monitors.HourEvents = E.HourEvents,
-    Monitors.HourEventDiskSpace = E.HourEventDiskSpace,
-    Monitors.DayEvents = E.DayEvents,
-    Monitors.DayEventDiskSpace = E.DayEventDiskSpace,
-    Monitors.WeekEvents = E.WeekEvents,
-    Monitors.WeekEventDiskSpace = E.WeekEventDiskSpace,
-    Monitors.MonthEvents = E.MonthEvents,
-    Monitors.MonthEventDiskSpace = E.MonthEventDiskSpace;
-
---
--- Add Protocol column to Storage
---
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Servers'
-     AND column_name = 'Protocol'
-    ) > 0,
-"SELECT 'Column Protocol already exists in Servers'",
-"ALTER TABLE Servers ADD `Protocol` TEXT AFTER `Id`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
---
--- Add PathToIndex column to Storage
---
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Servers'
-     AND column_name = 'PathToIndex'
-    ) > 0,
-"SELECT 'Column PathToIndex already exists in Servers'",
-"ALTER TABLE Servers ADD `PathToIndex` TEXT AFTER `Hostname`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
---
--- Add PathToZMS column to Storage
---
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Servers'
-     AND column_name = 'PathToZMS'
-    ) > 0,
-"SELECT 'Column PathToZMS already exists in Servers'",
-"ALTER TABLE Servers ADD `PathToZMS` TEXT AFTER `PathToIndex`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
---
--- Add PathToApi column to Storage
---
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Servers'
-     AND column_name = 'PathToApi'
-    ) > 0,
-"SELECT 'Column PathToApi already exists in Servers'",
-"ALTER TABLE Servers ADD `PathToApi` TEXT AFTER `PathToZMS`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
---
--- Add Port column to Storage
---
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Servers'
-     AND column_name = 'Port'
-    ) > 0,
-"SELECT 'Column Port already exists in Servers'",
-"ALTER TABLE Servers ADD `Port` INTEGER UNSIGNED AFTER `Hostname`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;