Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-29 07:02:34 +02:00
Code Issues Projects Releases Wiki Activity

2019-04-24 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in rdlibrary(1) that caused the 'Cart Report' to
	show duplicate lines for carts containing more than one cut.
This commit is contained in:
Fred Gleason 2019-04-24 12:49:47 -04:00
parent 9f95fec5e1
commit b807ab0598
2 changed files with 99 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -18588,3 +18588,6 @@
2019-04-22 Patrick Linstruth <patrick@deltecent.com> 2019-04-22 Patrick Linstruth <patrick@deltecent.com>
* Fixed a bug in rdlogmanager(1) that could corrupt the * Fixed a bug in rdlogmanager(1) that could corrupt the
'CLOCK_LINES' table when renaming an event. 'CLOCK_LINES' table when renaming an event.
2019-04-24 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rdlibrary(1) that caused the 'Cart Report' to
show duplicate lines for carts containing more than one cut.

187
rdlibrary/list_reports.cpp
View File

@ -2,7 +2,7 @@
// //
// List RDLibrary Reports // List RDLibrary Reports
// //
// (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // 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 // it under the terms of the GNU General Public License version 2 as
@ -222,101 +222,106 @@ void ListReports::GenerateCartReport(QString *report)
sql+=RDCartSearchText(list_filter,list_group,schedcode,true)+" && "+ sql+=RDCartSearchText(list_filter,list_group,schedcode,true)+" && "+
list_type_filter+" order by NUMBER"; list_type_filter+" order by NUMBER";
} }
unsigned prev_cartnum=0;
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);
while(q->next()) { while(q->next()) {
// if(q->value(1).toUInt()!=prev_cartnum) { // So we don't show duplicates
// Cart Type prev_cartnum=q->value(1).toUInt();
//
switch((RDCart::Type)q->value(0).toInt()) {
case RDCart::Audio:
*report+=" A ";
break;
case RDCart::Macro: //
*report+=" M "; // Cart Type
break; //
switch((RDCart::Type)q->value(0).toInt()) {
case RDCart::Audio:
*report+=" A ";
break;
default: case RDCart::Macro:
*report+=" ? "; *report+=" M ";
break; break;
default:
*report+=" ? ";
break;
}
//
// Cart Number
//
*report+=QString().sprintf("%06u ",q->value(1).toUInt());
//
// Group
//
*report+=RDReport::leftJustify(q->value(2).toString(),10)+" ";
//
// Length
//
*report+=RDReport::rightJustify(RDGetTimeLength(q->value(3).toInt(),false,false),5)+" ";
//
// Title
//
*report+=RDReport::leftJustify(q->value(4).toString(),31)+" ";
//
// Artist
//
*report+=RDReport::leftJustify(q->value(5).toString(),30)+" ";
//
// Cut Quantity
//
*report+=QString().sprintf("%4d ",q->value(6).toInt());
//
// Play Order
//
switch((RDCart::PlayOrder)q->value(7).toInt()) {
case RDCart::Sequence:
*report+="SEQ ";
break;
case RDCart::Random:
*report+="RND ";
break;
default:
*report+="??? ";
break;
}
//
// Enforce Length
//
if(q->value(8).toString()=="Y") {
*report+="Yes ";
}
else {
*report+="No ";
}
//
// Length Deviation
//
*report+=RDReport::rightJustify(RDGetTimeLength(q->value(9).toInt(),false,true),7)+" ";
//
// Owner
//
if(q->value(10).toString().isEmpty()) {
*report+="[none] ";
}
else {
*report+=RDReport::leftJustify(q->value(10).toString(),20);
}
//
// End of Line
//
*report+="\n";
} }
//
// Cart Number
//
*report+=QString().sprintf("%06u ",q->value(1).toUInt());
//
// Group
//
*report+=RDReport::leftJustify(q->value(2).toString(),10)+" ";
//
// Length
//
*report+=RDReport::rightJustify(RDGetTimeLength(q->value(3).toInt(),false,false),5)+" ";
//
// Title
//
*report+=RDReport::leftJustify(q->value(4).toString(),31)+" ";
//
// Artist
//
*report+=RDReport::leftJustify(q->value(5).toString(),30)+" ";
//
// Cut Quantity
//
*report+=QString().sprintf("%4d ",q->value(6).toInt());
//
// Play Order
//
switch((RDCart::PlayOrder)q->value(7).toInt()) {
case RDCart::Sequence:
*report+="SEQ ";
break;
case RDCart::Random:
*report+="RND ";
break;
default:
*report+="??? ";
break;
}
//
// Enforce Length
//
if(q->value(8).toString()=="Y") {
*report+="Yes ";
}
else {
*report+="No ";
}
//
// Length Deviation
//
*report+=RDReport::rightJustify(RDGetTimeLength(q->value(9).toInt(),false,true),7)+" ";
//
// Owner
//
if(q->value(10).toString().isEmpty()) {
*report+="[none] ";
}
else {
*report+=RDReport::leftJustify(q->value(10).toString(),20);
}
//
// End of Line
//
*report+="\n";
} }
delete q; delete q;
} }