From f31ff1177eec7ffa0ea6375b77d78d69559f9c88 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Tue, 30 Dec 2014 19:52:21 +0000 Subject: Big commit comprising mostly of changes to the DB structure to unify recorded event details into events, lots of new unit tests --- p2pvr/daemon/maintenance/events.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'p2pvr/daemon/maintenance') diff --git a/p2pvr/daemon/maintenance/events.cpp b/p2pvr/daemon/maintenance/events.cpp index 648be0b..f075a32 100644 --- a/p2pvr/daemon/maintenance/events.cpp +++ b/p2pvr/daemon/maintenance/events.cpp @@ -9,6 +9,9 @@ #include #include #include +#include + +ResourceString(Maint_pruneEvents, sql_Maint_pruneEvents); class SiEventsHandler : public SiEpgParser { public: @@ -81,8 +84,11 @@ Maintenance::UpdateEvents(short type, const Ice::Current & ice) SqlMergeTask mergeEvents("postgres", "events"); CreateColumns(boost::bind(SqlMergeColumnsInserter, &mergeEvents, _1, _2)); mergeEvents.sources.insert(new SiEventsMerger(type, ice)); + mergeEvents.insteadOfDelete = new DynamicSql::SqlText("SET current = false"); + mergeEvents.updateWhere = new DynamicSql::SqlText("a.current"); mergeEvents.loadComplete(this); mergeEvents.execute(NULL); + Modify(Maint_pruneEvents).second->execute(); tx.Commit(); Logger()->messagebf(LOG_INFO, "%s: Updated events", __PRETTY_FUNCTION__); -- cgit v1.2.3