--- smsdaemon/TaskManager.cpp	2008/06/16 11:30:20	92
+++ smsdaemon/TaskManager.cpp	2008/12/07 00:59:05	132
@@ -5,64 +5,111 @@
 
 #include <time.h>
 
+#include "tasks/SpoolTask.h"
+
+
 TaskManager::TaskManager()
  : _lastExecuted(0)
 {
 }
 	
 TaskManager::~TaskManager()
-{
+{	
+	//delete any temporary tasks still in the list
+	std::list<Task*>::iterator it;
+	for (it = _temp_tasks.begin(); it != _temp_tasks.end(); ++it)
+	{
+		delete (*it);
+	}
 }
 
 
 void TaskManager::LoadTasks()
 {
+	static SpoolTask task;
 
+	//print the loaded tasks
+	std::map<std::string, Task*>::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::ExecuteTasks(IGsmModem& modem)
+void TaskManager::AddPersistantTask(Task* task)
 {
-	const int SLEEP_TIME = 10; //wait at least 10 seconds between executions
-	int now = time(0);
+	Common* cmn = Common::instance();
 
-	if (now > (_lastExecuted + SLEEP_TIME) ) 
+	if (task != 0)
 	{
-		_lastExecuted = now;
-
-		std::map<std::string, Task*>::iterator it;
+		std::string name = task->GetName();
 
-		for (it = _tasks.begin(); it != _tasks.end(); ++it)
-		{
-			Task* tsk = (*it).second;
-			tsk->ExecuteTask(modem);
-		}
+		if ( _persistant_tasks[ name ] == 0)
+			_persistant_tasks[ name ] = task;
+		else
+			cmn->logMessage( std::string("AddTask() -- already have a task called ") + name);
+	}
+	else
+	{
+		cmn->logMessage("AddTask() -- cannot register a null pointer");
 	}
 }
 
-
-Task* TaskManager::GetTask(const std::string& taskname)
+void TaskManager::AddTemporaryTask(Task* task)
 {
-	return _tasks[ taskname ];
+	_temp_tasks.push_back(task);
 }
 
 
-std::vector<Task*> TaskManager::GetTaskList()
+void TaskManager::ExecuteTasks(IGsmModem& modem)
 {
-	typedef std::map<std::string, Task*>::iterator MapIterator;
-	std::vector<Task*> task_list;
+	const int SLEEP_TIME = 10; //wait at least 10 seconds between executions
+	int now = time(0);
+
+	if (now < (_lastExecuted + SLEEP_TIME) ) 
+		return;
+
+	_lastExecuted = now;
 
-	for (MapIterator it = _tasks.begin(); it != _tasks.end(); ++it)
+	//execute real tasks
+
+	std::map<std::string, Task*>::iterator m_it;
+
+	for (m_it = _persistant_tasks.begin(); m_it != _persistant_tasks.end(); ++m_it)
 	{
-		Task* pl = (*it).second;
-		task_list.push_back(pl);
+		Task* tsk = (*m_it).second;
+		tsk->ExecuteTask(modem);
 	}
 
+	//execute temporary tasks
 
-	return task_list;
-}
+	std::list<Task*>::iterator l_it;
+	for (l_it = _temp_tasks.begin(); l_it != _temp_tasks.end(); ++l_it)
+	{
+		Task* tsk = (*l_it);
+		tsk->ExecuteTask(modem);
+
+		if ( tsk->IsFinished() )
+		{
+			delete tsk;
+			l_it = _temp_tasks.erase(l_it); 
+			
+			//now l_it points to the next element in the list,
+			//but since the for() loop will increment it before next iteration we will decrease it here
+			--l_it; 
+		}
+	}
 
 
+}
+
 
+Task* TaskManager::GetPersistantTask(const std::string& taskname)
+{
+	return _persistant_tasks[ taskname ];
+}