mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-12-01 06:10:10 +01:00
2020-07-03 Fred Gleason <fredg@paravelsystems.com>
* Dropped the 'FEEDS.AUDIENCE_METRICS' field from the database. * Dropped the 'FEEDS.KEEP_METADATA' field from the database. * Dropped the 'FEEDS.MEDIA_LINK_MODE' field from the database. * Dropped the 'FEEDS.REDIRECT_PATH' field from the database. * Dropped the 'CAST_DOWNLOADS' table from the database. * Incremented the database version to 328. * Removed support for dynamically generated RSS feed metadata. Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
@@ -30,7 +30,6 @@
|
||||
#include <rdapplication.h>
|
||||
#include <rddb.h>
|
||||
#include <rdescape_string.h>
|
||||
#include <rdfeedlog.h>
|
||||
#include <rdpodcast.h>
|
||||
#include <rdtextfile.h>
|
||||
|
||||
@@ -98,10 +97,8 @@ ListFeeds::ListFeeds(QWidget *parent)
|
||||
list_feeds_view->setColumnAlignment(3,Qt::AlignCenter|Qt::AlignVCenter);
|
||||
list_feeds_view->addColumn(tr("AutoPost"));
|
||||
list_feeds_view->setColumnAlignment(4,Qt::AlignCenter|Qt::AlignVCenter);
|
||||
list_feeds_view->addColumn(tr("Keep Metadata"));
|
||||
list_feeds_view->setColumnAlignment(5,Qt::AlignCenter|Qt::AlignVCenter);
|
||||
list_feeds_view->addColumn(tr("Creation Date"));
|
||||
list_feeds_view->setColumnAlignment(6,Qt::AlignCenter|Qt::AlignVCenter);
|
||||
list_feeds_view->setColumnAlignment(5,Qt::AlignCenter|Qt::AlignVCenter);
|
||||
QLabel *list_box_label=new QLabel(list_feeds_view,tr("&Feeds:"),this);
|
||||
list_box_label->setFont(labelFont());
|
||||
list_box_label->setGeometry(14,11,85,19);
|
||||
@@ -159,7 +156,6 @@ void ListFeeds::addData()
|
||||
"KEY_NAME=\""+RDEscapeString(feed)+"\"";
|
||||
RDSqlQuery::apply(sql);
|
||||
|
||||
RDDeleteFeedLog(feed);
|
||||
delete edit_feed;
|
||||
return;
|
||||
}
|
||||
@@ -243,12 +239,10 @@ void ListFeeds::deleteData()
|
||||
//
|
||||
// Delete Remote XML
|
||||
//
|
||||
if(!feed->audienceMetrics()) {
|
||||
if(!feed->deleteXml(&errs)) {
|
||||
QMessageBox::warning(this,"RDAdmin - "+tr("Warning"),
|
||||
tr("Failed to delete remote feed XML.")+
|
||||
"["+errs+"].");
|
||||
}
|
||||
if(!feed->deleteXml(&errs)) {
|
||||
QMessageBox::warning(this,"RDAdmin - "+tr("Warning"),
|
||||
tr("Failed to delete remote feed XML.")+
|
||||
"["+errs+"].");
|
||||
}
|
||||
|
||||
//
|
||||
@@ -282,7 +276,6 @@ void ListFeeds::deleteData()
|
||||
sql=QString("delete from FEEDS where ")+
|
||||
"KEY_NAME=\""+RDEscapeString(feedname)+"\"";
|
||||
RDSqlQuery::apply(sql);
|
||||
RDDeleteFeedLog(feedname);
|
||||
item->setSelected(false);
|
||||
|
||||
pd->reset();
|
||||
@@ -329,9 +322,8 @@ void ListFeeds::RefreshList()
|
||||
"CHANNEL_TITLE,"+ // 02
|
||||
"IS_SUPERFEED,"+ // 03
|
||||
"ENABLE_AUTOPOST,"+ // 04
|
||||
"KEEP_METADATA,"+ // 05
|
||||
"ORIGIN_DATETIME,"+ // 06
|
||||
"BASE_URL "+ // 07
|
||||
"ORIGIN_DATETIME,"+ // 05
|
||||
"BASE_URL "+ // 06
|
||||
"from FEEDS";
|
||||
q=new RDSqlQuery(sql);
|
||||
while (q->next()) {
|
||||
@@ -339,12 +331,11 @@ void ListFeeds::RefreshList()
|
||||
item->setId(q->value(0).toInt());
|
||||
item->setText(0,q->value(1).toString());
|
||||
item->setText(1,q->value(2).toString());
|
||||
item->setText(2,RDFeed::publicUrl(q->value(7).toString(),
|
||||
item->setText(2,RDFeed::publicUrl(q->value(6).toString(),
|
||||
q->value(1).toString()));
|
||||
item->setText(3,q->value(3).toString());
|
||||
item->setText(4,q->value(4).toString());
|
||||
item->setText(5,q->value(5).toString());
|
||||
item->setText(6,q->value(6).toDateTime().toString("MM/dd/yyyy"));
|
||||
item->setText(5,q->value(5).toDateTime().toString("MM/dd/yyyy"));
|
||||
}
|
||||
delete q;
|
||||
}
|
||||
@@ -360,21 +351,19 @@ void ListFeeds::RefreshItem(RDListViewItem *item)
|
||||
"CHANNEL_TITLE,"+ // 01
|
||||
"IS_SUPERFEED,"+ // 02
|
||||
"ENABLE_AUTOPOST,"+ // 03
|
||||
"KEEP_METADATA,"+ // 04
|
||||
"ORIGIN_DATETIME,"+ // 05
|
||||
"BASE_URL "+ // 06
|
||||
"ORIGIN_DATETIME,"+ // 04
|
||||
"BASE_URL "+ // 05
|
||||
"from FEEDS where "+
|
||||
QString().sprintf("ID=%d",item->id());
|
||||
q=new RDSqlQuery(sql);
|
||||
if(q->next()) {
|
||||
item->setText(0,q->value(0).toString());
|
||||
item->setText(1,q->value(1).toString());
|
||||
item->setText(2,RDFeed::publicUrl(q->value(6).toString(),
|
||||
item->setText(2,RDFeed::publicUrl(q->value(5).toString(),
|
||||
q->value(0).toString()));
|
||||
item->setText(3,q->value(2).toString());
|
||||
item->setText(4,q->value(3).toString());
|
||||
item->setText(5,q->value(4).toString());
|
||||
item->setText(6,q->value(5).toDateTime().toString("MM/dd/yyyy"));
|
||||
item->setText(5,q->value(4).toDateTime().toString("MM/dd/yyyy"));
|
||||
}
|
||||
delete q;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user