Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-12-05 16:20:14 +01:00
Code Issues Projects Releases Wiki Activity

2024-02-14 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in rdlogmanager(1) that could throw SQL
	'column out of range' errors when importing traffic logs.
	* Fixed a bug in rdlogmanager(1) that threw SQL errors when processing
	log GUIDs containing apostrophes.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2024-02-14 11:57:32 -05:00
parent a14b878973
commit c83ac46270
3 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -24658,3 +24658,8 @@
* Added a 'RDEventFilter' class. * Added a 'RDEventFilter' class.
* Fixed bugs in rdairplay(1) that caused scroll bars to appear when * Fixed bugs in rdairplay(1) that caused scroll bars to appear when
loading web content into the message widget. loading web content into the message widget.
2024-02-14 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdlogmanager(1) that could throw SQL
'column out of range' errors when importing traffic logs.
* Fixed a bug in rdlogmanager(1) that threw SQL errors when processing
log GUIDs containing apostrophes.

22
lib/rdsvc.cpp
View File

@@ -590,11 +590,17 @@ bool RDSvc::import(ImportSource src,const QDate &date,const QString &break_str,
int minutes_len_length=q->value(19).toInt(); int minutes_len_length=q->value(19).toInt();
int seconds_len_offset=q->value(20).toInt(); int seconds_len_offset=q->value(20).toInt();
int seconds_len_length=q->value(21).toInt(); int seconds_len_length=q->value(21).toInt();
int trans_type_offset=q->value(22).toInt();
int trans_type_length=q->value(23).toInt();
int time_type_offset=q->value(24).toInt();
int time_type_length=q->value(25).toInt();
int trans_type_offset=0; // Only used for music imports
int trans_type_length=0;
int time_type_offset=0;
int time_type_length=0;
if(src==RDSvc::Music) {
trans_type_offset=q->value(22).toInt();
trans_type_length=q->value(23).toInt();
time_type_offset=q->value(24).toInt();
time_type_length=q->value(25).toInt();
}
delete q; delete q;
// //
@@ -737,10 +743,10 @@ bool RDSvc::import(ImportSource src,const QDate &date,const QString &break_str,
// //
if(start_time_ok&&cart_ok&&(cartnum>0)&&(cartnum<=RD_MAX_CART_NUMBER)) { if(start_time_ok&&cart_ok&&(cartnum>0)&&(cartnum<=RD_MAX_CART_NUMBER)) {
sql+=QString::asprintf("`TYPE`=%u,",RDLogLine::Cart)+ sql+=QString::asprintf("`TYPE`=%u,",RDLogLine::Cart)+
"`EXT_DATA`='"+data_buf.trimmed()+"',"+ "`EXT_DATA`='"+RDEscapeString(data_buf.trimmed())+"',"+
"`EXT_EVENT_ID`='"+eventid_buf.trimmed()+"',"+ "`EXT_EVENT_ID`='"+RDEscapeString(eventid_buf.trimmed())+"',"+
"`EXT_ANNC_TYPE`='"+annctype_buf.trimmed()+"',"+ "`EXT_ANNC_TYPE`='"+RDEscapeString(annctype_buf.trimmed())+"',"+
"`EXT_CART_NAME`='"+cartname.trimmed()+"',"+ "`EXT_CART_NAME`='"+RDEscapeString(cartname.trimmed())+"',"+
QString::asprintf("`CART_NUMBER`=%u,",cartnum)+ QString::asprintf("`CART_NUMBER`=%u,",cartnum)+
"`TITLE`='"+RDEscapeString(title)+"'"; "`TITLE`='"+RDEscapeString(title)+"'";
RDSqlQuery::apply(sql); RDSqlQuery::apply(sql);

4
rdadmin/test_import.cpp
View File

@@ -172,8 +172,8 @@ void TestImport::importData()
QString sql=QString("delete from `IMPORTER_LINES` where ")+ QString sql=QString("delete from `IMPORTER_LINES` where ")+
"`STATION_NAME`='"+RDEscapeString(rda->station()->name())+"' && "+ "`STATION_NAME`='"+RDEscapeString(rda->station()->name())+"' && "+
QString::asprintf("`PROCESS_ID`=%u",getpid()); QString::asprintf("`PROCESS_ID`=%u",getpid());
printf("IMPORTER_LINES cleanup SQL: %s\n",sql.toUtf8().constData()); // printf("IMPORTER_LINES cleanup SQL: %s\n",sql.toUtf8().constData());
// RDSqlQuery::apply(sql); RDSqlQuery::apply(sql);
} }