Use slicer and metadata for performing merges

6 files changed, 1 insertions, 74 deletions

diff --git a/p2pvr/daemon/events.cpp b/p2pvr/daemon/events.cpp
index 01fe01e..4c0bc76 100644
--- a/p2pvr/daemon/events.cpp
+++ b/p2pvr/daemon/events.cpp
@@ -5,38 +5,6 @@
 
 template<>
 void
-CreateColumns<P2PVR::EventPtr>(const ColumnCreator & cc)
-{
-	cc("eventUid", false);
-	cc("serviceId", true);
-	cc("eventId", true);
-	cc("title", false);
-	cc("titleLang", false);
-	cc("subtitle", false);
-	cc("description", false);
-	cc("descriptionLang", false);
-	cc("videoAspect", false);
-	cc("videoFrameRate", false);
-	cc("videoHd", false);
-	cc("audioChannels", false);
-	cc("audioLanguage", false);
-	cc("subtitleLanguage", false);
-	cc("category", false);
-	cc("subCategory", false);
-	cc("userCategory", false);
-	cc("dvbRating", false);
-	cc("startTime", false);
-	cc("stopTime", false);
-	cc("episode", false);
-	cc("episodes", false);
-	cc("year", false);
-	cc("flags", false);
-	cc("season", false);
-	cc("current", false);
-}
-
-template<>
-void
 BindColumns(RowState & rs, const P2PVR::EventPtr & e)
 {
 	rs.fields[0] << e->ServiceId;
diff --git a/p2pvr/daemon/maintenance/events.cpp b/p2pvr/daemon/maintenance/events.cpp
index e309f39..01a333d 100644
--- a/p2pvr/daemon/maintenance/events.cpp
+++ b/p2pvr/daemon/maintenance/events.cpp
@@ -4,7 +4,6 @@
 #include <sqlMergeTask.h>
 #include <Ice/Communicator.h>
 #include <p2Helpers.h>
-#include <dvbsiHelpers.h>
 #include <containerIterator.h>
 #include <singleIterator.h>
 #include <temporaryIceAdapterObject.h>
diff --git a/p2pvr/daemon/maintenance/network.cpp b/p2pvr/daemon/maintenance/network.cpp
index 283e6fe..4ecb7d1 100644
--- a/p2pvr/daemon/maintenance/network.cpp
+++ b/p2pvr/daemon/maintenance/network.cpp
@@ -4,7 +4,6 @@
 #include <sqlMergeTask.h>
 #include <Ice/Communicator.h>
 #include <p2Helpers.h>
-#include <dvbsiHelpers.h>
 #include <containerIterator.h>
 #include <singleIterator.h>
 #include <temporaryIceAdapterObject.h>
@@ -19,7 +18,7 @@ class SiNetworkInformationMerger : public SiNetworkInformationParser {
 			for (const auto & ts : n->TransportStreams) {
 				Logger()->messagebf(LOG_DEBUG, "\tTransport Stream Id: %d Original Network Id: %d", ts->TransportStreamId, ts->OriginalNetworkId);
 				for (const auto & s : ts->Services) {
-					Logger()->messagebf(LOG_DEBUG, "\t\tService Id: %d Service Type: %d", s.ServiceId, s.ServiceType);
+					Logger()->messagebf(LOG_DEBUG, "\t\tService Id: %d Service Type: %d", s.ServiceId, s.Type);
 				}
 				if (ts->Terrestrial) {
 					Logger()->messagebf(LOG_DEBUG, "\t\tDVB-T: Frequency: %d", ts->Terrestrial->Frequency);
diff --git a/p2pvr/daemon/maintenance/services.cpp b/p2pvr/daemon/maintenance/services.cpp
index 2030cf8..8824571 100644
--- a/p2pvr/daemon/maintenance/services.cpp
+++ b/p2pvr/daemon/maintenance/services.cpp
@@ -4,7 +4,6 @@
 #include <sqlMergeTask.h>
 #include <Ice/Communicator.h>
 #include <p2Helpers.h>
-#include <dvbsiHelpers.h>
 #include <containerIterator.h>
 #include <singleIterator.h>
 #include <temporaryIceAdapterObject.h>
diff --git a/p2pvr/daemon/schedules.cpp b/p2pvr/daemon/schedules.cpp
index f5aaad1..4ced9a7 100644
--- a/p2pvr/daemon/schedules.cpp
+++ b/p2pvr/daemon/schedules.cpp
@@ -55,43 +55,6 @@ typedef std::vector<RecordPtr> Records;
 
 template<>
 void
-CreateColumns<P2PVR::ScheduledToRecordPtr>(const ColumnCreator & cc)
-{
-	cc("eventuid", true);
-	cc("scheduleid", true);
-}
-
-template<>
-void
-CreateColumns<P2PVR::ScheduleCandidatePtr>(const ColumnCreator & cc)
-{
-	cc("what", true);
-	cc("serviceid", false);
-	cc("eventuid", false);
-	cc("transportstreamid", false);
-	cc("starttime", false);
-	cc("stoptime", false);
-	cc("priority", false);
-	cc("scheduleid", false);
-}
-
-template<>
-void
-CreateColumns<P2PVR::SchedulePtr>(const ColumnCreator & cc)
-{
-	cc("scheduleid", true);
-	cc("serviceid", false);
-	cc("eventuid", false);
-	cc("title", false);
-	cc("search", false);
-	cc("priority", false);
-	cc("early", false);
-	cc("late", false);
-	cc("repeats", false);
-}
-
-template<>
-void
 CreateColumns<RecordPtr>(const ColumnCreator & cc)
 {
 	cc("eventuid", true);
diff --git a/p2pvr/daemon/si.cpp b/p2pvr/daemon/si.cpp
index fc58f8e..0b93bc4 100644
--- a/p2pvr/daemon/si.cpp
+++ b/p2pvr/daemon/si.cpp
@@ -1,7 +1,6 @@
 #include <pch.hpp>
 #include "si.h"
 #include "resources.h"
-#include "dvbsiHelpers.h"
 #include "sqlSelectDeserializer.h"
 #include "commonHelpers.h"
 #include <slicer/slicer.h>