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

2018-08-02 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Modified reports in rdcatch(1) to display UTF-8 strings
	correctly.
This commit is contained in:
Fred Gleason 2018-08-02 18:37:45 -04:00
parent ec6207c7d6
commit ad767309c7
4 changed files with 177 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -17302,3 +17302,6 @@
2018-08-02 Fred Gleason <fredg@paravelsystems.com>
* Modified reports in rdlogedit(1) to display UTF-8 strings
correctly.
2018-08-02 Fred Gleason <fredg@paravelsystems.com>
* Modified reports in rdcatch(1) to display UTF-8 strings
correctly.

7
lib/rdcut_path.cpp
View File

@ -31,21 +31,20 @@ QString RDCutPath(QString cutname)
RDCut *cut=new RDCut(cutname);
if(!cut->exists()) {
delete cut;
return QString(QObject::tr("UNKNOWN CUT"));
return QObject::tr("UNKNOWN CUT");
}
RDCart *cart=new RDCart(cut->cartNumber());
if(!cart->exists()) {
delete cart;
delete cut;
return QString("UNKNOWN CUT");
return QObject::tr("UNKNOWN CUT");
}
if((cart->title().isEmpty())&&(cut->description().isEmpty())) {
path=QString();
}
else {
path=QString().sprintf("%s->%s",(const char *)cart->title(),
(const char *)cut->description());
path=cart->title()+"->"+cut->description();
}
delete cart;
delete cut;

5
rdcatch/edit_playout.cpp
View File

@ -383,7 +383,10 @@ void EditPlayout::PopulateDecks(QComboBox *box)
int count=0;
box->clear();
QString sql=QString("select STATION_NAME,CHANNEL from DECKS where ")+
QString sql=QString("select ")+
"STATION_NAME,"+ // 00
"CHANNEL "+ // 01
"from DECKS where "+
"(CARD_NUMBER!=-1)&&"+
"(PORT_NUMBER!=-1)&&"+
"(CHANNEL>128) order by STATION_NAME,CHANNEL";

317
rdcatch/list_reports.cpp
View File

@ -28,6 +28,7 @@
#include <rddb.h>
#include <rdescape_string.h>
#include <rdrecording.h>
#include <rdreport.h>
#include <rdtextfile.h>
#include "globals.h"
@ -115,16 +116,16 @@ void ListReports::generateData()
QString report;
switch(list_reports_box->currentItem()) {
case 0: // Event Report
GenerateEventReport(&report);
break;
case 0: // Event Report
GenerateEventReport(&report);
break;
case 1: // XLoad Report
GenerateXloadReport(&report);
break;
case 1: // XLoad Report
GenerateXloadReport(&report);
break;
default:
return;
default:
return;
}
RDTextFile(report);
}
@ -147,61 +148,77 @@ void ListReports::GenerateEventReport(QString *report)
//
// Generate Header
//
*report=" Rivendell RDCatch Event Report\n";
*report+=QString().
sprintf("Generated: %s\n",
(const char *)QDateTime(QDate::currentDate(),QTime::currentTime()).
toString("MM/dd/yyyy - hh:mm:ss"));
*report=RDReport::center("Rivendell RDCatch Event Report",132)+"\n";
*report+=QString("Generated: ")+QDateTime::currentDateTime().toString("MM/dd/yyyy - hh:mm:ss")+"\n";
*report+="\n";
*report+="T -Start-------- -End---------- -Days of Week- -Location----- -Source------------- -Destination-------- -Description-----------------\n";
//
// Generate Rows
//
sql="select TYPE,START_TYPE,START_TIME,END_TYPE,END_TIME,LENGTH,SUN,MON,\
TUE,WED,THU,FRI,SAT,STATION_NAME,CHANNEL,CUT_NAME,URL,MACRO_CART,\
SWITCH_INPUT,SWITCH_OUTPUT,DESCRIPTION \
from RECORDINGS order by START_TIME";
sql=QString("select ")+
"TYPE,"+ // 00
"START_TYPE,"+ // 01
"START_TIME,"+ // 02
"END_TYPE,"+ // 03
"END_TIME,"+ // 04
"LENGTH,"+ // 05
"SUN,"+ // 06
"MON,"+ // 07
"TUE,"+ // 08
"WED,"+ // 09
"THU,"+ // 10
"FRI,"+ // 11
"SAT,"+ // 12
"STATION_NAME,"+ // 13
"CHANNEL,"+ // 14
"CUT_NAME,"+ // 15
"URL,"+ // 16
"MACRO_CART,"+ // 17
"SWITCH_INPUT,"+ // 18
"SWITCH_OUTPUT,"+ // 19
"DESCRIPTION "+ // 20
"from RECORDINGS order by START_TIME";
q=new RDSqlQuery(sql);
while(q->next()) {
//
// Event Type
//
switch((RDRecording::Type)q->value(0).toInt()) {
case RDRecording::Recording:
*report+="R";
exists=RDCut::exists(q->value(15).toString());
break;
case RDRecording::Recording:
*report+="R";
exists=RDCut::exists(q->value(15).toString());
break;
case RDRecording::MacroEvent:
*report+="M";
exists=RDCart::exists(q->value(17).toUInt());
break;
case RDRecording::MacroEvent:
*report+="M";
exists=RDCart::exists(q->value(17).toUInt());
break;
case RDRecording::SwitchEvent:
*report+="S";
exists=true;
break;
case RDRecording::SwitchEvent:
*report+="S";
exists=true;
break;
case RDRecording::Playout:
*report+="P";
exists=RDCut::exists(q->value(15).toString());
break;
case RDRecording::Playout:
*report+="P";
exists=RDCut::exists(q->value(15).toString());
break;
case RDRecording::Download:
*report+="D";
exists=RDCut::exists(q->value(15).toString());
break;
case RDRecording::Download:
*report+="D";
exists=RDCut::exists(q->value(15).toString());
break;
case RDRecording::Upload:
*report+="U";
exists=RDCut::exists(q->value(15).toString());
break;
case RDRecording::Upload:
*report+="U";
exists=RDCut::exists(q->value(15).toString());
break;
default:
*report+="?";
exists=true;
break;
default:
*report+="?";
exists=true;
break;
}
if(exists) {
*report+=" ";
@ -214,47 +231,43 @@ void ListReports::GenerateEventReport(QString *report)
// Start Time
//
switch((RDRecording::StartType)q->value(1).toInt()) {
case RDRecording::HardStart:
*report+=QString().
sprintf("Hard: %-8s ",(const char *)q->value(2).toTime().
toString("hh:mm:ss"));
break;
case RDRecording::HardStart:
*report+=QString("Hard: ")+
RDReport::leftJustify(q->value(2).toTime().toString("hh:mm:ss"),8)+" ";
break;
case RDRecording::GpiStart:
*report+=QString().
sprintf("Gpi: %-8s ",(const char *)q->value(2).toTime().
toString("hh:mm:ss"));
break;
case RDRecording::GpiStart:
*report+=QString("Gpi: ")+
RDReport::leftJustify(q->value(2).toTime().toString("hh:mm:ss"),8)+" ";
break;
}
//
// End Time
//
switch((RDRecording::Type)q->value(0).toInt()) {
case RDRecording::Recording:
switch((RDRecording::EndType)q->value(3).toInt()) {
case RDRecording::HardEnd:
*report+=QString().
sprintf("Hard: %-8s ",(const char *)q->value(4).toTime().
toString("hh:mm:ss"));
break;
case RDRecording::Recording:
switch((RDRecording::EndType)q->value(3).toInt()) {
case RDRecording::HardEnd:
*report+=QString("Hard: ")+
RDReport::leftJustify(q->value(4).toTime().toString("hh:mm:ss"),8)+" ";
break;
case RDRecording::GpiEnd:
*report+=QString().
sprintf("Gpi: %-8s ",(const char *)q->value(4).toTime().
toString("hh:mm:ss"));
break;
case RDRecording::GpiEnd:
*report+=QString("Gpi: ")+
RDReport::leftJustify(q->value(4).toTime().toString("hh:mm:ss"),8)+" ";
break;
case RDRecording::LengthEnd:
*report+=QString().sprintf("Len: %-8s ",
(const char *)RDGetTimeLength(q->value(5).toInt(),false,false));
break;
}
break;
case RDRecording::LengthEnd:
*report+=QString("Len: ")+
RDReport::leftJustify(RDGetTimeLength(q->value(5).toInt(),false,false),8)+" ";
break;
}
break;
default:
*report+=" ";
break;
default:
*report+=" ";
break;
}
//
@ -307,23 +320,21 @@ void ListReports::GenerateEventReport(QString *report)
// Location
//
switch((RDRecording::Type)q->value(0).toInt()) {
case RDRecording::Recording:
str=QString().sprintf("%s:%d",
(const char *)q->value(13).toString().left(12),
q->value(14).toInt());
break;
case RDRecording::Recording:
str=q->value(13).toString().left(12)+
QString().sprintf(":%d",q->value(14).toInt());
break;
case RDRecording::Playout:
str=QString().sprintf("%s:%d",
(const char *)q->value(13).toString().left(12),
q->value(14).toInt()-128);
break;
case RDRecording::Playout:
str=q->value(13).toString().left(12)+
QString().sprintf(":%d",q->value(14).toInt()-128);
break;
default:
str=q->value(13).toString().left(14);
break;
default:
str=q->value(13).toString().left(14);
break;
}
*report+=QString().sprintf("%-14s ",(const char *)str);
*report+=RDReport::leftJustify(str,14)+" ";
//
// Source and Destination
@ -338,54 +349,52 @@ void ListReports::GenerateEventReport(QString *report)
QString().sprintf("(CHANNEL=%d)",q->value(14).toInt());
q1=new RDSqlQuery(sql);
if(q1->first()) {
*report+=QString().sprintf("%-20s ",
(const char *)GetSourceName(q1->value(0).toString(),
q1->value(1).toInt(),
q->value(18).toInt()).left(20));
*report+=
RDReport::leftJustify(GetSourceName(q1->value(0).toString(),
q1->value(1).toInt(),
q->value(18).toInt()).left(20),20)+" ";
}
else {
*report+=" ";
}
delete q1;
*report+=QString().sprintf("Cut %10s ",
(const char *)q->value(15).toString().left(20));
*report+=QString("Cut ")+
RDReport::leftJustify(q->value(15).toString(),10)+" ";
break;
case RDRecording::MacroEvent:
*report+=QString().sprintf("Cart %06u ",
q->value(17).toUInt());
*report+=QString("Cart ")+
QString().sprintf("%06u ",q->value(17).toUInt());
*report+=" ";
break;
case RDRecording::SwitchEvent:
*report+=QString().sprintf("%-20s ",
(const char *)GetSourceName(q->value(13).toString(),
q->value(14).toInt(),
q->value(18).toInt()).left(20));
*report+=QString().sprintf("%-20s ",
(const char *)GetDestinationName(q->value(13).toString(),
q->value(14).toInt(),
q->value(19).toInt()).left(20));
*report+=
RDReport::leftJustify(GetSourceName(q->value(13).toString(),
q->value(14).toInt(),
q->value(18).toInt()),20)+" ";
*report+=
RDReport::leftJustify(GetDestinationName(q->value(13).toString(),
q->value(14).toInt(),
q->value(19).toInt()),20)+" ";
break;
case RDRecording::Playout:
*report+=QString().sprintf("Cut %10s ",
(const char *)q->value(15).toString().left(20));
*report+=QString("Cut ")+
RDReport::leftJustify(q->value(15).toString(),10)+" ";
*report+=" ";
break;
case RDRecording::Download:
*report+=QString().sprintf("%-20s ",
(const char *)q->value(16).toString().left(20));
*report+=QString().sprintf("Cut %10s ",
(const char *)q->value(15).toString().left(20));
*report+=RDReport::leftJustify(q->value(16).toString().left(20),20)+" ";
*report+=QString("Cut ")+
RDReport::leftJustify(q->value(15).toString(),10)+" ";
break;
case RDRecording::Upload:
*report+=QString().sprintf("Cut %10s ",
(const char *)q->value(15).toString().left(20));
*report+=QString().sprintf("%-20s ",
(const char *)q->value(16).toString().left(20));
*report+=QString("Cut ")+
RDReport::leftJustify(q->value(15).toString(),10)+" ";
*report+=RDReport::leftJustify(q->value(16).toString(),20)+" ";
break;
case RDRecording::LastType:
@ -415,41 +424,54 @@ void ListReports::GenerateXloadReport(QString *report)
//
// Generate Header
//
*report=" Rivendell RDCatch Upload/Download Report\n";
*report+=QString().
sprintf("Generated: %s\n",
(const char *)QDateTime(QDate::currentDate(),QTime::currentTime()).
toString("MM/dd/yyyy - hh:mm:ss"));
*report=RDReport::center("Rivendell RDCatch Upload/Download Report",132)+"\n";
*report+=QString("Generated: ")+
QDateTime::currentDateTime().toString("MM/dd/yyyy")+"\n";
*report+="\n";
*report+="T -Start-- -Days of Week- -Location----- -Cut------- -URL------------------------------------- -Username---- -Description------------\n";
//
// Generate Rows
//
sql=QString().sprintf("select TYPE,START_TIME,SUN,MON,TUE,WED,THU,FRI,SAT,\
STATION_NAME,CUT_NAME,URL,URL_USERNAME,DESCRIPTION \
from RECORDINGS where (TYPE=%d)||(TYPE=%d) order by START_TIME",
RDRecording::Upload,RDRecording::Download);
sql=QString("select ")+
"TYPE,"+ // 00
"START_TIME,"+ // 01
"SUN,"+ // 02
"MON,"+ // 03
"TUE,"+ // 04
"WED,"+ // 05
"THU,"+ // 06
"FRI,"+ // 07
"SAT,"+ // 08
"STATION_NAME,"+ // 09
"CUT_NAME,"+ // 10
"URL,"+ // 11
"URL_USERNAME,"+ // 12
"DESCRIPTION "+ // 13
"from RECORDINGS where "+
QString().sprintf("(TYPE=%d)||",RDRecording::Upload)+
QString().sprintf("(TYPE=%d) ",RDRecording::Download)+
"order by START_TIME";
q=new RDSqlQuery(sql);
while(q->next()) {
//
// Event Type
//
switch((RDRecording::Type)q->value(0).toInt()) {
case RDRecording::Download:
*report+="D";
exists=RDCut::exists(q->value(10).toString());
break;
case RDRecording::Download:
*report+="D";
exists=RDCut::exists(q->value(10).toString());
break;
case RDRecording::Upload:
*report+="U";
exists=RDCut::exists(q->value(10).toString());
break;
case RDRecording::Upload:
*report+="U";
exists=RDCut::exists(q->value(10).toString());
break;
default:
*report+="?";
exists=true;
break;
default:
*report+="?";
exists=true;
break;
}
if(exists) {
*report+=" ";
@ -461,8 +483,7 @@ void ListReports::GenerateXloadReport(QString *report)
//
// Start Time
//
*report+=QString().sprintf("%8s ",
(const char *)q->value(1).toTime().toString("hh:mm:ss"));
*report+=RDReport::leftJustify(q->value(1).toTime().toString("hh:mm:ss"),8)+" ";
//
// Days of the Week
@ -494,7 +515,7 @@ void ListReports::GenerateXloadReport(QString *report)
if(q->value(6).toString()=="Y") {
*report+="Th";
}
else {
else {
*report+=" ";
}
if(q->value(7).toString()=="Y") {
@ -509,35 +530,31 @@ void ListReports::GenerateXloadReport(QString *report)
else {
*report+=" ";
}
//
// Location
//
*report+=QString().sprintf("%-14s ",
(const char *)q->value(9).toString().left(14));
*report+=RDReport::leftJustify(q->value(9).toString(),14)+" ";
//
// Cut
//
*report+=QString().sprintf("%11s ",(const char *)q->value(10).toString());
*report+=RDReport::leftJustify(q->value(10).toString(),11)+" ";
//
// URL
//
*report+=QString().sprintf("%-41s ",
(const char *)q->value(11).toString().left(41));
*report+=RDReport::leftJustify(q->value(11).toString(),41)+" ";
//
// URL Username
//
*report+=QString().sprintf("%-13s ",
(const char *)q->value(12).toString().left(13));
*report+=RDReport::leftJustify(q->value(12).toString(),13)+" ";
//
// Description
//
*report+=QString().sprintf("%s",
(const char *)q->value(13).toString().left(24));
*report+=RDReport::leftJustify(q->value(13).toString(),24);
//
// End of Line