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

2020-04-16 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in 'RDEventLine' that caused the
	'Append Log' ['AL'] RML to append a copy of the currently loaded
	log instead of the one specified in the RML command.

Signed-off-by: Fred Gleason <fredg@paraelsystems.com>
This commit is contained in:
Fred Gleason
2020-04-15 12:24:47 -04:00
parent 095ae09138
commit 118c019edc
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/rdlog_event.cpp
View File

@@ -2,7 +2,7 @@
//
// Abstract Rivendell Log Events.
//
// (C) Copyright 2002-2014,2016-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2020 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -117,7 +117,7 @@ int RDLogEvent::load(bool track_ptrs)
log_max_id=log->nextId();
delete log;
LoadLines(0,track_ptrs);
LoadLines(log_name,0,track_ptrs);
return log_line.size();
}
@@ -179,7 +179,7 @@ void RDLogEvent::save(RDConfig *config,bool update_tracks,int line)
int RDLogEvent::append(const QString &logname,bool track_ptrs)
{
return LoadLines(log_max_id,track_ptrs);
return LoadLines(logname,log_max_id,track_ptrs);
}
@@ -794,7 +794,7 @@ QString RDLogEvent::xml() const
}
int RDLogEvent::LoadLines(int id_offset,bool track_ptrs)
int RDLogEvent::LoadLines(const QString &logname,int id_offset,bool track_ptrs)
{
RDLogLine line;
RDSqlQuery *q1;
@@ -887,7 +887,7 @@ int RDLogEvent::LoadLines(int id_offset,bool track_ptrs)
"CART.NOTES "+ // 65
"from LOG_LINES left join CART "+
"on LOG_LINES.CART_NUMBER=CART.NUMBER where "+
"LOG_LINES.LOG_NAME=\""+RDEscapeString(log_name)+"\" "+
"LOG_LINES.LOG_NAME=\""+RDEscapeString(logname)+"\" "+
"order by COUNT";
q=new RDSqlQuery(sql);
if(q->size()<=0) {