--- smsdaemon/tester.cpp	2008/12/07 13:28:52	141
+++ smsdaemon/tester.cpp	2009/12/26 23:01:01	520
@@ -1,4 +1,5 @@
 /* using http://sourceforge.net/projects/libserial/
+
  *
  */
 
@@ -8,25 +9,28 @@
 #include <vector>
 #include "serialport/SerialPort.h"
 
-#include "GsmModem.h"
+#include "DebugTransceiver.h"
+#include "SmsToolTransceiver.h"
+#include "plugins/HostStatusPlugin.h"
 #include "Sms.h"
 #include "plugins/TogPlugin.h"
 #include "plugins/TrainInfo.h"
-#include "util.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;
 
 	string msg = Util::str_formatint(len);
 	msg.append(1, ' ');
 	msg.append(len - msg.length(), 'a');
-	
+
 	vector<PduInfo> pdu = SmsPdu::CreateSmsPdu("22337617", msg, true);
 
 	for (unsigned int i=0; i<pdu.size(); ++i)
@@ -35,154 +39,167 @@
 		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);
 	}
 }
 
 
 int main()
 {
-/*
-	int shift = 6;
-	string start = "Hej med dig";
-	string end = SmsPdu::Decode8to7bit(SmsPdu::Encode7to8bit(start,shift), shift );
-
-	cout << start << endl;
-	cout << end << endl;
-	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;
-
-	DebugGsmModem modem(true);
-	SMS sms;
-	sms.sender="1234";
-	sms.message="status";
-	StatusPlugin status;
-	status.Execute(modem,sms);
-
-	return 0;
-/*
-    SerialPort port("/dev/ttyS1" );
-    port.Open( SerialPort::BAUD_9600,
-			SerialPort::CHAR_SIZE_8,
-			SerialPort::PARITY_NONE,
-	        SerialPort::STOP_BITS_1,
-	        SerialPort::FLOW_CONTROL_HARD );
-
-	GsmModem modem(port);
-	modem.Init();
+	/*
+		int shift = 6;
+		string start = "Hej med dig";
+		string end = SmsPdu::Decode8to7bit(SmsPdu::Encode7to8bit(start,shift), shift );
+
+		cout << start << endl;
+		cout << end << endl;
+		return 0;
+	*/
 
+	std::vector<TrainInfo> 	info = GetTrainInfo( 10 ); 
 
-	test_sms(modem, 100);
-	return 0;
-
-
-	vector<SMS> res = modem.ReadSms(true);
-
-	for (unsigned int i = 0; i<res.size(); ++i)
+	for (unsigned int i=0; i<info.size(); ++i) 
 	{
-		SMS& sms = res[i];
-		string cmd = GetSmsCommand(sms);
-		string data = GetSmsData(sms);
-		cout << "------------------------------" << endl;
-		cout << "Index    " << sms.sms_index << endl;
-		cout << "Sender:  " << sms.sender << endl;
-		cout << "Time:    " << sms.timestamp << endl;
-		cout << "Message: >" << sms.message << "<" << endl;
-		cout << "Cmd:     >" << cmd << "<" << endl; 
-		cout << "Data     >" << data << "<" << endl;
-
-		Util::str_dump(sms.message);
-		//modem.SendSms(sms.sender, sms.message, false);
+		TrainInfo ti = info[i];
 
+		cout << ti.time << ":" <<  ti.update << ":" << ti.destination  << endl;
 	}
 
-*/
 /*
-	vector<PduInfo> pdu = SmsPdu::CreateSmsPdu("4522337617", "Hej med dig, igen", true);
-	cout << "Len: " << pdu[0].len << endl;
-	cout << "Pdu: " << pdu[0].pdu << endl;
+	DebugTransceiver trans(true);
+	WeatherPlugin pl;
 
-	modem.SendSmsPdu(pdu[0].pdu, pdu[0].len);
-*/
-
-                      
-
-/*
 	SMS sms;
-	sms.sender = "12345678";
-	sms.message = "Tog list";
-	DebugGsmModem modem;
-	TogPlugin plugin;
-
-	plugin.Execute(modem, sms);
-
-
-	string msg = Util::str_gsm2latin(modem.GetMessage());
-
-	cout << "---- " << msg.length() << " ----" << endl;
-	cout << msg << endl;
-*/
-/*
-	vector<TrainInfo> trains = GetTrainInfo("BJ","Bjerringbro");
 
-	for (unsigned i=0; i<trains.size(); ++i)
-	{
-		TrainInfo& train = trains[i];
-		cout << "-------------------------------------" << endl;
-		cout << "Time:       {" << train.time        << "}" << endl;
-		cout << "Update:     {" << train.update      << "}" << endl;
-		cout << "Type:       {" << train.type        << "}" << endl;
-		cout << "Destination:{" << train.destination << "}" << endl;
-		cout << "Origin:     {" << train.origin      << "}" << endl;
-		cout << "Current:    {" << train.current     << "}" << endl;
-		cout << "Status:     {" << train.status      << "}" << endl;
-		cout << "Note:       {" << train.note        << "}" << endl;
-	}
-*/
-/*
-	SMS sms;
+	pl.Execute(trans,sms);
 
-	sms.message = "Test   test2   teste3 test4";
 
-	cout << "|" << GetSmsCommand(sms) << "|" << GetSmsData(sms) << "|" << endl;
 
 	return 0;
+	string start = "hej ������";
+	string mid = str_latin2gsm(start);
+	string final = str_gsm2latin(mid);
 
+	str_dump (start);
+	str_dump(mid);
+	str_dump(final);
 
-	SerialPort port("/dev/ttyS1" );
-	port.Open();
-	GsmModem modem(port);
-
-	//modem.SendSms("22337617", "Hello, sir!");
-	//
-	vector<SMS> res = modem.ReadSms();
-
-
-	for (unsigned i=0; i<res.size(); ++i)
-	{
-		cout << "--- SMS Recieved ---" << endl;
-		cout << "Index:   " << res[i].sms_index << endl;
-		cout << "From:    " << res[i].sender << endl;
-		cout << "Time:    " << res[i].timestamp << endl;
-		cout << "Message:>" << res[i].message << "<" << endl;
-		cout << endl;
-		modem.DeleteSms(res[i].sms_index);
-	}
 
-	for (int j=0; j<5; j++)
-	{
-		modem.SendSms("22337617","Test");
-	}
+	return 0;
 */
+	/*
+	    SerialPort port("/dev/ttyS1" );
+	    port.Open( SerialPort::BAUD_9600,
+				SerialPort::CHAR_SIZE_8,
+				SerialPort::PARITY_NONE,
+		        SerialPort::STOP_BITS_1,
+		        SerialPort::FLOW_CONTROL_HARD );
+
+		ModemTransceiver modem(port);
+		modem.Init();
+
+
+		test_sms(modem, 100);
+		return 0;
+
+
+		vector<SMS> res = modem.ReadSms(true);
+
+		for (unsigned int i = 0; i<res.size(); ++i)
+		{
+			SMS& sms = res[i];
+			string cmd = GetSmsCommand(sms);
+			string data = GetSmsData(sms);
+			cout << "------------------------------" << endl;
+			cout << "Index    " << sms.sms_index << endl;
+			cout << "Sender:  " << sms.sender << endl;
+			cout << "Time:    " << sms.timestamp << endl;
+			cout << "Message: >" << sms.message << "<" << endl;
+			cout << "Cmd:     >" << cmd << "<" << endl;
+			cout << "Data     >" << data << "<" << endl;
+
+			Util::str_dump(sms.message);
+			//modem.SendSms(sms.sender, sms.message, false);
+
+		}
+
+	*/
+	/*
+		vector<PduInfo> pdu = SmsPdu::CreateSmsPdu("4522337617", "Hej med dig, igen", true);
+		cout << "Len: " << pdu[0].len << endl;
+		cout << "Pdu: " << pdu[0].pdu << endl;
+
+		modem.SendSmsPdu(pdu[0].pdu, pdu[0].len);
+	*/
+
+
+
+	/*
+		SMS sms;
+		sms.sender = "12345678";
+		sms.message = "Tog list";
+		DebugModemTransceiver modem;
+		TogPlugin plugin;
+
+		plugin.Execute(modem, sms);
+
+
+		string msg = Util::str_gsm2latin(modem.GetMessage());
+
+		cout << "---- " << msg.length() << " ----" << endl;
+		cout << msg << endl;
+	*/
+	/*
+		vector<TrainInfo> trains = GetTrainInfo("BJ","Bjerringbro");
+
+		for (unsigned i=0; i<trains.size(); ++i)
+		{
+			TrainInfo& train = trains[i];
+			cout << "-------------------------------------" << endl;
+			cout << "Time:       {" << train.time        << "}" << endl;
+			cout << "Update:     {" << train.update      << "}" << endl;
+			cout << "Type:       {" << train.type        << "}" << endl;
+			cout << "Destination:{" << train.destination << "}" << endl;
+			cout << "Origin:     {" << train.origin      << "}" << endl;
+			cout << "Current:    {" << train.current     << "}" << endl;
+			cout << "Status:     {" << train.status      << "}" << endl;
+			cout << "Note:       {" << train.note        << "}" << endl;
+		}
+	*/
+	/*
+		SMS sms;
+
+		sms.message = "Test   test2   teste3 test4";
+
+		cout << "|" << GetSmsCommand(sms) << "|" << GetSmsData(sms) << "|" << endl;
+
+		return 0;
+
+
+		SerialPort port("/dev/ttyS1" );
+		port.Open();
+		ModemTransceiver modem(port);
+
+		//modem.SendSms("22337617", "Hello, sir!");
+		//
+		vector<SMS> res = modem.ReadSms();
+
+
+		for (unsigned i=0; i<res.size(); ++i)
+		{
+			cout << "--- SMS Recieved ---" << endl;
+			cout << "Index:   " << res[i].sms_index << endl;
+			cout << "From:    " << res[i].sender << endl;
+			cout << "Time:    " << res[i].timestamp << endl;
+			cout << "Message:>" << res[i].message << "<" << endl;
+			cout << endl;
+			modem.DeleteSms(res[i].sms_index);
+		}
+
+		for (int j=0; j<5; j++)
+		{
+			modem.SendSms("22337617","Test");
+		}
+	*/
 	return 0;
 }