ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bug 284 - Now fixes control devices also. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1872 e3e1d417-86f3-4887-817a-d78f3d33393f
pull/27/merge
stan 2006-02-08 12:23:21 +00:00
parent e04804ae5b
commit a021337eda
1 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/zmfix.cpp
View File

@ -86,7 +86,7 @@ int main( int argc, char *argv[] )
// Only do registered devices
static char sql[BUFSIZ];
snprintf( sql, sizeof(sql), "select distinct Device from Monitors where Type = 'Local'" );
snprintf( sql, sizeof(sql), "select distinct Device from Monitors where not isnull(ControlDevice) and Type = 'Local'" );
if ( mysql_query( &dbconn, sql ) )
{
Error(( "Can't run query: %s", mysql_error( &dbconn ) ));
@ -102,8 +102,34 @@ int main( int argc, char *argv[] )
for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ )
{
const char *device = dbrow[0];
fixDevice( device );
fixDevice( dbrow[0] );
}
if ( mysql_errno( &dbconn ) )
{
Error(( "Can't fetch row: %s", mysql_error( &dbconn ) ));
exit( mysql_errno( &dbconn ) );
}
// Yadda yadda
mysql_free_result( result );
snprintf( sql, sizeof(sql), "select distinct ControlDevice from Monitors where not isnull(ControlDevice)" );
if ( mysql_query( &dbconn, sql ) )
{
Error(( "Can't run query: %s", mysql_error( &dbconn ) ));
exit( mysql_errno( &dbconn ) );
}
result = mysql_store_result( &dbconn );
if ( !result )
{
Error(( "Can't use query result: %s", mysql_error( &dbconn ) ));
exit( mysql_errno( &dbconn ) );
}
for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ )
{
fixDevice( dbrow[0] );
}
if ( mysql_errno( &dbconn ) )
@ -121,5 +147,6 @@ int main( int argc, char *argv[] )
fixDevice( config.x10_device );
}
}
return( 0 );
}