--- trunk/FlisServer/FlisServerDlg.cpp	2007/11/29 14:00:15	102
+++ trunk/FlisServer/FlisServerDlg.cpp	2007/11/29 16:16:34	103
@@ -51,7 +51,6 @@
 	: CDialog(CFlisServerDlg::IDD, pParent)
 {
 	m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
-	db = 0;
 }
 
 void CFlisServerDlg::DoDataExchange(CDataExchange* pDX)
@@ -65,9 +64,8 @@
 	ON_WM_PAINT()
 	ON_WM_QUERYDRAGICON()
 	//}}AFX_MSG_MAP
-	ON_BN_CLICKED(IDOK, OnBnClickedOk)
-	ON_BN_CLICKED(IDCANCEL, OnBnClickedCancel)
 	ON_BN_CLICKED(IDC_test, OnBnClickedtest)
+	ON_BN_CLICKED(IDCLOSE, OnBnClickedClose)
 END_MESSAGE_MAP()
 
 
@@ -184,41 +182,11 @@
 	}
 	return buf;
 }
-void CFlisServerDlg::OnBnClickedOk()
-{
-	// TODO: Add your control notification handler code here
-	OnOK();
-	if( Serial.isOpen() ){
-		Serial.close();
-	}
-
-	if (db != 0)
-	{
-		//db->Close();
-		delete db;
-		db=0;
-	}
-}
-
-void CFlisServerDlg::OnBnClickedCancel()
-{
-	// TODO: Add your control notification handler code here
-	OnCancel();
-	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
+/*	
+////////////////Read sms ting//////////////////
 	CString tekst;
 	std::vector<unsigned char> data;
 	data.push_back('a');
@@ -233,6 +201,78 @@
 
 	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;
+	vector<unsigned char> smsdata;
+	tlfnr.push_back('2');
+	tlfnr.push_back('9');
+	tlfnr.push_back('7');
+	tlfnr.push_back('2');
+	tlfnr.push_back('2');
+	tlfnr.push_back('6');
+	tlfnr.push_back('0');
+	tlfnr.push_back('3');
+
+	SendSmsHead(tlfnr);
+
+	 //35:29860132:75 <--- demo pakke;
+	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(2000);
+	if(Serial.getComstat().cbInQue > 0)
+	{
+		CString tekst;
+		std::vector<unsigned char> answer = readFrame();
+		Sleep(50);
+			char array1[25];
+			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.SetWindowText(tekst);
+	}
+///////////////Send sms stuff/////////////////
+*/
 }
 void CFlisServerDlg::writeFrame(std::vector<unsigned char> data)
 {
@@ -287,39 +327,80 @@
 return 0;
 }
 void CFlisServerDlg::SendSmsData(std::vector<unsigned char> data)
-{
+{	
+	
 	for (int i=0; i<data.size(); i++)
 	{
 		Serial.writeByte( data[i] );
 		Sleep(5);
 	}
 	Serial.writeByte(0x1A);
-	Sleep(100);
+	Sleep(500);
 
 }
 void CFlisServerDlg::SendSmsHead(std::vector<unsigned char> data)
 {
+	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('s');
+	atcommand.push_back('=');
+	atcommand.push_back('"');
+	int s = (atcommand.size() -1 );
+	
+	for (int i=0; i<(atcommand.size()); i++)
+	{
+		Serial.writeByte( atcommand[i] );
+		Sleep(5);
+	}
+	
 	for (int i=0; i<data.size(); i++)
 	{
 		Serial.writeByte( data[i] );
 		Sleep(5);
 	}
+	Serial.writeByte(atcommand[s]);
 	Serial.writeByte(0x0D);
-	Sleep(100);
-
+	Sleep(250);
 }
 void CFlisServerDlg::DBConnect()
 {
-	db = new CDatabase();
-
 	CString dsn;
-	dsn.Format("ODBC;Description=asd;DRIVER=PostgreSQL ANSI;SERVER=192.168.134.132; uid=serrenab;password=furnacemonitor;database=flisfyr");
-	//db->OpenEx(dsn, CDatabase::noOdbcDialog);
-	
+	dsn.Format("ODBC;Description=asd;DRIVER=PostgreSQL ANSI;SERVER=192.168.134.132; uid=serrenab;password=furnacemonitor;database=flisfyr;sslmode=prefer");
+	db.OpenEx(dsn, CDatabase::noOdbcDialog);
 }
-void CFlisServerDlg::DBRead()
+vector<Commands> CFlisServerDlg::DBRead(void)
 {
+	vector<Commands> buffer;
 
+	CString SQL, IDnr, CommandID, InstallationsID;
+	SQL = "select id,date_trunc('second', created) as created,executed,commandid,installationid from command WHERE executed IS NULL;";
+	CRecordset rs(&db);
+	rs.Open(AFX_DB_USE_DEFAULT_TYPE, SQL);
+	if (rs.GetRecordCount()>0) 
+	{
+		rs.MoveFirst();
+		while(!rs.IsEOF())
+		{
+		Commands Mycom;
+		rs.GetFieldValue((short)0, IDnr);
+		rs.GetFieldValue(3, CommandID);
+		rs.GetFieldValue(4, InstallationsID);
+		
+		Mycom.IDnr = IDnr;
+		Mycom.CommandID = CommandID;
+		Mycom.InstallationsID = InstallationsID;
+
+		buffer.push_back(Mycom);
+		rs.MoveNext();
+		}
+	}
+	rs.Close();
+	return buffer;
 }
 void CFlisServerDlg::ReadSms()
 {
@@ -412,4 +493,19 @@
 			fyrdata = fyrdata.Right( fyrdata.GetLength() - pos -1);
 		}
 	return Output;
-}
\ No newline at end of file
+}
+void CFlisServerDlg::OnBnClickedClose()
+{
+	// TODO: Add your control notification handler code here
+	
+	if( Serial.isOpen() )
+	{
+		Serial.close();
+	}
+	
+	if(db.IsOpen())
+	{
+	db.Close();
+	}
+	OnOK();
+}