From 56bd41eea9ca4bffdecaa271604119cd2ca57974 Mon Sep 17 00:00:00 2001 From: stan Date: Wed, 26 Mar 2003 11:59:50 +0000 Subject: [PATCH] Updated for remote cameras, more efficient query and database function. git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@411 e3e1d417-86f3-4887-817a-d78f3d33393f --- src/zmfix.cpp | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/src/zmfix.cpp b/src/zmfix.cpp index a83d56b51..1fbf3e679 100644 --- a/src/zmfix.cpp +++ b/src/zmfix.cpp @@ -28,13 +28,8 @@ #include #include -extern "C" -{ -#include "zmcfg.h" -#include "zmdbg.h" -} - -MYSQL dbconn; +#include "zm.h" +#include "zm_db.h" bool fixDevice( int device ) { @@ -90,9 +85,9 @@ bool fixDevice( int device ) int main( int argc, char *argv[] ) { char dbg_name_string[16] = "zmfix"; - dbg_name = dbg_name_string; + zm_dbg_name = dbg_name_string; - DbgInit(); + zmDbgInit(); if ( argc > 1 && !strcmp( argv[1], "-a" ) ) { @@ -108,24 +103,10 @@ int main( int argc, char *argv[] ) else { // Only do registered devices - if ( !mysql_init( &dbconn ) ) - { - fprintf( stderr, "Can't initialise structure: %s\n", mysql_error( &dbconn ) ); - exit( mysql_errno( &dbconn ) ); - } - if ( !mysql_connect( &dbconn, ZM_DB_SERVER, ZM_DB_USERA, ZM_DB_PASSA ) ) - { - fprintf( stderr, "Can't connect to server: %s\n", mysql_error( &dbconn ) ); - exit( mysql_errno( &dbconn ) ); - } - if ( mysql_select_db( &dbconn, ZM_DB_NAME ) ) - { - fprintf( stderr, "Can't select database: %s\n", mysql_error( &dbconn ) ); - exit( mysql_errno( &dbconn ) ); - } + zmDbConnect( ZM_DB_USERA, ZM_DB_PASSA ); static char sql[256]; - sprintf( sql, "select Device from Monitors where Function != 'None'" ); + sprintf( sql, "select distinct Device from Monitors where Function != 'None' and Type = 'Local'" ); if ( mysql_query( &dbconn, sql ) ) { Error(( "Can't run query: %s\n", mysql_error( &dbconn ) ));