Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-08-10 09:01:17 +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 broke the 'Cart Data Dump (CSV)'
	report.
This commit is contained in:
Fred Gleason 2019-04-24 17:46:50 -04:00
parent d0bcd00173
commit 01dc164ee5
3 changed files with 104 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -18599,3 +18599,6 @@
* Changed the 'Wht' column in the 'Cut Report' in rdlibrary(1) * Changed the 'Wht' column in the 'Cut Report' in rdlibrary(1)
to be 'W/O' and display weight or order values as appropriate to be 'W/O' and display weight or order values as appropriate
for the 'Schedule Cuts' setting. for the 'Schedule Cuts' setting.
2019-04-24 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rdlibrary(1) that broke the 'Cart Data Dump (CSV)'
report.

208
rdlibrary/list_reports.cpp
View File

@ -705,9 +705,9 @@ void ListReports::GenerateCartDumpCsv(QString *report,bool prepend_names)
{ {
QString sql; QString sql;
RDSqlQuery *q; RDSqlQuery *q;
RDSqlQuery *q1;
QString schedcode=""; QString schedcode="";
QStringList f0; QStringList f0;
int code_quan=0;
if(list_schedcode!=tr("ALL")) { if(list_schedcode!=tr("ALL")) {
schedcode=list_schedcode; schedcode=list_schedcode;
@ -724,33 +724,33 @@ void ListReports::GenerateCartDumpCsv(QString *report,bool prepend_names)
"CART.TYPE,"+ // 01 "CART.TYPE,"+ // 01
"CUTS.CUT_NAME,"+ // 02 "CUTS.CUT_NAME,"+ // 02
"CART.GROUP_NAME,"+ // 03 "CART.GROUP_NAME,"+ // 03
"CART.TITLE,CART.ARTIST,"+ // 04 "CART.TITLE,"+ // 04
"CART.ALBUM,"+ // 05 "CART.ARTIST,"+ // 05
"CART.YEAR,"+ // 06 "CART.ALBUM,"+ // 06
"CUTS.ISRC,"+ // 07 "CART.YEAR,"+ // 07
"CUTS.ISCI,"+ // 08 "CUTS.ISRC,"+ // 08
"CART.LABEL,"+ // 09 "CUTS.ISCI,"+ // 09
"CART.CLIENT,"+ // 10 "CART.LABEL,"+ // 10
"CART.AGENCY,"+ // 11 "CART.CLIENT,"+ // 11
"CART.PUBLISHER,"+ // 12 "CART.AGENCY,"+ // 12
"CART.COMPOSER,"+ // 13 "CART.PUBLISHER,"+ // 13
"CART.CONDUCTOR,"+ // 14 "CART.COMPOSER,"+ // 14
"CART.SONG_ID,"+ // 15 "CART.CONDUCTOR,"+ // 15
"CART.USER_DEFINED,"+ // 16 "CART.SONG_ID,"+ // 16
"CUTS.DESCRIPTION,"+ // 17 "CART.USER_DEFINED,"+ // 17
"CUTS.OUTCUE,"+ // 18 "CUTS.DESCRIPTION,"+ // 18
"CUTS.LENGTH,"+ // 19 "CUTS.OUTCUE,"+ // 19
"CUTS.START_POINT,"+ // 20 "CUTS.LENGTH,"+ // 20
"CUTS.END_POINT,"+ // 21 "CUTS.START_POINT,"+ // 21
"CUTS.SEGUE_START_POINT,"+ // 22 "CUTS.END_POINT,"+ // 22
"CUTS.SEGUE_END_POINT,"+ // 23 "CUTS.SEGUE_START_POINT,"+ // 23
"CUTS.HOOK_START_POINT,"+ // 24 "CUTS.SEGUE_END_POINT,"+ // 24
"CUTS.HOOK_END_POINT,"+ // 25 "CUTS.HOOK_START_POINT,"+ // 25
"CUTS.TALK_START_POINT,"+ // 26 "CUTS.HOOK_END_POINT,"+ // 26
"CUTS.TALK_END_POINT,"+ // 27 "CUTS.TALK_START_POINT,"+ // 27
"CUTS.FADEUP_POINT,"+ // 28 "CUTS.TALK_END_POINT,"+ // 28
"CUTS.FADEDOWN_POINT,"+ // 29 "CUTS.FADEUP_POINT,"+ // 29
"SCHED_CODES "+ // 30 "CUTS.FADEDOWN_POINT "+ // 30
"from CART left join CUTS "+ "from CART left join CUTS "+
"on CART.NUMBER=CUTS.CART_NUMBER "; "on CART.NUMBER=CUTS.CART_NUMBER ";
if(list_group==QString("ALL")) { if(list_group==QString("ALL")) {
@ -763,98 +763,83 @@ void ListReports::GenerateCartDumpCsv(QString *report,bool prepend_names)
} }
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);
//
// Get max number of scheduler codes
//
while(q->next()) {
f0=q->value(17).toString().split(" ");
if((int)f0.size()>code_quan) {
code_quan=f0.size();
}
}
code_quan--;
// //
// Prepend Field Names // Prepend Field Names
// //
if(prepend_names) { if(prepend_names) {
*report=QString("CART,")+ *report=QString("CART_NUMBER,")+ // 00
"CUT,"+ // 00 "CUT_NUMBER,"+ // 01
"TYPE,"+ // 01 "TYPE,"+ // 02
"GROUP_NAME,"+ // 02 "GROUP_NAME,"+ // 03
"TITLE,"+ // 03 "TITLE,"+ // 04
"ARTIST,"+ // 04 "ARTIST,"+ // 05
"ALBUM,"+ // 05 "ALBUM,"+ // 06
"YEAR,"+ // 06 "YEAR,"+ // 07
"ISRC,"+ // 07 "ISRC,"+ // 08
"ISCI,"+ // 08 "ISCI,"+ // 09
"LABEL,"+ // 09 "LABEL,"+ // 10
"CLIENT,"+ // 10 "CLIENT,"+ // 11
"AGENCY,"+ // 11 "AGENCY,"+ // 12
"PUBLISHER,"+ // 12 "PUBLISHER,"+ // 13
"COMPOSER,"+ // 13 "COMPOSER,"+ // 14
"CONDUCTOR,"+ // 14 "CONDUCTOR,"+ // 15
"SONG_ID,"+ // 15 "SONG_ID,"+ // 16
"USER_DEFINED,"+ // 16 "USER_DEFINED,"+ // 17
"DESCRIPTION,"+ // 17 "DESCRIPTION,"+ // 18
"OUTCUE,"+ // 18 "OUTCUE,"+ // 19
"FILENAME,LENGTH,"+ // 19 "FILENAME,LENGTH,"+ // 20
"START_POINT,"+ // 20 "START_POINT,"+ // 21
"END_POINT,"+ // 21 "END_POINT,"+ // 22
"SEGUE_START_POINT,"+ // 22 "SEGUE_START_POINT,"+ // 23
"SEGUE_END_POINT,"+ // 23 "SEGUE_END_POINT,"+ // 24
"HOOK_START_POINT,"+ // 24 "HOOK_START_POINT,"+ // 25
"HOOK_END_POINT,"+ // 25 "HOOK_END_POINT,"+ // 26
"TALK_START_POINT,"+ // 26 "TALK_START_POINT,"+ // 27
"TALK_END_POINT,"+ // 27 "TALK_END_POINT,"+ // 28
"FADEUP_POINT,"+ // 28 "FADEUP_POINT,"+ // 29
"FADEDOWN_POINT,"; // 29 "FADEDOWN_POINT,"+ // 30
for(int i=0;i<code_quan;i++) { "SCHED_CODES"; // 31
*report+=QString().sprintf("SCHED_CODE%u,",i+1); // 30
}
*report=report->left(report->length()-1);
*report+="\n"; *report+="\n";
} }
// //
// Generate Rows // Generate Rows
// //
q->seek(-1);
while(q->next()) { while(q->next()) {
RDCart::Type type=(RDCart::Type)q->value(1).toInt(); RDCart::Type type=(RDCart::Type)q->value(1).toInt();
*report+=QString().sprintf("%u,",q->value(0).toUInt()); *report+=QString().sprintf("%u,",q->value(0).toUInt());
if(type==RDCart::Macro) { if(type==RDCart::Macro) {
*report+="0,\"macro\","; *report+="0,macro,";
} }
else { else {
*report+=QString().sprintf("%u,",RDCut::cutNumber(q->value(2).toString())); *report+=QString().sprintf("%u,",RDCut::cutNumber(q->value(2).toString()));
*report+="\"audio\","; *report+="audio,";
} }
*report+="\""+q->value(3).toString()+"\","; *report+=CsvField(q->value(3).toString())+",";
*report+="\""+q->value(4).toString()+"\","; *report+=CsvField(q->value(4).toString())+",";
*report+="\""+q->value(5).toString()+"\","; *report+=CsvField(q->value(5).toString())+",";
*report+="\""+q->value(6).toString()+"\","; *report+=CsvField(q->value(6).toString())+",";
*report+="\""+q->value(7).toDate().toString("yyyy")+"\","; *report+=CsvField(q->value(7).toDate().toString("yyyy"))+",";
*report+="\""+q->value(8).toString()+"\","; *report+=CsvField(q->value(8).toString())+",";
*report+="\""+q->value(9).toString()+"\","; *report+=CsvField(q->value(9).toString())+",";
*report+="\""+q->value(10).toString()+"\","; *report+=CsvField(q->value(10).toString())+",";
*report+="\""+q->value(11).toString()+"\","; *report+=CsvField(q->value(11).toString())+",";
*report+="\""+q->value(12).toString()+"\","; *report+=CsvField(q->value(12).toString())+",";
*report+="\""+q->value(13).toString()+"\","; *report+=CsvField(q->value(13).toString())+",";
*report+="\""+q->value(14).toString()+"\","; *report+=CsvField(q->value(14).toString())+",";
*report+="\""+q->value(15).toString()+"\","; *report+=CsvField(q->value(15).toString())+",";
*report+="\""+q->value(16).toString()+"\","; *report+=CsvField(q->value(16).toString())+",";
*report+="\""+q->value(17).toString()+"\","; *report+=CsvField(q->value(17).toString())+",";
*report+="\""+q->value(18).toString()+"\","; *report+=CsvField(q->value(18).toString())+",";
*report+="\""+q->value(19).toString()+"\","; *report+=CsvField(q->value(19).toString())+",";
if(type==RDCart::Macro) { if(type==RDCart::Macro) {
*report+="\"\","; *report+=",";
} }
else { else {
*report+="\""+q->value(2).toString()+".wav\","; *report+=CsvField(q->value(2).toString()+".wav")+",";
} }
*report+="\""+ *report+=
RDGetTimeLength(q->value(20).toInt(),false,false).stripWhiteSpace()+"\","; RDGetTimeLength(q->value(20).toInt(),false,false).stripWhiteSpace()+",";
if(type==RDCart::Macro) { if(type==RDCart::Macro) {
*report+="-1,"; *report+="-1,";
*report+="-1,"; *report+="-1,";
@ -879,17 +864,24 @@ void ListReports::GenerateCartDumpCsv(QString *report,bool prepend_names)
*report+=QString().sprintf("%d,",q->value(29).toInt()); *report+=QString().sprintf("%d,",q->value(29).toInt());
*report+=QString().sprintf("%d,",q->value(30).toInt()); *report+=QString().sprintf("%d,",q->value(30).toInt());
} }
sql=QString("select SCHED_CODE from CART_SCHED_CODES where ")+
f0=q->value(31).toString().split(" "); QString().sprintf("CART_NUMBER=%u",q->value(0).toUInt());
for(int i=0;i<code_quan;i++) { QString schedcodes="";
if(((int)f0.size()>i)&&(f0[i]!=".")) { q1=new RDSqlQuery(sql);
*report+="\""+f0[i].stripWhiteSpace()+"\","; while(q1->next()) {
} schedcodes+=q1->value(0).toString()+"|";
else {
*report+="\"\",";
}
} }
*report=report->left(report->length()-1); if(schedcodes.right(1)=="|") {
schedcodes=schedcodes.left(schedcodes.length()-1);
}
*report+=CsvField(schedcodes);
delete q1;
*report+="\n"; *report+="\n";
} }
} }
QString ListReports::CsvField(QString str) const
{
return "\""+str.replace("\"","\"\"")+"\"";
}

1
rdlibrary/list_reports.h
View File

@ -48,6 +48,7 @@ class ListReports : public QDialog
void GenerateCutReport(QString *report); void GenerateCutReport(QString *report);
void GenerateCartDumpFixed(QString *report,bool prepend_names); void GenerateCartDumpFixed(QString *report,bool prepend_names);
void GenerateCartDumpCsv(QString *report,bool prepend_names); void GenerateCartDumpCsv(QString *report,bool prepend_names);
QString CsvField(QString str) const;
QLabel *list_reports_label; QLabel *list_reports_label;
QComboBox *list_reports_box; QComboBox *list_reports_box;
QCheckBox *list_fieldnames_check; QCheckBox *list_fieldnames_check;