--- smsdaemon/TaskManager.cpp 2008/06/16 14:04:19 96 +++ smsdaemon/TaskManager.cpp 2008/12/07 00:59:05 132 @@ -5,6 +5,9 @@ #include +#include "tasks/SpoolTask.h" + + TaskManager::TaskManager() : _lastExecuted(0) { @@ -23,11 +26,20 @@ void TaskManager::LoadTasks() { + static SpoolTask task; + //print the loaded tasks + std::map::iterator it; + for(it = _persistant_tasks.begin(); it != _persistant_tasks.end(); ++it) + { + Task* tsk = (*it).second; + if (tsk != 0) + Common::instance()->logMessage( std::string("Loaded task \"") + tsk->GetName() + "\"" ); + } } -void TaskManager::AddTask(Task* task) +void TaskManager::AddPersistantTask(Task* task) { Common* cmn = Common::instance(); @@ -35,8 +47,8 @@ { std::string name = task->GetName(); - if ( _tasks[ name ] == 0) - _tasks[ name ] = task; + if ( _persistant_tasks[ name ] == 0) + _persistant_tasks[ name ] = task; else cmn->logMessage( std::string("AddTask() -- already have a task called ") + name); } @@ -66,7 +78,7 @@ std::map::iterator m_it; - for (m_it = _tasks.begin(); m_it != _tasks.end(); ++m_it) + for (m_it = _persistant_tasks.begin(); m_it != _persistant_tasks.end(); ++m_it) { Task* tsk = (*m_it).second; tsk->ExecuteTask(modem); @@ -95,9 +107,9 @@ } -Task* TaskManager::GetTask(const std::string& taskname) +Task* TaskManager::GetPersistantTask(const std::string& taskname) { - return _tasks[ taskname ]; + return _persistant_tasks[ taskname ]; }