diff options
Diffstat (limited to 'p2pvr/daemon/si.cpp')
| -rw-r--r-- | p2pvr/daemon/si.cpp | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/p2pvr/daemon/si.cpp b/p2pvr/daemon/si.cpp index 1186547..bee7fa7 100644 --- a/p2pvr/daemon/si.cpp +++ b/p2pvr/daemon/si.cpp @@ -6,20 +6,20 @@ #include <slicer/slicer.h> #include <logger.h> -#include "sql/SI_allNetworks.sql.h" -#include "sql/SI_allDeliveries.sql.h" -#include "sql/SI_deliveryForTransport.sql.h" -#include "sql/SI_deliveryForService.sql.h" -#include "sql/SI_serviceNextUsed.sql.h" -#include "sql/SI_servicesSelectAll.sql.h" -#include "sql/SI_servicesSelectById.sql.h" -#include "sql/SI_eventByUid.sql.h" -#include "sql/SI_eventById.sql.h" -#include "sql/SI_eventsOnNow.sql.h" -#include "sql/SI_eventsInSchedule.sql.h" -#include "sql/SI_eventsInSchedules.sql.h" -#include "sql/SI_eventsInRange.sql.h" -#include "sql/SI_eventSearch.sql.h" +#include "sql/si/allNetworks.sql.h" +#include "sql/si/allDeliveries.sql.h" +#include "sql/si/deliveryForTransport.sql.h" +#include "sql/si/deliveryForService.sql.h" +#include "sql/si/serviceNextUsed.sql.h" +#include "sql/si/servicesSelectAll.sql.h" +#include "sql/si/servicesSelectById.sql.h" +#include "sql/si/eventByUid.sql.h" +#include "sql/si/eventById.sql.h" +#include "sql/si/eventsOnNow.sql.h" +#include "sql/si/eventsInSchedule.sql.h" +#include "sql/si/eventsInSchedules.sql.h" +#include "sql/si/eventsInRange.sql.h" +#include "sql/si/eventSearch.sql.h" IceTray::Logging::LoggerPtr SI::logger(LOGMANAGER()->getLogger<SI>()); @@ -32,14 +32,14 @@ DVBSI::Networks SI::GetNetworks(const Ice::Current &) { logger->message(LOG::DEBUG, __PRETTY_FUNCTION__); - return fetch<DVBSI::Networks>(P2PVR::sql::SI_allNetworks); + return fetch<DVBSI::Networks>(P2PVR::sql::si::allNetworks); } P2PVR::Deliveries SI::GetAllDeliveries(const Ice::Current &) { logger->message(LOG::DEBUG, __PRETTY_FUNCTION__); - auto rtn = fetch<P2PVR::Deliveries>("delivery_type", P2PVR::sql::SI_allDeliveries); + auto rtn = fetch<P2PVR::Deliveries>("delivery_type", P2PVR::sql::si::allDeliveries); logger->messagebf(LOG::DEBUG, "%s: Found %d delivery methods", __PRETTY_FUNCTION__, rtn.size()); return rtn; } @@ -49,7 +49,7 @@ SI::GetDeliveryForTransport(int id, const Ice::Current&) { try { logger->messagef(LOG::DEBUG, "%s(%d)", __PRETTY_FUNCTION__, id); - return fetch<DVBSI::DeliveryPtr>("delivery_type", P2PVR::sql::SI_deliveryForTransport, id); + return fetch<DVBSI::DeliveryPtr>("delivery_type", P2PVR::sql::si::deliveryForTransport, id); } catch (const Slicer::NoRowsReturned &) { throw P2PVR::NotFound(); @@ -61,7 +61,7 @@ SI::GetDeliveryForSi(const Ice::Current&) { try { logger->message(LOG::DEBUG, __PRETTY_FUNCTION__); - return fetch<DVBSI::DeliveryPtr>("delivery_type", P2PVR::sql::SI_serviceNextUsed); + return fetch<DVBSI::DeliveryPtr>("delivery_type", P2PVR::sql::si::serviceNextUsed); } catch (const Slicer::NoRowsReturned &) { return NULL; @@ -73,7 +73,7 @@ SI::GetDeliveryForService(int id, const Ice::Current&) { try { logger->messagef(LOG::DEBUG, "%s(%d)", __PRETTY_FUNCTION__, id); - return fetch<DVBSI::DeliveryPtr>("delivery_type", P2PVR::sql::SI_deliveryForService, id); + return fetch<DVBSI::DeliveryPtr>("delivery_type", P2PVR::sql::si::deliveryForService, id); } catch (const Slicer::NoRowsReturned &) { throw P2PVR::NotFound(); @@ -84,14 +84,14 @@ DVBSI::ServiceList SI::GetServices(const Ice::Current&) { logger->message(LOG::DEBUG, __PRETTY_FUNCTION__); - return fetch<DVBSI::ServiceList>(P2PVR::sql::SI_servicesSelectAll); + return fetch<DVBSI::ServiceList>(P2PVR::sql::si::servicesSelectAll); } DVBSI::ServicePtr SI::GetService(int id, const Ice::Current&) { logger->messagef(LOG::DEBUG, "%s(%d)", __PRETTY_FUNCTION__, id); - auto rtn = fetch<DVBSI::ServiceList>(P2PVR::sql::SI_servicesSelectById, id); + auto rtn = fetch<DVBSI::ServiceList>(P2PVR::sql::si::servicesSelectById, id); if (rtn.empty()) throw P2PVR::NotFound(); return rtn.front(); } @@ -102,7 +102,7 @@ SI::GetEvents(const P2PVR::IntSequence & eventUids, const Ice::Current &) logger->message(LOG::DEBUG, __PRETTY_FUNCTION__); P2PVR::Events rtn; for (const auto & uid : eventUids) { - auto list = fetch<P2PVR::Events>(P2PVR::sql::SI_eventByUid, uid); + auto list = fetch<P2PVR::Events>(P2PVR::sql::si::eventByUid, uid); std::copy(list.begin(), list.end(), std::back_inserter(rtn)); } if (rtn.size() != eventUids.size()) throw P2PVR::NotFound(); @@ -113,7 +113,7 @@ P2PVR::EventPtr SI::GetEvent(int serviceId, int eventId, const Ice::Current &) { logger->messagef(LOG::DEBUG, "%s(s=%d, e=%d)", __PRETTY_FUNCTION__, serviceId, eventId); - auto rtn = fetch<P2PVR::Events>(P2PVR::sql::SI_eventById, serviceId, eventId); + auto rtn = fetch<P2PVR::Events>(P2PVR::sql::si::eventById, serviceId, eventId); if (rtn.empty()) throw P2PVR::NotFound(); return rtn.front(); } @@ -122,7 +122,7 @@ P2PVR::Events SI::EventsOnNow(const Ice::Current &) { logger->message(LOG::DEBUG, __PRETTY_FUNCTION__); - return fetch<P2PVR::Events>(P2PVR::sql::SI_eventsOnNow); + return fetch<P2PVR::Events>(P2PVR::sql::si::eventsOnNow); } namespace IceTray { @@ -142,7 +142,7 @@ P2PVR::Events SI::EventsInRange(const Common::DateTime & from, const Common::DateTime & to, const Ice::Current &) { logger->messagebf(LOG::DEBUG, "%s([%s]-[%s])", from, to, __PRETTY_FUNCTION__); - return fetch<P2PVR::Events>(P2PVR::sql::SI_eventsInRange, from, to); + return fetch<P2PVR::Events>(P2PVR::sql::si::eventsInRange, from, to); } P2PVR::Events @@ -150,20 +150,20 @@ SI::EventSearch(const IceUtil::Optional<std::string> & keywords, const IceUtil:: { logger->messagebf(LOG::DEBUG, "%s(keywords=%s,serviceId=%s,from=%s,to=%s)", keywords, serviceId, from, to, __PRETTY_FUNCTION__); - return fetch<P2PVR::Events>(P2PVR::sql::SI_eventSearch, from, to, serviceId, serviceId, keywords, keywords, keywords, keywords); + return fetch<P2PVR::Events>(P2PVR::sql::si::eventSearch, from, to, serviceId, serviceId, keywords, keywords, keywords, keywords); } P2PVR::Events SI::EventsInSchedules(const Ice::Current &) { logger->message(LOG::DEBUG, __PRETTY_FUNCTION__); - return fetch<P2PVR::Events>(P2PVR::sql::SI_eventsInSchedules); + return fetch<P2PVR::Events>(P2PVR::sql::si::eventsInSchedules); } P2PVR::Events SI::EventsInSchedule(int scheduleId, const Ice::Current &) { logger->messagebf(LOG::DEBUG, "%s(%d)", scheduleId, __PRETTY_FUNCTION__); - return fetch<P2PVR::Events>(P2PVR::sql::SI_eventsInSchedule, scheduleId); + return fetch<P2PVR::Events>(P2PVR::sql::si::eventsInSchedule, scheduleId); } |