--- smsdaemon/tester.cpp	2008/06/15 20:45:14	83
+++ smsdaemon/tester.cpp	2008/12/15 13:27:53	188
@@ -6,20 +6,23 @@
 #include <string>
 #include <iostream>
 #include <vector>
-#include "SerialPort.h"
+#include "serialport/SerialPort.h"
 
-#include "GsmModem.h"
+#include "DebugTransceiver.h"
+#include "SmsToolTransceiver.h"
+#include "plugins/HostStatusPlugin.h"
 #include "Sms.h"
-#include "TogPlugin.h"
-#include "TrainInfo.h"
-#include "util.h"
-
+#include "plugins/TogPlugin.h"
+#include "plugins/TrainInfo.h"
+#include "Util.h"
+#include "plugins/StatusPlugin.h"
+#include "plugins/WeatherPlugin.h"
 #include "SmsPdu.h"
 
 using namespace std;
+using namespace Util;
 
-
-void test_sms(GsmModem& modem, int len)
+void test_sms(ISmsTransceiver& modem, int len)
 {
 	cout << "----- test_sms( " << len << " ) ------- " << endl;
 
@@ -35,7 +38,7 @@
 		cout << "Len: " << pdu[i].len << endl;
 		cout << "Pdu: " << pdu[i].pdu << endl;
 
-		modem.SendSmsPdu(pdu[i].pdu, pdu[i].len);
+//		modem.SendSmsPdu(pdu[i].pdu, pdu[i].len);
 	}
 }
 
@@ -52,6 +55,29 @@
 	return 0;
 */
 
+
+	DebugTransceiver trans(true);
+	WeatherPlugin pl;
+
+	SMS sms;
+
+	pl.Execute(trans,sms);
+
+
+
+	return 0;
+	string start = "hej ������";
+	string mid = str_latin2gsm(start);
+	string final = str_gsm2latin(mid);
+
+	str_dump (start);
+	str_dump(mid);
+	str_dump(final);
+
+
+	return 0;
+
+/*
     SerialPort port("/dev/ttyS1" );
     port.Open( SerialPort::BAUD_9600,
 			SerialPort::CHAR_SIZE_8,
@@ -59,7 +85,7 @@
 	        SerialPort::STOP_BITS_1,
 	        SerialPort::FLOW_CONTROL_HARD );
 
-	GsmModem modem(port);
+	ModemTransceiver modem(port);
 	modem.Init();
 
 
@@ -87,7 +113,7 @@
 
 	}
 
-
+*/
 /*
 	vector<PduInfo> pdu = SmsPdu::CreateSmsPdu("4522337617", "Hej med dig, igen", true);
 	cout << "Len: " << pdu[0].len << endl;
@@ -102,7 +128,7 @@
 	SMS sms;
 	sms.sender = "12345678";
 	sms.message = "Tog list";
-	DebugGsmModem modem;
+	DebugModemTransceiver modem;
 	TogPlugin plugin;
 
 	plugin.Execute(modem, sms);
@@ -142,7 +168,7 @@
 
 	SerialPort port("/dev/ttyS1" );
 	port.Open();
-	GsmModem modem(port);
+	ModemTransceiver modem(port);
 
 	//modem.SendSms("22337617", "Hello, sir!");
 	//