diff --git a/livesupport/doc/model/LocalStorage/index.html b/livesupport/doc/model/LocalStorage/index.html
index 35f22cc68..44c180848 100644
--- a/livesupport/doc/model/LocalStorage/index.html
+++ b/livesupport/doc/model/LocalStorage/index.html
@@ -14,7 +14,7 @@ Development Loan Fund, under the GNU GPL.
- Author: $Author: fgerlits $
- - Version: $Revision: 1.3 $
+ - Version: $Revision: 1.4 $
- Location: $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/doc/model/LocalStorage/index.html,v $
Scope
@@ -2779,7 +2779,7 @@ associated with the token returned
savePlaylist
(sessionId : SessionId,
playlistToken : Token,
-newPlaylistURL : URL)
+newPlaylist : Playlist)
: void
|
@@ -2805,7 +2805,8 @@ metafile in place of the old one.
Notes
|
- none
+ | TODO: decide exactly what
+the newPlaylist argument looks like
|
diff --git a/livesupport/products/scheduler/etc/scheduler.xml b/livesupport/products/scheduler/etc/scheduler.xml
index 4b903ec79..06336a053 100644
--- a/livesupport/products/scheduler/etc/scheduler.xml
+++ b/livesupport/products/scheduler/etc/scheduler.xml
@@ -2,7 +2,7 @@
+ scheduleFactory,playLogFactory,audioPlayer,xmlRpcDaemon) >
@@ -21,9 +21,11 @@
-
+
+
+
@@ -54,6 +56,10 @@
+
+
+
+
diff --git a/livesupport/products/scheduler/src/SchedulerDaemon.cxx b/livesupport/products/scheduler/src/SchedulerDaemon.cxx
index 8051ac378..7b102c5cc 100644
--- a/livesupport/products/scheduler/src/SchedulerDaemon.cxx
+++ b/livesupport/products/scheduler/src/SchedulerDaemon.cxx
@@ -21,8 +21,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Author : $Author: maroy $
- Version : $Revision: 1.11 $
+ Author : $Author: fgerlits $
+ Version : $Revision: 1.12 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/SchedulerDaemon.cxx,v $
------------------------------------------------------------------------------*/
@@ -57,6 +57,7 @@
#include "LiveSupport/Storage/StorageClientFactory.h"
#include "LiveSupport/PlaylistExecutor/AudioPlayerFactory.h"
#include "ScheduleFactory.h"
+#include "PlayLogFactory.h"
#include "SchedulerDaemon.h"
#include "PlaylistEventContainer.h"
@@ -176,6 +177,14 @@ SchedulerDaemon :: configure(const xmlpp::Element & element)
Ptr::Ref sf = ScheduleFactory::getInstance();
sf->configure( *((const xmlpp::Element*) *(nodes.begin())) );
+ // configure the PlayLogFactory
+ nodes = element.get_children(PlayLogFactory::getConfigElementName());
+ if (nodes.size() < 1) {
+ throw std::invalid_argument("no playLogFactory element");
+ }
+ Ptr::Ref plf = PlayLogFactory::getInstance();
+ plf->configure( *((const xmlpp::Element*) *(nodes.begin())) );
+
// configure the XmlRpcDaemon
nodes = element.get_children(XmlRpcDaemon::getConfigElementName());
if (nodes.size() < 1) {
@@ -229,6 +238,9 @@ SchedulerDaemon :: install(void) throw (std::exception)
// TODO: check if we have already been configured
Ptr::Ref sf = ScheduleFactory::getInstance();
sf->install();
+
+ Ptr::Ref plf = PlayLogFactory::getInstance();
+ plf->install();
}
@@ -239,6 +251,14 @@ void
SchedulerDaemon :: uninstall(void) throw (std::exception)
{
// TODO: check if we have already been configured
+ try {
+ Ptr::Ref plf = PlayLogFactory::getInstance();
+ plf->uninstall();
+ }
+ catch (std::exception &e) {
+ std::cerr << e.what() << std::endl;
+ }
+
Ptr::Ref sf = ScheduleFactory::getInstance();
sf->uninstall();
}
diff --git a/livesupport/products/scheduler/src/SchedulerDaemon.h b/livesupport/products/scheduler/src/SchedulerDaemon.h
index bb8eec1d7..c8454f64f 100644
--- a/livesupport/products/scheduler/src/SchedulerDaemon.h
+++ b/livesupport/products/scheduler/src/SchedulerDaemon.h
@@ -21,8 +21,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Author : $Author: maroy $
- Version : $Revision: 1.10 $
+ Author : $Author: fgerlits $
+ Version : $Revision: 1.11 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/SchedulerDaemon.h,v $
------------------------------------------------------------------------------*/
@@ -109,6 +109,9 @@ using namespace LiveSupport::PlaylistExecutor;
* <scheduleFactory>
* ...
* </scheduleFactory>
+ * <playLogFactory>
+ * ...
+ * </playLogFactory>
* <xmlRpcDaemon>
* ...
* </xmlRpcDaemon>
@@ -123,11 +126,11 @@ using namespace LiveSupport::PlaylistExecutor;
*
*
* <!ELEMENT scheduler (connectionManagerFactory,storageClientFactory,
- * scheduleFactory,xmlRpcDaemon) >
+ * scheduleFactory,playLogFactory,xmlRpcDaemon) >
*
*
- * @author $Author: maroy $
- * @version $Revision: 1.10 $
+ * @author $Author: fgerlits $
+ * @version $Revision: 1.11 $
* @see ConnectionManagerFactory
* @see StorageClientFactory
* @see ScheduleFactory