--- trunk/FlisServer/FlisServerDlg.cpp	2007/11/30 07:24:35	105
+++ trunk/FlisServer/FlisServerDlg.cpp	2007/12/01 14:18:33	113
@@ -4,7 +4,6 @@
 #include "stdafx.h"
 #include "FlisServer.h"
 #include "FlisServerDlg.h"
-#include ".\flisserverdlg.h"
 #include <vector>
 
 #ifdef _DEBUG
@@ -63,6 +62,7 @@
 	ON_WM_SYSCOMMAND()
 	ON_WM_PAINT()
 	ON_WM_QUERYDRAGICON()
+	ON_MESSAGE(UWM_MYMESSAGE, OnShowString)
 	//}}AFX_MSG_MAP
 	ON_BN_CLICKED(IDC_test, OnBnClickedtest)
 	ON_BN_CLICKED(IDCLOSE, OnBnClickedClose)
@@ -102,6 +102,15 @@
 	// TODO: Add extra initialization here
 	StartSerial();
 	DBConnect();
+	continueThread = 1;
+	ResetSms = 0;
+	/*
+////////////Start Tråd////////////////////////
+	MyThread *t = new MyThread(AfxGetMainWnd());
+	t->start();
+////////////Start Tråd////////////////////////
+*/
+	AfxBeginThread(threadWrapper,AfxGetMainWnd());
 	
 	return TRUE;  // return TRUE  unless you set the focus to a control
 }
@@ -185,38 +194,7 @@
 void CFlisServerDlg::OnBnClickedtest()
 {
 	// TODO: Add your control notification handler code here
-/*	
-////////////////Read sms ting//////////////////
-	CString tekst;
-	std::vector<unsigned char> data;
-	data.push_back('a');
-	data.push_back('t');
-	data.push_back('+');
-	data.push_back('c');
-	data.push_back('m');
-	data.push_back('g');
-	data.push_back('r');
-	data.push_back('=');
-	data.push_back('1');
 
-	writeFrame(data);
-	ReadSms();
-////////////////Read sms ting//////////////////
-*/
-/*
-////////////////DBRead stuff//////////////////
-	CString testdata;
-	std::vector<Commands> data;
-	data = DBRead();
-	for (int i=0; i<data.size(); i++)
-	{
-		testdata.Append(data[i].IDnr);
-		testdata.Append(data[i].CommandID);
-		testdata.Append(data[i].InstallationsID);
-	}
-	m_Textwindow.SetWindowText(testdata);
-////////////////DBRead stuff//////////////////	
-*/
 /*	
 ///////////////Send sms stuff/////////////////
 	vector<unsigned char> tlfnr;
@@ -233,6 +211,7 @@
 	SendSmsHead(tlfnr);
 
 	 //35:29860132:75 <--- demo pakke;
+	 vector<unsigned char> smsdata;
 	smsdata.push_back('3');
 	smsdata.push_back('5');
 	smsdata.push_back(':');
@@ -251,6 +230,7 @@
 	SendSmsData(smsdata);
 ///////////////Send sms stuff/////////////////
 */
+
 }
 void CFlisServerDlg::writeFrame(std::vector<unsigned char> data)
 {
@@ -263,7 +243,7 @@
 	Sleep(100);
 
 }
-int CFlisServerDlg::SetPin(void)
+void CFlisServerDlg::SetPin()
 {
 	CString tekst;
 	std::vector<unsigned char> data;
@@ -281,7 +261,7 @@
 	data.push_back('5');
 
 	writeFrame(data);
-	Sleep(750);
+/*	Sleep(750);
 	if(Serial.getComstat().cbInQue > 0)
 	{
 		std::vector<unsigned char> answer = readFrame();
@@ -302,7 +282,7 @@
 			}
 			m_Textwindow.SetWindowText(tekst);
 	}
-return 0;
+*/
 }
 void CFlisServerDlg::SendSmsData(std::vector<unsigned char> data)
 {	
@@ -369,7 +349,8 @@
 void CFlisServerDlg::DBConnect()
 {
 	CString dsn;
-	dsn.Format("ODBC;Description=asd;DRIVER=PostgreSQL ANSI;SERVER=192.168.134.132; uid=serrenab;password=furnacemonitor;database=flisfyr;sslmode=prefer");
+	dsn.Format("ODBC;Description=asd;DRIVER=PostgreSQL ANSI;SERVER=t-hoerup.dk; uid=serrenab;password=furnacemonitor;database=flisfyr;sslmode=prefer");
+	//dsn.Format("ODBC;Description=asd;DRIVER=PostgreSQL ANSI;SERVER=192.168.134.132; uid=serrenab;password=furnacemonitor;database=flisfyr;sslmode=prefer");   //skole server
 	db.OpenEx(dsn, CDatabase::noOdbcDialog);
 }
 vector<Commands> CFlisServerDlg::DBRead(void)
@@ -437,14 +418,14 @@
 	char CharData[150];
 	strcpy(CharData,data);
 
-	int s=22;
+	int s=24;
 	for (int i=0; i<=7; i++)
 	{
 		TlfNr.AppendChar(CharData[s]);
 		s++;
 	}
 
-	for (int s=55; s<=(data.GetLength()-3); s++)
+	for (int s=57; s<=(data.GetLength()-3); s++)
 	{
 		FyrData.AppendChar(CharData[s]);
 	}
@@ -477,6 +458,9 @@
 		oldtekst.Append("\r\n");
 		oldtekst.Append("På næste linie kommer PowerFail. \r\n");
 		oldtekst.Append(PowerFail);
+		oldtekst.Append("\r\n");
+		oldtekst.Append("På næste linie kommer TlfNR. \r\n");
+		oldtekst.Append(TlfNr);
 		m_Textwindow.SetWindowText(oldtekst);
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////// Her skal sendes data til databasen //////////////////////////////////////////////
@@ -496,7 +480,10 @@
 void CFlisServerDlg::OnBnClickedClose()
 {
 	// TODO: Add your control notification handler code here
-	
+	continueThread = 0;
+	DeleteSms();   //<--- crasher, men gider ikke bruge flere af mine penge på at teste det med sms'er, hele close laver crash, bare ikke når jeg stepper. :S
+
+	Sleep(500);
 	if( Serial.isOpen() )
 	{
 		Serial.close();
@@ -506,11 +493,274 @@
 	{
 	db.Close();
 	}
+	
 	OnOK();
+
 }
 
 void CFlisServerDlg::OnBnClickedGsmpin()
 {
 	// TODO: Add your control notification handler code here
 	SetPin();
+	//Sleep(5000);
+}
+void CFlisServerDlg::DeleteSms()
+{
+	vector<unsigned char> atcommand;
+	atcommand.push_back('a');
+	atcommand.push_back('t');
+	atcommand.push_back('+');
+	atcommand.push_back('c');
+	atcommand.push_back('m');
+	atcommand.push_back('g');
+	atcommand.push_back('d');
+	atcommand.push_back('=');
+	atcommand.push_back('1');
+	atcommand.push_back(',');
+	atcommand.push_back('3');
+
+	writeFrame(atcommand);
+	Sleep(500);
+}
+LRESULT CFlisServerDlg::OnShowString(WPARAM wParam, LPARAM lParam)
+{
+	CString *s = (CString*) lParam;
+	GetDlgItem(IDC_Textwindow)->SetWindowText(*s);
+
+	delete s;
+	return 0;
+
+}UINT threadWrapper(LPVOID thread)
+{
+	CFlisServerDlg *t = (CFlisServerDlg*) thread;
+	t->runthread();
+	return 0;
+}
+
+void CFlisServerDlg::startthread()
+{
+	AfxBeginThread(threadWrapper, (LPVOID) this);
+}
+
+void CFlisServerDlg::runthread()
+{
+	while (continueThread != 0) 
+	{
+		Reader();
+	}
+}
+void CFlisServerDlg::Reader()
+{
+	if(Serial.getComstat().cbInQue > 0)
+		{
+			Sleep(250);
+			std::vector<unsigned char> answer = readFrame();
+			Sleep(500);
+			CString tekst, oldtekst;
+			int lol;
+			char array1[250];
+			int i;
+			for (int i=0; i<answer.size(); i++)
+			{
+				array1[i] = answer[i];
+			}
+		
+			for (int i=0; i<answer.size(); i++)
+			{
+				if ((array1[i] != 0x0A) && (array1[i] != 0x0D))
+				{
+					tekst.AppendChar(array1[i]);
+				}
+			}
+			tekst.Append(":");
+
+			CString command;
+			bool plus;
+				int pos = tekst.Find('+',0);
+				if (pos != -1)
+				{
+					plus = true;
+					tekst = tekst.Right( tekst.GetLength() - pos -1);
+					pos = tekst.Find(':');
+					command = tekst.Left(pos);
+					tekst = tekst.Right( tekst.GetLength() - pos -1);
+				}
+			
+			
+			if(tekst == "OK")
+			{	
+				m_Textwindow.GetWindowText(oldtekst);
+				oldtekst.Append("\r\n");
+				oldtekst.Append("OK tekst modtaget");
+				m_Textwindow.SetWindowText(oldtekst);
+			}
+			else if (tekst == "error")
+			{
+				m_Textwindow.GetWindowText(oldtekst);
+				oldtekst.Append("\r\n");
+				oldtekst.Append("error tekst");
+				oldtekst.Append(tekst);
+				m_Textwindow.SetWindowText(oldtekst);
+			}
+			else if (plus = true)
+			{
+				if (command = "cmti")
+				{
+					CString smscount, oldteskst;
+					int pos = tekst.Find(',',0);
+					if (pos != -1)
+					{
+						smscount = tekst.Right( tekst.GetLength() - pos -1);
+						smscount.Remove(':');
+						ResetSms++;
+					}
+						////////////////Read sms ting//////////////////
+						std::vector<unsigned char> data;
+						data.push_back('a');
+						data.push_back('t');
+						data.push_back('+');
+						data.push_back('c');
+						data.push_back('m');
+						data.push_back('g');
+						data.push_back('r');
+						data.push_back('=');
+						
+						for (int i=0; i< smscount.GetLength(); i++)
+						{
+							data.push_back(smscount[i]);
+						}
+						for (int i=0; i<data.size();i++)
+						{
+						oldteskst.AppendChar(data[i]);
+						}
+						m_Textwindow.SetWindowText(oldteskst);
+						writeFrame(data);
+						Sleep(200);
+						ReadSms();
+
+				}
+				else if(command = "wind")
+				{
+					m_Textwindow.GetWindowText(oldtekst);
+					oldtekst.Append("\r\n");
+					oldtekst.Append("Først lidt tekst på næste linie\r\n");
+					oldtekst.Append(tekst);
+					m_Textwindow.SetWindowText(oldtekst);
+				}
+			}
+			if(ResetSms == 50)
+			{
+				DeleteSms();
+			}
+
+		}
+		if (continueThread = 1)
+		{
+			
+			////////////////DBRead stuff//////////////////
+			CString testdata, dataframe,testprint, sIDnr, sCommandID, sInstallationsID;
+			std::vector<Commands> data;
+			data = DBRead();
+			for (int i=0; i<data.size(); i++)
+			{
+				testdata.Append(data[i].IDnr);
+				testdata.Append(":");
+				testdata.Append(data[i].CommandID);
+				testdata.Append(":");
+				testdata.Append(data[i].InstallationsID);
+				testdata.Append(":");
+			}
+			sIDnr = Splitter(testdata);
+			sCommandID = Splitter(testdata);
+			sInstallationsID = Splitter(testdata);
+
+			testprint.Append("sIDnr på næste linie\r\n");
+			testprint.Append(sIDnr);
+			testprint.Append("\r\n");
+			testprint.Append("sCommandID på næste linie\r\n");
+			testprint.Append(sCommandID);
+			testprint.Append("\r\n");
+			testprint.Append("sInstallationsID på næste linie\r\n");
+			testprint.Append(sInstallationsID);
+			m_Textwindow.SetWindowText(testprint);
+			
+			
+			if (sIDnr.GetLength() > 0)
+			{
+				DBReadData(sIDnr,sCommandID,sInstallationsID);
+			}
+			Sleep(500);
+			////////////////DBRead stuff//////////////////	
+		}
 }
+void CFlisServerDlg::DBReadData(CString IDnr,CString CommandID,CString InstallationsID)
+{
+	CString TlfNr;
+		
+	//kald dbreadphone som du kalder dbread
+	std::vector<Installation> inst;
+	inst = DBReadPhone(InstallationsID);
+	for (int i=0; i<inst.size(); i++)
+	{
+		CString dataen = inst[i].InstPhoneNr;
+		TlfNr.Append(dataen);
+	}
+	vector<unsigned char> tlfnr;
+	for (int i=0; i<TlfNr.GetLength(); i++)
+	{
+		tlfnr.push_back(TlfNr[i]);
+	}
+
+	SendSmsHead(tlfnr);
+	Sleep(500);
+	//35:29860132:75 <--- demo pakke;
+	vector<unsigned char> smsdata;
+	smsdata.push_back('3');
+	smsdata.push_back('5');
+	smsdata.push_back(':');
+	smsdata.push_back('2');
+	smsdata.push_back('9');
+	smsdata.push_back('8');
+	smsdata.push_back('6');
+	smsdata.push_back('0');
+	smsdata.push_back('1');
+	smsdata.push_back('3');
+	smsdata.push_back('2');
+	smsdata.push_back(':');
+	smsdata.push_back('7');
+	smsdata.push_back('5');
+
+	SendSmsData(smsdata);
+	Sleep(250);
+
+	CString SQL;
+
+	SQL.Format("update command set executed=now() where id=%s",IDnr);
+	db.ExecuteSQL(SQL);
+	Sleep(150);
+}
+vector<Installation> CFlisServerDlg::DBReadPhone(CString sInstallationsID)
+{
+	vector<Installation> buffer;
+
+	CString SQL, phonenr;
+	SQL.Format("select installationphonenr from installation WHERE id = %s",sInstallationsID);
+	CRecordset rs(&db);
+	rs.Open(AFX_DB_USE_DEFAULT_TYPE, SQL);
+	if (rs.GetRecordCount()>0) 
+	{
+		rs.MoveFirst();
+		while(!rs.IsEOF())
+		{
+		Installation Myinst;
+		rs.GetFieldValue((short)0,phonenr);
+
+		Myinst.InstPhoneNr.Append(phonenr);
+
+		buffer.push_back(Myinst);
+		rs.MoveNext();
+		}
+	}
+	rs.Close();
+	return buffer;
+}
\ No newline at end of file