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

fix specifying ServerId

pull/1207/head
Isaac Connor 2015-10-02 18:22:48 +00:00
parent 6570a8d855
commit ac8bfc71dc
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/zm_monitor.cpp
View File

@ -2057,9 +2057,7 @@ int Monitor::LoadLocalMonitors( const char *device, Monitor **&monitors, Purpose
}
if ( staticConfig.SERVER_ID ) {
Debug( 1, "Server ID %d", staticConfig.SERVER_ID );
sql += " AND ServerId='";
sql += staticConfig.SERVER_ID;
sql += "'";
sql += stringtf( " AND ServerId=%d", staticConfig.SERVER_ID );
}
MYSQL_RES *result = zmDbFetch( sql.c_str() );
@ -2233,9 +2231,7 @@ int Monitor::LoadRemoteMonitors( const char *protocol, const char *host, const c
{
std::string sql = "select Id, Name, ServerId, Function+0, Enabled, LinkedMonitors, Protocol, Method, Host, Port, Path, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, RTSPDescribe, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, LabelSize, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, Exif from Monitors where Function != 'None' and Type = 'Remote'";
if ( staticConfig.SERVER_ID ) {
sql += " AND ServerId='";
sql += staticConfig.SERVER_ID;
sql += "'";
sql += stringtf( " AND ServerId=%d", staticConfig.SERVER_ID );
}
if ( protocol ) {
@ -2418,9 +2414,7 @@ int Monitor::LoadFileMonitors( const char *file, Monitor **&monitors, Purpose pu
sql += "'";
}
if ( staticConfig.SERVER_ID ) {
sql += " AND ServerId='";
sql += staticConfig.SERVER_ID;
sql += "'";
sql += stringtf( " AND ServerId=%d", staticConfig.SERVER_ID );
}
MYSQL_RES *result = zmDbFetch( sql.c_str() );
if ( !result )
@ -2562,9 +2556,7 @@ int Monitor::LoadFfmpegMonitors( const char *file, Monitor **&monitors, Purpose
sql += "'";
}
if ( staticConfig.SERVER_ID ) {
sql += " AND ServerId='";
sql += staticConfig.SERVER_ID;
sql += "'";
sql += stringtf( " AND ServerId=%d", staticConfig.SERVER_ID );
}
MYSQL_RES *result = zmDbFetch( sql.c_str() );
if ( ! result ) {