--- trunk/FlisServer/FlisServerDlg.cpp	2007/11/28 14:27:51	80
+++ trunk/FlisServer/FlisServerDlg.cpp	2007/11/28 16:24:04	81
@@ -51,6 +51,7 @@
 	: CDialog(CFlisServerDlg::IDD, pParent)
 {
 	m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
+	db = 0;
 }
 
 void CFlisServerDlg::DoDataExchange(CDataExchange* pDX)
@@ -101,7 +102,8 @@
 
 	// TODO: Add extra initialization here
 	StartSerial();
-	SetPin();
+	//SetPin();
+	DBConnect();
 	
 	return TRUE;  // return TRUE  unless you set the focus to a control
 }
@@ -189,6 +191,13 @@
 	if( Serial.isOpen() ){
 		Serial.close();
 	}
+
+	if (db != 0)
+	{
+		//db->Close();
+		delete db;
+		db=0;
+	}
 }
 
 void CFlisServerDlg::OnBnClickedCancel()
@@ -198,39 +207,32 @@
 	if( Serial.isOpen() ){
 		Serial.close();
 	}
+
+	if (db != 0)
+	{
+		db->Close();
+		delete db;
+		db = 0;
+	}
 }
 
 void CFlisServerDlg::OnBnClickedtest()
 {
 	// TODO: Add your control notification handler code here
-	/*
+	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);
-
-	if(Serial.getComstat().cbInQue > 0)
-	{
-	std::vector<unsigned char> answer = readFrame();
-	Sleep(50);
-	if (answer.size() == 0){
-		m_Textwindow.SetWindowText("ØV");
-	}
-	else{
-		CString ko;
-		char test[150];
-		int i;
-		for (int i=0; i<answer.size(); i++)
-		{
-			test[i] = answer[i];
-		}
-		ko = test;
-		m_Textwindow.SetWindowText(ko);
-	}
-	}
-	*/
-	SetPin();
+	ReadSms();
 }
 void CFlisServerDlg::writeFrame(std::vector<unsigned char> data)
 {
@@ -245,7 +247,7 @@
 }
 int CFlisServerDlg::SetPin(void)
 {
-	CString tekst, oldtekst;
+	CString tekst;
 	std::vector<unsigned char> data;
 	data.push_back('a');
 	data.push_back('t');
@@ -280,11 +282,7 @@
 					tekst.AppendChar(array1[i]);
 				}
 			}
-
-			m_Textwindow.GetWindowText(oldtekst);
-			oldtekst.Append("\r\n");
-			oldtekst.Append(tekst);
-			m_Textwindow.SetWindowText(oldtekst);
+			m_Textwindow.SetWindowText(tekst);
 	}
 return 0;
 }
@@ -310,9 +308,108 @@
 	Sleep(100);
 
 }
-void CFlisServerDlg::DBconnect()
+void CFlisServerDlg::DBConnect()
 {
+	db = new CDatabase();
+
 	CString dsn;
-	dsn.Format("ODBC;Description=asd;DRIVER=PostgreSQL ANSI;SERVER=%s; uid=%s;password=%s;database=%s",config.host, config.username, config.password, config.database);
-	db.OpenEx(dsn, CDatabase::noOdbcDialog);
+	dsn.Format("ODBC;Description=asd;DRIVER=PostgreSQL ANSI;SERVER=192.168.134.132; uid=serrenab;password=furnacemonitor;database=flisfyr");
+	//db->OpenEx(dsn, CDatabase::noOdbcDialog);
+	
+}
+void CFlisServerDlg::DBRead()
+{
+
+}
+void CFlisServerDlg::ReadSms()
+{
+	CString tekst, oldtekst;
+	Sleep(950);
+	if(Serial.getComstat().cbInQue > 0)
+	{
+		std::vector<unsigned char> answer = readFrame();
+		Sleep(50);
+			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]);
+				}
+			}
+
+			m_Textwindow.GetWindowText(oldtekst);
+			oldtekst.Append("\r\n");
+			oldtekst.Append(tekst);
+			m_Textwindow.SetWindowText(oldtekst);
+			SmsSplit(tekst);
+	}
+}
+void CFlisServerDlg::SmsSplit(CString data)
+{
+	CString FyrData, TlfNr, SmsCount, Temper, Flamme, Flis, FremFejl, PowerFail, oldtekst;
+	char CharData[150];
+	strcpy(CharData,data);
+
+	int s=22;
+	for (int i=0; i<=7; i++)
+	{
+		TlfNr.AppendChar(CharData[s]);
+		s++;
+	}
+
+	for (int s=55; s<=(data.GetLength()-3); s++)
+	{
+		FyrData.AppendChar(CharData[s]);
+	}
+	FyrData.Append(":");
+	
+	SmsCount = Splitter(FyrData);
+	Temper = Splitter(FyrData);
+	Flamme = Splitter(FyrData);
+	Flis = Splitter(FyrData);
+	FremFejl = Splitter(FyrData);
+	PowerFail = Splitter(FyrData);
+///////////////////////////////////////////////////////////////////////////////////////////////////////
+///////////////////// Her skal sendes data til databasen //////////////////////////////////////////////
+		m_Textwindow.GetWindowText(oldtekst);
+		oldtekst.Append("\r\n");
+		oldtekst.Append("På næste linie kommer SmsCount. \r\n");
+		oldtekst.Append(SmsCount);
+		oldtekst.Append("\r\n");
+		oldtekst.Append("På næste linie kommer Temper. \r\n");
+		oldtekst.Append(Temper);
+		oldtekst.Append("\r\n");
+		oldtekst.Append("På næste linie kommer Flamme. \r\n");
+		oldtekst.Append(Flamme);
+		oldtekst.Append("\r\n");
+		oldtekst.Append("På næste linie kommer Flis. \r\n");
+		oldtekst.Append(Flis);
+		oldtekst.Append("\r\n");
+		oldtekst.Append("På næste linie kommer FremFejl. \r\n");
+		oldtekst.Append(FremFejl);
+		oldtekst.Append("\r\n");
+		oldtekst.Append("På næste linie kommer PowerFail. \r\n");
+		oldtekst.Append(PowerFail);
+		m_Textwindow.SetWindowText(oldtekst);
+///////////////////////////////////////////////////////////////////////////////////////////////////////
+///////////////////// Her skal sendes data til databasen //////////////////////////////////////////////
+}
+CString CFlisServerDlg::Splitter(CString& fyrdata)
+{
+	CString Output;
+
+	int pos = fyrdata.Find(':',0);
+	if (pos != -1)
+		{
+			Output = fyrdata.Left(pos);
+			fyrdata = fyrdata.Right( fyrdata.GetLength() - pos -1);
+		}
+	return Output;
 }
\ No newline at end of file