diff --git a/ChangeLog b/ChangeLog index e33e2522..0015003c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15222,3 +15222,6 @@ 2016-06-10 Fred Gleason * Fixed a bug in 'rdairplay/list_logs.cpp' that failed to process SQL NULL date values correctly. +2016-06-10 Fred Gleason + * Fixed a bug in 'lib/rdlist_logs.cpp' that failed to process + SQL NULL date values correctly. diff --git a/lib/rdlist_logs.cpp b/lib/rdlist_logs.cpp index 2b8eacae..a76d9cc3 100644 --- a/lib/rdlist_logs.cpp +++ b/lib/rdlist_logs.cpp @@ -163,12 +163,14 @@ void RDListLogs::RefreshList() if(services_list.size()==0) { return; } - sql=QString().sprintf("select NAME,DESCRIPTION,SERVICE from LOGS \ - where (TYPE=0)&&(LOG_EXISTS=\"Y\")&&\ - ((START_DATE<=\"%s\")||(START_DATE=\"0000-00-00\"))&&\ - ((END_DATE>=\"%s\")||(END_DATE=\"0000-00-00\"))&&(", - (const char *)current_date.toString("yyyy-MM-dd"), - (const char *)current_date.toString("yyyy-MM-dd")); + sql=QString("select NAME,DESCRIPTION,SERVICE from LOGS ")+ + "where (TYPE=0)&&(LOG_EXISTS=\"Y\")&&"+ + "((START_DATE<=\""+current_date.toString("yyyy-MM-dd")+"\")||"+ + "(START_DATE=\"0000-00-00\")||"+ + "(START_DATE is null))&&"+ + "((END_DATE>=\""+current_date.toString("yyyy-MM-dd")+"\")||"+ + "(END_DATE=\"0000-00-00\")||"+ + "(END_DATE is null))&&("; for ( QStringList::Iterator it = services_list.begin(); it != services_list.end(); ++it ) { sql+=QString().sprintf("SERVICE=\"%s\"||",