--- smsdaemon/TaskManager.cpp	2008/06/17 08:14:12	104
+++ smsdaemon/TaskManager.cpp	2008/12/18 06:53:29	196
@@ -1,17 +1,20 @@
-	
+
 #include "TaskManager.h"
 
-#include "common.h"
+#include "Logger.h"
 
 #include <time.h>
 
+#include "tasks/SpoolTask.h"
+
+
 TaskManager::TaskManager()
- : _lastExecuted(0)
+		: _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)
@@ -23,34 +26,34 @@
 
 void TaskManager::LoadTasks()
 {
+	static SpoolTask task;
 
 	//print the loaded tasks
-	std::map<std::string, Task*>::iterator it;	
-	for(it = _tasks.begin(); it != _tasks.end(); ++it)
+	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() + "\"" );
+			Logger::logMessage( std::string("Loaded task \"") + tsk->GetName() + "\"" );
 	}
 }
 
 
-void TaskManager::AddTask(Task* task)
+void TaskManager::AddPersistantTask(Task* task)
 {
-	Common* cmn = Common::instance();
 
 	if (task != 0)
 	{
 		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);
+			Logger::logMessage( std::string("AddTask() -- already have a task called ") + name);
 	}
 	else
 	{
-		cmn->logMessage("AddTask() -- cannot register a null pointer");
+		Logger::logMessage("AddTask() -- cannot register a null pointer");
 	}
 }
 
@@ -60,12 +63,12 @@
 }
 
 
-void TaskManager::ExecuteTasks(IGsmModem& modem)
+void TaskManager::ExecuteTasks(ISmsTransceiver& modem)
 {
-	const int SLEEP_TIME = 10; //wait at least 10 seconds between executions
+	const int SLEEP_TIME = 2; //wait this long between task executions
 	int now = time(0);
 
-	if (now < (_lastExecuted + SLEEP_TIME) ) 
+	if (now < (_lastExecuted + SLEEP_TIME) )
 		return;
 
 	_lastExecuted = now;
@@ -74,7 +77,7 @@
 
 	std::map<std::string, Task*>::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);
@@ -91,11 +94,11 @@
 		if ( tsk->IsFinished() )
 		{
 			delete tsk;
-			l_it = _temp_tasks.erase(l_it); 
-			
+			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; 
+			--l_it;
 		}
 	}
 
@@ -103,9 +106,9 @@
 }
 
 
-Task* TaskManager::GetTask(const std::string& taskname)
+Task* TaskManager::GetPersistantTask(const std::string& taskname)
 {
-	return _tasks[ taskname ];
+	return _persistant_tasks[ taskname ];
 }