From 2f8f6c91ea88b04f8318ef1785d3e6c43f72c339 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Tue, 6 Apr 2021 13:30:19 -0400 Subject: [PATCH] 2021-04-06 Fred Gleason * Renamed the 'RadioTraffic.com Traffic Reconciliation' to 'Original RadioTraffic.com Traffic Reconciliation (DEPRECATED)' in rdadmin(1). * Added a new 'RadioTraffic.com Traffic Reconciliation' report. Signed-off-by: Fred Gleason --- ChangeLog | 5 +++++ lib/export_radiotraffic.cpp | 7 ++++++- lib/librd_cs.ts | 4 ++++ lib/librd_de.ts | 4 ++++ lib/librd_es.ts | 4 ++++ lib/librd_fr.ts | 4 ++++ lib/librd_nb.ts | 4 ++++ lib/librd_nn.ts | 4 ++++ lib/librd_pt_BR.ts | 4 ++++ lib/rdreport.cpp | 14 +++++++++----- lib/rdreport.h | 8 ++++---- 11 files changed, 52 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6328a2a9..a0736c8b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21410,3 +21410,8 @@ * Fixed a bug in rdlogmanager(1) that could cause SQL errors to be thrown when processing ELR records containing null values in the 'EXT_START_TIME' column. +2021-04-06 Fred Gleason + * Renamed the 'RadioTraffic.com Traffic Reconciliation' to + 'Original RadioTraffic.com Traffic Reconciliation (DEPRECATED)' + in rdadmin(1). + * Added a new 'RadioTraffic.com Traffic Reconciliation' report. diff --git a/lib/export_radiotraffic.cpp b/lib/export_radiotraffic.cpp index 31f94ee5..b693d52e 100644 --- a/lib/export_radiotraffic.cpp +++ b/lib/export_radiotraffic.cpp @@ -84,7 +84,12 @@ bool RDReport::ExportRadioTraffic(const QString &filename, // Write Data Rows // while(q->next()) { - *strm << q->value(4).toTime().toString("hh:mm:ss")+" "; + if(q->value(4).isNull()) { + *strm << "00:00:00 "; + } + else { + *strm << q->value(4).toTime().toString("hh:mm:ss")+" "; + } *strm << q->value(2).toDateTime().toString("hh:mm:ss")+" "; if(q->value(5).toInt()>0) { if(version>0) { diff --git a/lib/librd_cs.ts b/lib/librd_cs.ts index 3f67d1aa..ea831d37 100644 --- a/lib/librd_cs.ts +++ b/lib/librd_cs.ts @@ -981,6 +981,10 @@ Hook End + + Original RadioTraffic.com Traffic Reconciliation (DEPRECATED) + + RDAddCart diff --git a/lib/librd_de.ts b/lib/librd_de.ts index b2843146..2050e091 100644 --- a/lib/librd_de.ts +++ b/lib/librd_de.ts @@ -977,6 +977,10 @@ Hook End + + Original RadioTraffic.com Traffic Reconciliation (DEPRECATED) + + RDAddCart diff --git a/lib/librd_es.ts b/lib/librd_es.ts index 694a41db..b266dccc 100644 --- a/lib/librd_es.ts +++ b/lib/librd_es.ts @@ -977,6 +977,10 @@ Hook End + + Original RadioTraffic.com Traffic Reconciliation (DEPRECATED) + + RDAddCart diff --git a/lib/librd_fr.ts b/lib/librd_fr.ts index a171b144..1edd5726 100644 --- a/lib/librd_fr.ts +++ b/lib/librd_fr.ts @@ -943,6 +943,10 @@ Hook End + + Original RadioTraffic.com Traffic Reconciliation (DEPRECATED) + + RDAddCart diff --git a/lib/librd_nb.ts b/lib/librd_nb.ts index ce8fb6d9..7c4f4657 100644 --- a/lib/librd_nb.ts +++ b/lib/librd_nb.ts @@ -977,6 +977,10 @@ Hook End + + Original RadioTraffic.com Traffic Reconciliation (DEPRECATED) + + RDAddCart diff --git a/lib/librd_nn.ts b/lib/librd_nn.ts index ce8fb6d9..7c4f4657 100644 --- a/lib/librd_nn.ts +++ b/lib/librd_nn.ts @@ -977,6 +977,10 @@ Hook End + + Original RadioTraffic.com Traffic Reconciliation (DEPRECATED) + + RDAddCart diff --git a/lib/librd_pt_BR.ts b/lib/librd_pt_BR.ts index 2a722e15..e4cda810 100644 --- a/lib/librd_pt_BR.ts +++ b/lib/librd_pt_BR.ts @@ -978,6 +978,10 @@ Hook End + + Original RadioTraffic.com Traffic Reconciliation (DEPRECATED) + + RDAddCart diff --git a/lib/rdreport.cpp b/lib/rdreport.cpp index fb8866cf..7bd0793c 100644 --- a/lib/rdreport.cpp +++ b/lib/rdreport.cpp @@ -20,8 +20,7 @@ #include -#include -#include +#include #include "rdapplication.h" #include "rdconf.h" @@ -614,9 +613,9 @@ bool RDReport::generateReport(const QDate &startdate,const QDate &enddate, ret=ExportRadioTraffic(filename,startdate,enddate,mixname,0); break; - // case RDReport::RadioTraffic2: - // ret=ExportRadioTraffic(filename,startdate,enddate,mixname,1); - // break; + case RDReport::RadioTraffic2: + ret=ExportRadioTraffic(filename,startdate,enddate,mixname,1); + break; case RDReport::VisualTraffic: ret=ExportDeltaflex(filename,startdate,enddate,mixname); @@ -705,6 +704,9 @@ QString RDReport::filterText(RDReport::ExportFilter filter) return QObject::tr("NPR/DS SoundExchange Report"); case RDReport::RadioTraffic: + return QObject::tr("Original RadioTraffic.com Traffic Reconciliation (DEPRECATED)"); + + case RDReport::RadioTraffic2: return QObject::tr("RadioTraffic.com Traffic Reconciliation"); case RDReport::VisualTraffic: @@ -779,6 +781,7 @@ bool RDReport::multipleDaysAllowed(RDReport::ExportFilter filter) case RDReport::CbsiDeltaFlex: case RDReport::TextLog: case RDReport::RadioTraffic: + case RDReport::RadioTraffic2: case RDReport::VisualTraffic: case RDReport::CounterPoint: case RDReport::CounterPoint2: @@ -812,6 +815,7 @@ bool RDReport::multipleMonthsAllowed(RDReport::ExportFilter filter) case RDReport::TextLog: case RDReport::BmiEmr: case RDReport::RadioTraffic: + case RDReport::RadioTraffic2: case RDReport::VisualTraffic: case RDReport::CounterPoint: case RDReport::CounterPoint2: diff --git a/lib/rdreport.h b/lib/rdreport.h index a05d700f..256ce6d6 100644 --- a/lib/rdreport.h +++ b/lib/rdreport.h @@ -2,7 +2,7 @@ // // Abstract a Rivendell Report Descriptor // -// (C) Copyright 2002-2020 Fred Gleason +// (C) Copyright 2002-2021 Fred Gleason // // 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 @@ -21,8 +21,7 @@ #ifndef RDREPORT_H #define RDREPORT_H -#include -#include +#include #include #include @@ -37,7 +36,8 @@ class RDReport CounterPoint=7,Music1=8,MusicSummary=9,WideOrbit=10, NprSoundExchange=11,MusicPlayout=12,NaturalLog=13, MusicClassical=14,MrMaster=15,SpinCount=16,CutLog=17, - CounterPoint2=18,ResultsReport=19,LastFilter=20}; + CounterPoint2=18,ResultsReport=19,RadioTraffic2=20, + LastFilter=21}; enum ExportOs {Linux=0,Windows=1}; enum ExportType {Generic=0,Traffic=1,Music=2}; enum StationType {TypeOther=0,TypeAm=1,TypeFm=2,TypeLast=3};