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

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

Browse Source 
* Removed the 'Cart Data Dump (fixed width)' report from
	rdlibrary(1).
This commit is contained in:
Fred Gleason 2019-04-24 17:54:26 -04:00
parent 01dc164ee5
commit 62a0914e05
10 changed files with 4 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -18602,3 +18602,6 @@
2019-04-24 Fred Gleason <fredg@paravelsystems.com> 2019-04-24 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rdlibrary(1) that broke the 'Cart Data Dump (CSV)' * Fixed a bug in rdlibrary(1) that broke the 'Cart Data Dump (CSV)'
report. report.
2019-04-24 Fred Gleason <fredg@paravelsystems.com>
* Removed the 'Cart Data Dump (fixed width)' report from
rdlibrary(1).

175
rdlibrary/list_reports.cpp
View File

@ -68,7 +68,6 @@ ListReports::ListReports(const QString &filter,const QString &type_filter,
list_reports_box->setGeometry(50,10,sizeHint().width()-60,19); list_reports_box->setGeometry(50,10,sizeHint().width()-60,19);
list_reports_box->insertItem(tr("Cart Report")); list_reports_box->insertItem(tr("Cart Report"));
list_reports_box->insertItem(tr("Cut Report")); list_reports_box->insertItem(tr("Cut Report"));
list_reports_box->insertItem(tr("Cart Data Dump (fixed width)"));
list_reports_box->insertItem(tr("Cart Data Dump (CSV)")); list_reports_box->insertItem(tr("Cart Data Dump (CSV)"));
list_reports_label=new QLabel(list_reports_box,tr("Type:"),this); list_reports_label=new QLabel(list_reports_box,tr("Type:"),this);
list_reports_label->setGeometry(10,10,35,19); list_reports_label->setGeometry(10,10,35,19);
@ -151,11 +150,7 @@ void ListReports::generateData()
GenerateCutReport(&report); GenerateCutReport(&report);
break; break;
case 2: // Cart Data Dump (fixed) case 2: // Cart Data Dump (CSV)
GenerateCartDumpFixed(&report,list_fieldnames_check->isChecked());
break;
case 3: // Cart Data Dump (CSV)
GenerateCartDumpCsv(&report,list_fieldnames_check->isChecked()); GenerateCartDumpCsv(&report,list_fieldnames_check->isChecked());
break; break;
@ -533,174 +528,6 @@ void ListReports::GenerateCutReport(QString *report)
} }
void ListReports::GenerateCartDumpFixed(QString *report,bool prepend_names)
{
QString sql;
RDSqlQuery *q;
QString schedcode="";
if(list_schedcode!=tr("ALL")) {
schedcode=list_schedcode;
}
//
// Prepend Field Names
//
if(prepend_names) {
*report="CART |";
*report+="CUT|";
*report+="GROUP_NAME|";
*report+="TITLE |";
*report+="ARTIST |";
*report+="ALBUM |";
*report+="YEAR|";
*report+="ISRC |";
*report+="LABEL |";
*report+="CLIENT |";
*report+="AGENCY |";
*report+="PUBLISHER |";
*report+="COMPOSER |";
*report+="USER_DEFINED |";
*report+="LENGTH |\n";
}
//
// Generate Rows
//
if(list_type_filter.isEmpty()) {
return;
}
sql=QString("select ")+
"CUTS.CUT_NAME,"+ // 00
"CART.GROUP_NAME,"+ // 01
"CART.TITLE,"+ // 02
"CART.ARTIST,"+ // 03
"CART.ALBUM,"+ // 04
"CART.YEAR,"+ // 05
"CUTS.ISRC,"+ // 06
"CART.LABEL,"+ // 07
"CART.CLIENT,"+ // 08
"CART.AGENCY,"+ // 09
"CART.PUBLISHER,"+ // 10
"CART.COMPOSER,"+ // 11
"CART.USER_DEFINED,"+ // 12
"CUTS.LENGTH "+ // 13
"from CART join CUTS "+
"on CART.NUMBER=CUTS.CART_NUMBER ";
if(list_group==QString("ALL")) {
sql+=RDAllCartSearchText(list_filter,schedcode,rda->user()->name(),true)+" && "+
list_type_filter+" order by CUTS.CUT_NAME";
}
else {
sql+=RDCartSearchText(list_filter,list_group,schedcode,true)+" && "+
list_type_filter+" order by CUTS.CUT_NAME";
}
q=new RDSqlQuery(sql);
while(q->next()) {
//
// Cart Number
//
*report+=QString().sprintf("%-6s|",(const char *)q->value(0).toString().
utf8().left(6));
//
// Cut Number
//
*report+=
QString().sprintf("%-3s|",(const char *)q->value(0).toString().right(3));
//
// Group Name
//
*report+=QString().sprintf("%-10s|",(const char *)q->value(1).toString().
utf8());
//
// Title
//
*report+=QString().sprintf("%-255s|",(const char *)q->value(2).toString().
utf8());
//
// Artist
//
*report+=QString().sprintf("%-255s|",(const char *)q->value(3).toString().
utf8());
//
// Album
//
*report+=QString().sprintf("%-255s|",(const char *)q->value(4).toString().
utf8());
//
// Year
//
if(q->value(5).toDate().isNull()) {
*report+=" |";
}
else {
*report+=QString().sprintf("%4d|",q->value(5).toDate().year());
}
//
// ISRC
//
*report+=QString().sprintf("%-12s|",(const char *)q->value(6).toString().
utf8());
//
// Label
//
*report+=QString().sprintf("%-64s|",(const char *)q->value(7).toString().
utf8());
//
// Client
//
*report+=QString().sprintf("%-64s|",(const char *)q->value(8).toString().
utf8());
//
// Agency
//
*report+=QString().sprintf("%-64s|",(const char *)q->value(9).toString().
utf8());
//
// Publisher
//
*report+=QString().sprintf("%-64s|",(const char *)q->value(10).toString().
utf8());
//
// Composer
//
*report+=QString().sprintf("%-64s|",(const char *)q->value(11).toString().
utf8());
//
// User Defined
//
*report+=QString().sprintf("%-255s|",(const char *)q->value(12).toString().
utf8());
//
// Length
//
*report+=QString().sprintf("%9s|",
(const char *)RDGetTimeLength(q->value(13).toInt(),true,true));
//
// End of Line
//
*report+="\n";
}
delete q;
}
void ListReports::GenerateCartDumpCsv(QString *report,bool prepend_names) void ListReports::GenerateCartDumpCsv(QString *report,bool prepend_names)
{ {
QString sql; QString sql;

1
rdlibrary/list_reports.h
View File

@ -46,7 +46,6 @@ class ListReports : public QDialog
private: private:
void GenerateCartReport(QString *report); void GenerateCartReport(QString *report);
void GenerateCutReport(QString *report); void GenerateCutReport(QString *report);
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; QString CsvField(QString str) const;
QLabel *list_reports_label; QLabel *list_reports_label;

4
rdlibrary/rdlibrary_cs.ts
View File

@ -1075,10 +1075,6 @@ poznámky</translation>
<source>ALL</source> <source>ALL</source>
<translation type="unfinished">VŠE</translation> <translation type="unfinished">VŠE</translation>
</message> </message>
<message>
<source>Cart Data Dump (fixed width)</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Cart Data Dump (CSV)</source> <source>Cart Data Dump (CSV)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>

4
rdlibrary/rdlibrary_de.ts
View File

@ -1063,10 +1063,6 @@ Notes</source>
<source>ALL</source> <source>ALL</source>
<translation type="unfinished">ALLE</translation> <translation type="unfinished">ALLE</translation>
</message> </message>
<message>
<source>Cart Data Dump (fixed width)</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Cart Data Dump (CSV)</source> <source>Cart Data Dump (CSV)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>

4
rdlibrary/rdlibrary_es.ts
View File

@ -1072,10 +1072,6 @@ Notas</translation>
<source>ALL</source> <source>ALL</source>
<translation type="unfinished">TODAS</translation> <translation type="unfinished">TODAS</translation>
</message> </message>
<message>
<source>Cart Data Dump (fixed width)</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Cart Data Dump (CSV)</source> <source>Cart Data Dump (CSV)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>

4
rdlibrary/rdlibrary_fr.ts
View File

@ -885,10 +885,6 @@ Notes</source>
<source>ALL</source> <source>ALL</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Cart Data Dump (fixed width)</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Cart Data Dump (CSV)</source> <source>Cart Data Dump (CSV)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>

4
rdlibrary/rdlibrary_nb.ts
View File

@ -1059,10 +1059,6 @@ Notes</source>
<source>ALL</source> <source>ALL</source>
<translation type="unfinished">ALT</translation> <translation type="unfinished">ALT</translation>
</message> </message>
<message>
<source>Cart Data Dump (fixed width)</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Cart Data Dump (CSV)</source> <source>Cart Data Dump (CSV)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>

4
rdlibrary/rdlibrary_nn.ts
View File

@ -1059,10 +1059,6 @@ Notes</source>
<source>ALL</source> <source>ALL</source>
<translation type="unfinished">ALT</translation> <translation type="unfinished">ALT</translation>
</message> </message>
<message>
<source>Cart Data Dump (fixed width)</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Cart Data Dump (CSV)</source> <source>Cart Data Dump (CSV)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>

4
rdlibrary/rdlibrary_pt_BR.ts
View File

@ -1061,10 +1061,6 @@ limite do sistema! Você ainda quer salvar?</translation>
<source>ALL</source> <source>ALL</source>
<translation type="unfinished">TODOS</translation> <translation type="unfinished">TODOS</translation>
</message> </message>
<message>
<source>Cart Data Dump (fixed width)</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Cart Data Dump (CSV)</source> <source>Cart Data Dump (CSV)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>