--- smsdaemon/plugins/TogPlugin.cpp	2008/06/15 18:57:00	80
+++ smsdaemon/plugins/TogPlugin.cpp	2008/12/07 15:51:02	142
@@ -1,5 +1,6 @@
 #include "TogPlugin.h"
-#include "GsmModem.h"
+#include "IGsmModem.h"
+#include "Sms.h"
 
 #include "TrainInfo.h"
 #include "util.h"
@@ -15,11 +16,12 @@
 TogPlugin::TogPlugin()
   : Plugin("tog", "Henter tog info fra bane.dk")
 {
+	_stationInfo["ar"] = StationInfo("AR","Århus");
 	_stationInfo["la"] = StationInfo("LG","Langå");
 	_stationInfo["ul"] = StationInfo("UP","Ulstrup");
 	_stationInfo["bj"] = StationInfo("BJ","Bjerringbro");
 	_stationInfo["vi"] = StationInfo("VG","Viborg");
-	_stationInfo["hø"] = StationInfo("HØ","Højslev");
+	_stationInfo["ho"] = StationInfo("HØ","Højslev");
 	_stationInfo["sk"] = StationInfo("SK","Skive");
 }
 
@@ -49,26 +51,26 @@
 		os << (*it).first << " - " << (*it).second.name << "\n";
 	}
 
-	return Util::str_latin2gsm(os.str());
+	return os.str();
 }
 
 void TogPlugin::Execute(IGsmModem& modem, SMS& sms)
 {
-	string data = GetSmsData(sms);
+	string data = sms.ExtractParameters();
 
 	data = Util::str_gsm2latin(data);;
 	data = Util::str_tolower(data);
 
-	
+
 	if (data == "")
 	{
-		modem.SendSms(sms.sender, "Usage: tog <stationskode>\ntog list - liste over stationer", false);
+		modem.SendSms(sms.GetSender(), "Usage: tog <stationskode>\ntog list - liste over stationer", false);
 		return;	
 	}
 
 	if (data == "list")
 	{
-		modem.SendSms(sms.sender, CreateStationList(), true);
+		modem.SendSms(sms.GetSender(), CreateStationList(), true);
 		return;
 	}
 
@@ -77,7 +79,7 @@
 
 	if (code == "")
 	{
-		modem.SendSms(sms.sender, "Unknown station", false);
+		modem.SendSms(sms.GetSender(), "Unknown station", false);
 		return;
 	}
 
@@ -88,7 +90,7 @@
 	}
 	catch(std::exception& e)
 	{
-		modem.SendSms(sms.sender, e.what(), false );
+		modem.SendSms(sms.GetSender(), e.what(), false );
 		return;
 	}
 
@@ -104,7 +106,7 @@
 		os << train.note << "\n";
 	}
 
-	modem.SendSms(sms.sender, Util::str_latin2gsm(os.str()), true);
+	modem.SendSms(sms.GetSender(), os.str(), true);