From 119fe169957e772574e578b3ac7d8d15a7319235 Mon Sep 17 00:00:00 2001 From: nebojsa Date: Tue, 12 Jan 2010 03:52:36 +0000 Subject: [PATCH] added output messages to displaySchedule method to help in xmlrpc problem tracing --- .../src/SchedulerDaemonXmlRpcClient.cxx | 3 ++- .../src/products/gLiveSupport/src/GLiveSupport.h | 1 + .../scheduler/src/DisplayScheduleMethod.cxx | 2 ++ .../src/products/scheduler/src/PlaylistEvent.cxx | 16 +--------------- 4 files changed, 6 insertions(+), 16 deletions(-) diff --git a/campcaster/src/modules/schedulerClient/src/SchedulerDaemonXmlRpcClient.cxx b/campcaster/src/modules/schedulerClient/src/SchedulerDaemonXmlRpcClient.cxx index 17a67bb2e..6b6b10131 100644 --- a/campcaster/src/modules/schedulerClient/src/SchedulerDaemonXmlRpcClient.cxx +++ b/campcaster/src/modules/schedulerClient/src/SchedulerDaemonXmlRpcClient.cxx @@ -287,7 +287,7 @@ SchedulerDaemonXmlRpcClient :: displaySchedule( throw (Core::XmlRpcException) { Ptr::Ref> >::Ref entries; - + XmlRpcValue xmlRpcParams; XmlRpcValue xmlRpcResult; @@ -317,6 +317,7 @@ SchedulerDaemonXmlRpcClient :: displaySchedule( try { entries = XmlRpcTools::extractScheduleEntries(xmlRpcResult); +std::cout << "SchedulerDaemonXmlRpcClient::displaySchedule entries: " << entries->size() << std::endl; } catch (std::invalid_argument &e) { throw Core::XmlRpcInvalidArgumentException(e); } diff --git a/campcaster/src/products/gLiveSupport/src/GLiveSupport.h b/campcaster/src/products/gLiveSupport/src/GLiveSupport.h index cd35305d9..04ee28d5b 100644 --- a/campcaster/src/products/gLiveSupport/src/GLiveSupport.h +++ b/campcaster/src/products/gLiveSupport/src/GLiveSupport.h @@ -944,6 +944,7 @@ class GLiveSupport : public LocalizedConfigurable, Ptr::Ref to) throw (XmlRpcException) { +std::cout << "calling GLiveSupport :: displaySchedule !!!!!!!!!!!!!!!!!" << std::endl; return scheduler->displaySchedule(sessionId, from, to); } diff --git a/campcaster/src/products/scheduler/src/DisplayScheduleMethod.cxx b/campcaster/src/products/scheduler/src/DisplayScheduleMethod.cxx index 2aebcb711..4c1284fab 100644 --- a/campcaster/src/products/scheduler/src/DisplayScheduleMethod.cxx +++ b/campcaster/src/products/scheduler/src/DisplayScheduleMethod.cxx @@ -138,5 +138,7 @@ DisplayScheduleMethod :: execute(XmlRpc::XmlRpcValue & rootParameter, Ptr::Ref> >::Ref scheduleEntries = schedule->getScheduleEntries(fromTime, toTime); +std::cout << "DisplayScheduleMethod scheduleEntries: " << scheduleEntries->size() << std::endl; + XmlRpcTools::scheduleEntriesToXmlRpcValue(scheduleEntries, returnValue); } diff --git a/campcaster/src/products/scheduler/src/PlaylistEvent.cxx b/campcaster/src/products/scheduler/src/PlaylistEvent.cxx index e8a732690..1aba3d8e5 100644 --- a/campcaster/src/products/scheduler/src/PlaylistEvent.cxx +++ b/campcaster/src/products/scheduler/src/PlaylistEvent.cxx @@ -125,12 +125,6 @@ void PlaylistEvent :: deInitialize(void) throw () { DEBUG_BLOCK - - if (state != stopped) { - error() << "::deInitialize() - ERROR: STATE IS NOT STOPPED! Aborting." << endl; - // TODO: handle error? - return; - } try { storage->releasePlaylist(playlist); @@ -152,9 +146,7 @@ PlaylistEvent :: start(Ptr::Ref offset) thr DEBUG_BLOCK if (state != initialized) { - error() << "::start() - ERROR: STATE IS NOT INITIALIZED! Aborting." << endl; - // TODO: handle error? - return; + initialize(); } try { @@ -181,12 +173,6 @@ PlaylistEvent :: stop(void) throw () { DEBUG_BLOCK - if (state != running) { - error() << "::stop() - ERROR: STATE IS NOT RUNNING! Aborting." << endl; - // TODO: handle error? - return; - } - try { audioPlayer->stop(); audioPlayer->close();