From c38f4cbb4bee8e8be4d4d03e6568bd1adc13dd93 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Mon, 16 Oct 2017 11:04:56 -0400 Subject: [PATCH] 2017-10-16 Fred Gleason * Removed policy to update cut expiration date/time automatically upon audio update. --- ChangeLog | 3 +++ lib/rdcut.cpp | 9 --------- rdadmin/edit_group.cpp | 2 +- rdadmin/rdadmin_cs.ts | 2 +- rdadmin/rdadmin_de.ts | 2 +- rdadmin/rdadmin_es.ts | 2 +- rdadmin/rdadmin_fr.ts | 2 +- rdadmin/rdadmin_nb.ts | 2 +- rdadmin/rdadmin_nn.ts | 2 +- rdadmin/rdadmin_pt_BR.ts | 2 +- 10 files changed, 11 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 803c8ba4..71a4027b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16156,3 +16156,6 @@ 2017-10-16 Fred Gleason * Fixed a bug in RDLibrary that prevented more than 64 characters from being entered for the 'Album' field [Github issue #000184]. +2017-10-16 Fred Gleason + * Removed policy to update cut expiration date/time automatically + upon audio update. diff --git a/lib/rdcut.cpp b/lib/rdcut.cpp index 6f15180b..807cce63 100644 --- a/lib/rdcut.cpp +++ b/lib/rdcut.cpp @@ -1242,13 +1242,6 @@ bool RDCut::checkInRecording(const QString &station_name, break; } - // - // Get Group Attributes - // - QString start_datetime; - QString end_datetime; - RDCut::GetDefaultDateTimes(&start_datetime,&end_datetime,cutName()); - sql=QString("update CUTS set ")+ "START_POINT=0,"+ QString().sprintf("END_POINT=%d,",msecs)+ @@ -1272,8 +1265,6 @@ bool RDCut::checkInRecording(const QString &station_name, "ORIGIN_NAME=\""+RDEscapeString(station_name)+"\","+ "ORIGIN_LOGIN_NAME="+user+","+ "SOURCE_HOSTNAME=\""+RDEscapeString(src_hostname)+"\","+ - "START_DATETIME="+start_datetime+","+ - "END_DATETIME="+end_datetime+","+ "UPLOAD_DATETIME=null "+ "where CUT_NAME=\""+cut_name+"\""; q=new RDSqlQuery(sql); diff --git a/rdadmin/edit_group.cpp b/rdadmin/edit_group.cpp index a7850998..dcce3576 100644 --- a/rdadmin/edit_group.cpp +++ b/rdadmin/edit_group.cpp @@ -170,7 +170,7 @@ EditGroup::EditGroup(QString group,QWidget *parent) group_cutlife_label->setFont(font); group_cutlife_label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); group_cutlife_unit= - new QLabel(group_cutlife_check,tr("days after audio update"),this); + new QLabel(group_cutlife_check,tr("days after cut creation"),this); group_cutlife_unit->setFont(font); group_cutlife_unit->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); diff --git a/rdadmin/rdadmin_cs.ts b/rdadmin/rdadmin_cs.ts index e306814c..3033c2e9 100644 --- a/rdadmin/rdadmin_cs.ts +++ b/rdadmin/rdadmin_cs.ts @@ -1758,7 +1758,7 @@ Stále ještě chcete uložit? - days after audio update + days after cut creation diff --git a/rdadmin/rdadmin_de.ts b/rdadmin/rdadmin_de.ts index 18933964..c53a31a5 100644 --- a/rdadmin/rdadmin_de.ts +++ b/rdadmin/rdadmin_de.ts @@ -1721,7 +1721,7 @@ Do you still want to save? - days after audio update + days after cut creation diff --git a/rdadmin/rdadmin_es.ts b/rdadmin/rdadmin_es.ts index 73695c2d..80451c95 100644 --- a/rdadmin/rdadmin_es.ts +++ b/rdadmin/rdadmin_es.ts @@ -1752,7 +1752,7 @@ Do you still want to save? - days after audio update + days after cut creation diff --git a/rdadmin/rdadmin_fr.ts b/rdadmin/rdadmin_fr.ts index 31885762..a7e1bee3 100644 --- a/rdadmin/rdadmin_fr.ts +++ b/rdadmin/rdadmin_fr.ts @@ -1498,7 +1498,7 @@ Do you still want to save? - days after audio update + days after cut creation diff --git a/rdadmin/rdadmin_nb.ts b/rdadmin/rdadmin_nb.ts index 17892845..e994ce25 100644 --- a/rdadmin/rdadmin_nb.ts +++ b/rdadmin/rdadmin_nb.ts @@ -1708,7 +1708,7 @@ Vil du framleis lagra? - days after audio update + days after cut creation diff --git a/rdadmin/rdadmin_nn.ts b/rdadmin/rdadmin_nn.ts index 17892845..e994ce25 100644 --- a/rdadmin/rdadmin_nn.ts +++ b/rdadmin/rdadmin_nn.ts @@ -1708,7 +1708,7 @@ Vil du framleis lagra? - days after audio update + days after cut creation diff --git a/rdadmin/rdadmin_pt_BR.ts b/rdadmin/rdadmin_pt_BR.ts index df06d28f..1a4740c3 100644 --- a/rdadmin/rdadmin_pt_BR.ts +++ b/rdadmin/rdadmin_pt_BR.ts @@ -1706,7 +1706,7 @@ Você ainda quer salvar? - days after audio update + days after cut creation