summaryrefslogtreecommitdiff
path: root/p2pvr/daemon/si.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'p2pvr/daemon/si.cpp')
-rw-r--r--p2pvr/daemon/si.cpp52
1 files changed, 28 insertions, 24 deletions
diff --git a/p2pvr/daemon/si.cpp b/p2pvr/daemon/si.cpp
index f8a49be..b87c127 100644
--- a/p2pvr/daemon/si.cpp
+++ b/p2pvr/daemon/si.cpp
@@ -2,7 +2,8 @@
#include <slicer/db/sqlSelectDeserializer.h>
#include <slicer/common.h>
#include <slicer/db/sqlExceptions.h>
-#include "commonHelpers.h"
+#include "chronoHelpers.h"
+#include "icetraySupport.h"
#include <slicer/slicer.h>
#include <logger.h>
@@ -21,10 +22,13 @@
#include "sql/si/eventsInRange.sql.h"
#include "sql/si/eventSearch.sql.h"
+using namespace std::literals;
+using namespace IceTray::Logging;
+
namespace P2PVR {
IceTray::Logging::LoggerPtr SII::logger(LOGMANAGER()->getLogger<SII>());
-SII::SII(IceTray::DatabasePoolPtr db) :
+SII::SII(DB::ConnectionPoolPtr db) :
IceTray::AbstractDatabaseClient(db)
{
}
@@ -32,16 +36,16 @@ SII::SII(IceTray::DatabasePoolPtr db) :
DVBSI::Networks
SII::GetNetworks(const Ice::Current &)
{
- logger->message(LOG::DEBUG, __PRETTY_FUNCTION__);
+ logger->message(LogLevel::DEBUG, __PRETTY_FUNCTION__);
return fetch<DVBSI::Networks>(sql::si::allNetworks);
}
Deliveries
SII::GetAllDeliveries(const Ice::Current &)
{
- logger->message(LOG::DEBUG, __PRETTY_FUNCTION__);
- auto rtn = fetch<Deliveries>("delivery_type", sql::si::allDeliveries);
- logger->messagebf(LOG::DEBUG, "%s: Found %d delivery methods", __PRETTY_FUNCTION__, rtn.size());
+ logger->message(LogLevel::DEBUG, __PRETTY_FUNCTION__);
+ auto rtn = fetch<Deliveries>("delivery_type"s, sql::si::allDeliveries);
+ logger->messagebf(LogLevel::DEBUG, "%s: Found %d delivery methods", __PRETTY_FUNCTION__, rtn.size());
return rtn;
}
@@ -49,8 +53,8 @@ DVBSI::DeliveryPtr
SII::GetDeliveryForTransport(int id, const Ice::Current&)
{
try {
- logger->messagef(LOG::DEBUG, "%s(%d)", __PRETTY_FUNCTION__, id);
- return fetch<DVBSI::DeliveryPtr>("delivery_type", sql::si::deliveryForTransport, id);
+ logger->messagef(LogLevel::DEBUG, "%s(%d)", __PRETTY_FUNCTION__, id);
+ return fetch<DVBSI::DeliveryPtr>("delivery_type"s, sql::si::deliveryForTransport, id);
}
catch (const Slicer::NoRowsReturned &) {
throw NotFound();
@@ -61,8 +65,8 @@ DVBSI::DeliveryPtr
SII::GetDeliveryForSi(const Ice::Current&)
{
try {
- logger->message(LOG::DEBUG, __PRETTY_FUNCTION__);
- return fetch<DVBSI::DeliveryPtr>("delivery_type", sql::si::serviceNextUsed);
+ logger->message(LogLevel::DEBUG, __PRETTY_FUNCTION__);
+ return fetch<DVBSI::DeliveryPtr>("delivery_type"s, sql::si::serviceNextUsed);
}
catch (const Slicer::NoRowsReturned &) {
return NULL;
@@ -73,8 +77,8 @@ DVBSI::DeliveryPtr
SII::GetDeliveryForService(int id, const Ice::Current&)
{
try {
- logger->messagef(LOG::DEBUG, "%s(%d)", __PRETTY_FUNCTION__, id);
- return fetch<DVBSI::DeliveryPtr>("delivery_type", sql::si::deliveryForService, id);
+ logger->messagef(LogLevel::DEBUG, "%s(%d)", __PRETTY_FUNCTION__, id);
+ return fetch<DVBSI::DeliveryPtr>("delivery_type"s, sql::si::deliveryForService, id);
}
catch (const Slicer::NoRowsReturned &) {
throw NotFound();
@@ -84,23 +88,23 @@ SII::GetDeliveryForService(int id, const Ice::Current&)
DVBSI::ServiceList
SII::GetServices(const Ice::Current&)
{
- logger->message(LOG::DEBUG, __PRETTY_FUNCTION__);
+ logger->message(LogLevel::DEBUG, __PRETTY_FUNCTION__);
return fetch<DVBSI::ServiceList>(sql::si::servicesSelectAll);
}
DVBSI::ServicePtr
SII::GetService(int id, const Ice::Current&)
{
- logger->messagef(LOG::DEBUG, "%s(%d)", __PRETTY_FUNCTION__, id);
+ logger->messagef(LogLevel::DEBUG, "%s(%d)", __PRETTY_FUNCTION__, id);
auto rtn = fetch<DVBSI::ServiceList>(sql::si::servicesSelectById, id);
if (rtn.empty()) throw NotFound();
return rtn.front();
}
Events
-SII::GetEvents(const IntSequence & eventUids, const Ice::Current &)
+SII::GetEvents(const IntSequence eventUids, const Ice::Current &)
{
- logger->message(LOG::DEBUG, __PRETTY_FUNCTION__);
+ logger->message(LogLevel::DEBUG, __PRETTY_FUNCTION__);
Events rtn;
for (const auto & uid : eventUids) {
auto list = fetch<Events>(sql::si::eventByUid, uid);
@@ -113,7 +117,7 @@ SII::GetEvents(const IntSequence & eventUids, const Ice::Current &)
EventPtr
SII::GetEvent(int serviceId, int eventId, const Ice::Current &)
{
- logger->messagef(LOG::DEBUG, "%s(s=%d, e=%d)", __PRETTY_FUNCTION__, serviceId, eventId);
+ logger->messagef(LogLevel::DEBUG, "%s(s=%d, e=%d)", __PRETTY_FUNCTION__, serviceId, eventId);
auto rtn = fetch<Events>(sql::si::eventById, serviceId, eventId);
if (rtn.empty()) throw NotFound();
return rtn.front();
@@ -122,21 +126,21 @@ SII::GetEvent(int serviceId, int eventId, const Ice::Current &)
Events
SII::EventsOnNow(const Ice::Current &)
{
- logger->message(LOG::DEBUG, __PRETTY_FUNCTION__);
+ logger->message(LogLevel::DEBUG, __PRETTY_FUNCTION__);
return fetch<Events>(sql::si::eventsOnNow);
}
Events
-SII::EventsInRange(const Common::DateTime & from, const Common::DateTime & to, const Ice::Current &)
+SII::EventsInRange(const Chrono::DateTime from, const Chrono::DateTime to, const Ice::Current &)
{
- logger->messagebf(LOG::DEBUG, "%s([%s]-[%s])", from, to, __PRETTY_FUNCTION__);
+ logger->messagebf(LogLevel::DEBUG, "%s([%s]-[%s])", from, to, __PRETTY_FUNCTION__);
return fetch<Events>(sql::si::eventsInRange, from, to);
}
Events
-SII::EventSearch(const IceUtil::Optional<std::string> & keywords, const IceUtil::Optional<Ice::Int> & serviceId, const IceUtil::Optional<Common::DateTime> & from, const IceUtil::Optional<Common::DateTime> & to, const Ice::Current &)
+SII::EventSearch(const IceUtil::Optional<std::string> keywords, const IceUtil::Optional<Ice::Int> serviceId, const IceUtil::Optional<Chrono::DateTime> from, const IceUtil::Optional<Chrono::DateTime> to, const Ice::Current &)
{
- logger->messagebf(LOG::DEBUG, "%s(keywords=%s,serviceId=%s,from=%s,to=%s)",
+ logger->messagebf(LogLevel::DEBUG, "%s(keywords=%s,serviceId=%s,from=%s,to=%s)",
keywords, serviceId, from, to, __PRETTY_FUNCTION__);
return fetch<Events>(sql::si::eventSearch, from, to, serviceId, serviceId, keywords, keywords, keywords, keywords);
}
@@ -144,14 +148,14 @@ SII::EventSearch(const IceUtil::Optional<std::string> & keywords, const IceUtil:
Events
SII::EventsInSchedules(const Ice::Current &)
{
- logger->message(LOG::DEBUG, __PRETTY_FUNCTION__);
+ logger->message(LogLevel::DEBUG, __PRETTY_FUNCTION__);
return fetch<Events>(sql::si::eventsInSchedules);
}
Events
SII::EventsInSchedule(int scheduleId, const Ice::Current &)
{
- logger->messagebf(LOG::DEBUG, "%s(%d)", scheduleId, __PRETTY_FUNCTION__);
+ logger->messagebf(LogLevel::DEBUG, "%s(%d)", scheduleId, __PRETTY_FUNCTION__);
return fetch<Events>(sql::si::eventsInSchedule, scheduleId);
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-23 11:18:07 +0000