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

2015-01-28 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in 'rdlibrary/list_reports.cpp' that broke the
	'Cart Data Dump (CSV)' report when the library was filtered by
	group.
	* Added 'CONDUCTOR', 'SONG_ID' and 'SCHED_CODE' fields to the
	'Cart Data Dump (CSV)' report in 'rdlibrary/list_reports.cpp'.
This commit is contained in:
Fred Gleason 2015-01-28 18:27:48 -05:00
parent bc271371fa
commit 774e3c42e7
2 changed files with 61 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -14725,5 +14725,11 @@
2015-01-26 Fred Gleason <fredg@paravelsystems.com> 2015-01-26 Fred Gleason <fredg@paravelsystems.com>
* Reverted GPI logic reversal for the Broadcast Tools GPI-16 in * Reverted GPI logic reversal for the Broadcast Tools GPI-16 in
'ripcd/btgpi16.cpp' and 'ripcd/btgpi16.h'. 'ripcd/btgpi16.cpp' and 'ripcd/btgpi16.h'.
2015-01-26 Fred Gleason <fredg@paravelsystems.com> 2015-01-27 Fred Gleason <fredg@paravelsystems.com>
* Incremented the package version to 2.10.2int02. * Incremented the package version to 2.10.2int02.
2015-01-28 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in 'rdlibrary/list_reports.cpp' that broke the
'Cart Data Dump (CSV)' report when the library was filtered by
group.
* Added 'CONDUCTOR', 'SONG_ID' and 'SCHED_CODE' fields to the
'Cart Data Dump (CSV)' report in 'rdlibrary/list_reports.cpp'.

69
rdlibrary/list_reports.cpp
View File

@ -22,6 +22,7 @@
#include <qdialog.h> #include <qdialog.h>
#include <qpushbutton.h> #include <qpushbutton.h>
#include <qstringlist.h>
#include <rddb.h> #include <rddb.h>
#include <rdconf.h> #include <rdconf.h>
@ -688,40 +689,65 @@ void ListReports::GenerateCartDumpCsv(QString *report,bool prepend_names)
QString sql; QString sql;
RDSqlQuery *q; RDSqlQuery *q;
QString schedcode=""; QString schedcode="";
QStringList f0;
unsigned code_quan=0;
if(list_schedcode!=tr("ALL")) { if(list_schedcode!=tr("ALL")) {
schedcode=list_schedcode; schedcode=list_schedcode;
} }
//
// Prepend Field Names
//
if(prepend_names) {
*report="CART,CUT,GROUP_NAME,TITLE,ARTIST,ALBUM,YEAR,ISRC,ISCI,LABEL,";
*report+="CLIENT,AGENCY,PUBLISHER,COMPOSER,USER_DEFINED,LENGTH\n";
}
// //
// Generate Rows // Generate Rows
// //
if(list_type_filter.isEmpty()) { if(list_type_filter.isEmpty()) {
return; return;
} }
sql="select CUTS.CUT_NAME,CART.GROUP_NAME,CART.TITLE,CART.ARTIST,CART.ALBUM,\ sql=QString("select CUTS.CUT_NAME,CART.GROUP_NAME,CART.TITLE,CART.ARTIST,")+
CART.YEAR,CUTS.ISRC,CUTS.ISCI,CART.LABEL,CART.CLIENT,CART.AGENCY,\ "CART.ALBUM,CART.YEAR,CUTS.ISRC,CUTS.ISCI,CART.LABEL,CART.CLIENT,"+
CART.PUBLISHER,CART.COMPOSER,CART.USER_DEFINED,CUTS.LENGTH from CART \ "CART.AGENCY,CART.PUBLISHER,CART.COMPOSER,CART.CONDUCTOR,CART.SONG_ID,"+
join CUTS on CART.NUMBER=CUTS.CART_NUMBER"; "CART.USER_DEFINED,CUTS.LENGTH,SCHED_CODES from CART "+
"join CUTS on CART.NUMBER=CUTS.CART_NUMBER";
if(list_group==QString("ALL")) { if(list_group==QString("ALL")) {
sql+=QString(" where ")+ sql+=QString(" where ")+
RDAllCartSearchText(list_filter,schedcode,lib_user->name(),true)+" && "+ RDAllCartSearchText(list_filter,schedcode,lib_user->name(),true)+" && "+
list_type_filter+" order by CUTS.CUT_NAME"; list_type_filter+" order by CUTS.CUT_NAME";
} }
else { else {
sql=QString(" where ")+ sql+=QString(" where ")+
RDCartSearchText(list_filter,list_group,schedcode,true)+" && "+ RDCartSearchText(list_filter,list_group,schedcode,true)+" && "+
list_type_filter+" order by CUTS.CUT_NAME"; list_type_filter+" order by CUTS.CUT_NAME";
} }
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);
//
// Get max number of scheduler codes
//
while(q->next()) {
f0=f0.split(" ",q->value(17).toString());
if(f0.size()>code_quan) {
code_quan=f0.size();
}
}
code_quan--;
//
// Prepend Field Names
//
if(prepend_names) {
*report="CART,CUT,GROUP_NAME,TITLE,ARTIST,ALBUM,YEAR,ISRC,ISCI,LABEL,";
*report+="CLIENT,AGENCY,PUBLISHER,COMPOSER,CONDUCTOR,SONG_ID,USER_DEFINED,";
*report+="LENGTH,";
for(unsigned i=0;i<code_quan;i++) {
*report+=QString().sprintf("SCHED_CODE%u,",i+1);
}
*report=report->left(report->length()-1);
*report+="\n";
}
//
// Generate Rows
//
q->seek(-1);
while(q->next()) { while(q->next()) {
*report+=QString().sprintf("%u,",RDCut::cartNumber(q->value(0).toString())); *report+=QString().sprintf("%u,",RDCut::cartNumber(q->value(0).toString()));
*report+=QString().sprintf("%u,",RDCut::cutNumber(q->value(0).toString())); *report+=QString().sprintf("%u,",RDCut::cutNumber(q->value(0).toString()));
@ -729,7 +755,7 @@ void ListReports::GenerateCartDumpCsv(QString *report,bool prepend_names)
*report+="\""+q->value(2).toString()+"\","; *report+="\""+q->value(2).toString()+"\",";
*report+="\""+q->value(3).toString()+"\","; *report+="\""+q->value(3).toString()+"\",";
*report+="\""+q->value(4).toString()+"\","; *report+="\""+q->value(4).toString()+"\",";
*report+="\""+q->value(5).toString()+"\","; *report+="\""+q->value(5).toDate().toString("yyyy")+"\",";
*report+="\""+q->value(6).toString()+"\","; *report+="\""+q->value(6).toString()+"\",";
*report+="\""+q->value(7).toString()+"\","; *report+="\""+q->value(7).toString()+"\",";
*report+="\""+q->value(8).toString()+"\","; *report+="\""+q->value(8).toString()+"\",";
@ -738,7 +764,20 @@ void ListReports::GenerateCartDumpCsv(QString *report,bool prepend_names)
*report+="\""+q->value(11).toString()+"\","; *report+="\""+q->value(11).toString()+"\",";
*report+="\""+q->value(12).toString()+"\","; *report+="\""+q->value(12).toString()+"\",";
*report+="\""+q->value(13).toString()+"\","; *report+="\""+q->value(13).toString()+"\",";
*report+="\""+RDGetTimeLength(q->value(14).toInt(),false,false)+"\","; *report+="\""+q->value(14).toString()+"\",";
*report+="\""+q->value(15).toString()+"\",";
*report+="\""+
RDGetTimeLength(q->value(16).toInt(),false,false).stripWhiteSpace()+"\",";
f0=f0.split(" ",q->value(17).toString());
for(unsigned i=0;i<code_quan;i++) {
if((f0.size()>i)&&(f0[i]!=".")) {
*report+="\""+f0[i].stripWhiteSpace()+"\",";
}
else {
*report+="\"\",";
}
}
*report=report->left(report->length()-1);
*report+="\n"; *report+="\n";
} }
} }