Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-04-18 06:58:59 +02:00
Code Issues Projects Releases Wiki Activity

2018-01-12 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug that caused rdlogmanager(1) to throw SQL errors when
	importing music/traffic data.
This commit is contained in:
Fred Gleason 2018-01-12 13:07:21 -05:00
parent 00057d7c98
commit 20cf2abb65
4 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -16416,7 +16416,6 @@
* Fixed a bug that caused a log's link status flags to fail to be * Fixed a bug that caused a log's link status flags to fail to be
updated when the log was unlinked. updated when the log was unlinked.
2017-12-05 Fred Gleason <fredg@paravelsystems.com> 2017-12-05 Fred Gleason <fredg@paravelsystems.com>
<<<<<<< HEAD
* Changed the default [mySQL] 'Engine=' directive value to 'MyISAM'. * Changed the default [mySQL] 'Engine=' directive value to 'MyISAM'.
2017-12-06 Fred Gleason <fredg@paravelsystems.com> 2017-12-06 Fred Gleason <fredg@paravelsystems.com>
* Added a note regrading package dependencies to the header of * Added a note regrading package dependencies to the header of
@ -16586,3 +16585,6 @@
2018-01-10 Fred Gleason <fredg@paravelsystems.com> 2018-01-10 Fred Gleason <fredg@paravelsystems.com>
* Updated 'NEWS'. * Updated 'NEWS'.
* Incremented the package version to 2.18.2int01. * Incremented the package version to 2.18.2int01.
2018-01-12 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug that caused rdlogmanager(1) to throw SQL errors when
importing music/traffic data.

18
lib/rdevent_line.cpp
View File

@ -886,7 +886,7 @@ bool RDEventLine::generateLog(QString logname,const QString &svcname,
} }
bool RDEventLine::linkLog(RDLogEvent *e,int next_id,const QString &svcname, bool RDEventLine::linkLog(RDLogEvent *e,const QString &svcname,
RDLogLine *link_logline,const QString &track_str, RDLogLine *link_logline,const QString &track_str,
const QString &label_cart,const QString &track_cart, const QString &label_cart,const QString &track_cart,
const QString &import_table,QString *errors) const QString &import_table,QString *errors)
@ -951,7 +951,6 @@ bool RDEventLine::linkLog(RDLogEvent *e,int next_id,const QString &svcname,
// //
// Load Matching Events and Insert into Log // Load Matching Events and Insert into Log
// //
int id=-1;
sql=QString("select ")+ sql=QString("select ")+
"CART_NUMBER,"+ // 00 "CART_NUMBER,"+ // 00
"START_SECS,"+ // 01 "START_SECS,"+ // 01
@ -974,16 +973,13 @@ bool RDEventLine::linkLog(RDLogEvent *e,int next_id,const QString &svcname,
"(EVENT_USED=\"N\") order by ID"; "(EVENT_USED=\"N\") order by ID";
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);
while(q->next()) { while(q->next()) {
if((id=e->nextId())>next_id) {
next_id=id;
}
int length=GetLength(q->value(0).toUInt(),q->value(2).toInt()); int length=GetLength(q->value(0).toUInt(),q->value(2).toInt());
if(q->value(9).toUInt()==RDEventLine::InsertBreak) { if(q->value(9).toUInt()==RDEventLine::InsertBreak) {
if(q->value(7).toString()=="Y") { // Insert Break if(q->value(7).toString()=="Y") { // Insert Break
if((!event_nested_event.isEmpty()&&(event_nested_event!=event_name))) { if((!event_nested_event.isEmpty()&&(event_nested_event!=event_name))) {
e->insert(e->size(),1); e->insert(e->size(),1);
logline=e->logLine(e->size()-1); logline=e->logLine(e->size()-1);
logline->setId(next_id++); logline->setId(e->nextId());
logline->setStartTime(RDLogLine::Logged,time); logline->setStartTime(RDLogLine::Logged,time);
logline->setType(RDLogLine::TrafficLink); logline->setType(RDLogLine::TrafficLink);
logline->setSource(event_src); logline->setSource(event_src);
@ -1007,7 +1003,7 @@ bool RDEventLine::linkLog(RDLogEvent *e,int next_id,const QString &svcname,
if(q->value(8).toString()=="Y") { // Insert Track if(q->value(8).toString()=="Y") { // Insert Track
e->insert(e->size(),1); e->insert(e->size(),1);
logline=e->logLine(e->size()-1); logline=e->logLine(e->size()-1);
logline->setId(next_id++); logline->setId(e->nextId());
logline->setStartTime(RDLogLine::Logged,time); logline->setStartTime(RDLogLine::Logged,time);
logline->setType(RDLogLine::Track); logline->setType(RDLogLine::Track);
logline->setSource(event_src); logline->setSource(event_src);
@ -1027,7 +1023,7 @@ bool RDEventLine::linkLog(RDLogEvent *e,int next_id,const QString &svcname,
if(q->value(8).toString()=="Y") { // Insert Track if(q->value(8).toString()=="Y") { // Insert Track
e->insert(e->size(),1); e->insert(e->size(),1);
logline=e->logLine(e->size()-1); logline=e->logLine(e->size()-1);
logline->setId(next_id++); logline->setId(e->nextId());
logline->setStartTime(RDLogLine::Logged,time); logline->setStartTime(RDLogLine::Logged,time);
logline->setType(RDLogLine::Track); logline->setType(RDLogLine::Track);
logline->setSource(event_src); logline->setSource(event_src);
@ -1046,7 +1042,7 @@ bool RDEventLine::linkLog(RDLogEvent *e,int next_id,const QString &svcname,
if((!event_nested_event.isEmpty()&&(event_nested_event!=event_name))) { if((!event_nested_event.isEmpty()&&(event_nested_event!=event_name))) {
e->insert(e->size(),1); e->insert(e->size(),1);
logline=e->logLine(e->size()-1); logline=e->logLine(e->size()-1);
logline->setId(next_id++); logline->setId(e->nextId());
logline->setStartTime(RDLogLine::Logged,time); logline->setStartTime(RDLogLine::Logged,time);
logline->setType(RDLogLine::TrafficLink); logline->setType(RDLogLine::TrafficLink);
logline->setSource(event_src); logline->setSource(event_src);
@ -1071,7 +1067,7 @@ bool RDEventLine::linkLog(RDLogEvent *e,int next_id,const QString &svcname,
e->insert(e->size(),1); e->insert(e->size(),1);
logline=e->logLine(e->size()-1); logline=e->logLine(e->size()-1);
logline->setId(next_id++); logline->setId(e->nextId());
logline->setSource(event_src); logline->setSource(event_src);
logline->setStartTime(RDLogLine::Logged,time); logline->setStartTime(RDLogLine::Logged,time);
logline->setGraceTime(grace_time); logline->setGraceTime(grace_time);
@ -1154,7 +1150,7 @@ bool RDEventLine::linkLog(RDLogEvent *e,int next_id,const QString &svcname,
(time.addMSecs(q->value(1).toInt())>time)) { (time.addMSecs(q->value(1).toInt())>time)) {
e->insert(e->size(),1); e->insert(e->size(),1);
logline=e->logLine(e->size()-1); logline=e->logLine(e->size()-1);
logline->setId(next_id++); logline->setId(e->nextId());
logline->setStartTime(RDLogLine::Logged,time); logline->setStartTime(RDLogLine::Logged,time);
logline->setType(RDLogLine::Cart); logline->setType(RDLogLine::Cart);
logline->setSource(event_src); logline->setSource(event_src);

2
lib/rdevent_line.h
View File

@ -82,7 +82,7 @@ class RDEventLine
bool save(RDConfig *config); bool save(RDConfig *config);
bool generateLog(QString logname,const QString &svcname, bool generateLog(QString logname,const QString &svcname,
QString *errors, unsigned artistsep,QString clockname); QString *errors, unsigned artistsep,QString clockname);
bool linkLog(RDLogEvent *e,int next_id,const QString &svcname, bool linkLog(RDLogEvent *e,const QString &svcname,
RDLogLine *link_logline,const QString &track_str, RDLogLine *link_logline,const QString &track_str,
const QString &label_cart,const QString &track_cart, const QString &label_cart,const QString &track_cart,
const QString &import_table,QString *errors); const QString &import_table,QString *errors);

4
lib/rdsvc.cpp
View File

@ -880,8 +880,8 @@ bool RDSvc::linkLog(RDSvc::ImportSource src,const QDate &date,
RDEventLine *e=new RDEventLine(); RDEventLine *e=new RDEventLine();
e->setName(logline->linkEventName()); e->setName(logline->linkEventName());
e->load(); e->load();
e->linkLog(dest_event,dest_event->nextId(),svc_name,logline,track_str, e->linkLog(dest_event,svc_name,logline,track_str,label_cart,track_cart,
label_cart,track_cart,import_name,&autofill_errors); import_name,&autofill_errors);
delete e; delete e;
emit generationProgress(1+(24*current_link++)/total_links); emit generationProgress(1+(24*current_link++)/total_links);
} }