--- trunk/FlisServer/FlisServerDlg.cpp	2007/12/02 12:03:03	121
+++ trunk/FlisServer/FlisServerDlg.cpp	2007/12/03 11:46:03	132
@@ -162,11 +162,13 @@
 	CString SerialPort = "COM3";
 
 	Baud = 1200;
-	if( Serial.isOpen() ){
+	if( Serial.isOpen() )
+	{
 		Serial.close();
 		Serial.open( SerialPort, Baud );
 	}
-	else {
+	else 
+	{
 		Serial.open( SerialPort, Baud );
 	}
 
@@ -178,9 +180,9 @@
 	std::vector<unsigned char> buf;
 	while(Serial.getComstat().cbInQue > 0)
 	{
-	unsigned char data = Serial.readByte();
+		unsigned char data = Serial.readByte();
 
-	buf.push_back(data);
+		buf.push_back(data);
 	}
 	return buf;
 }
@@ -214,28 +216,6 @@
 	data.push_back('5');
 
 	writeFrame(data);
-/*	Sleep(750);
-	if(Serial.getComstat().cbInQue > 0)
-	{
-		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);
-	}
-*/
 }
 void CFlisServerDlg::SendSmsData(std::vector<unsigned char> data)
 {	
@@ -252,7 +232,7 @@
 		CString tekst;
 		std::vector<unsigned char> answer = readFrame();
 		Sleep(50);
-			char array1[25];
+			char array1[150];
 			int i;
 			for (int i=0; i<answer.size(); i++)
 			{
@@ -302,8 +282,8 @@
 void CFlisServerDlg::DBConnect()
 {
 	CString dsn;
-	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
+	//dsn.Format("ODBC;Description=asd;DRIVER=PostgreSQL ANSI;SERVER=t-hoerup.dk; uid=serrenab;password=furnacemonitor;database=flisfyr;sslmode=prefer");	//Torben
+	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)
@@ -319,17 +299,17 @@
 		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;
+			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();
+			buffer.push_back(Mycom);
+			rs.MoveNext();
 		}
 	}
 	rs.Close();
@@ -390,31 +370,28 @@
 	Flis = Splitter(FyrData);
 	FremFejl = Splitter(FyrData);
 	PowerFail = Splitter(FyrData);
-///////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////// Her skal sendes data til databasen ////NÅR HEDIN KAN SENDE SMS///////////////////
-		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);
-		oldtekst.Append("\r\n");
-		oldtekst.Append("På næste linie kommer TlfNR. \r\n");
-		oldtekst.Append(TlfNr);
-		m_Textwindow.SetWindowText(oldtekst);
+		
+		CString SQL, Textwindow, InstallNR;
+		SQL.Format("select ID from installation where installationphonenr=%s",TlfNr);
+	
+		CRecordset rs(&db);
+		rs.Open(AFX_DB_USE_DEFAULT_TYPE, SQL);
+		if (rs.GetRecordCount()>0)
+		{
+			rs.MoveFirst();		
+			rs.GetFieldValue((short)0,InstallNR);
+		}
+		rs.Close();
+
+		SQL.Format("insert into logtable (logtime,temperature,flamedetector,solidfuelempty,conveyorerror,powerfailure,messagenr,installationnr) Values (now(),%s,'%s','%s','%s','%s',%s,%s)",Temper, Flamme, Flis, FremFejl, PowerFail, SmsCount,InstallNR);
+		db.ExecuteSQL(SQL);
+
+		m_Textwindow.GetWindowText(Textwindow);
+		Textwindow.Append("\r\n");
+		Textwindow.Append("Sms added to Log");
+		m_Textwindow.SetWindowText(Textwindow);
+		Sleep(150);
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////// Her skal sendes data til databasen //////////////////////////////////////////////
 }
@@ -434,7 +411,7 @@
 {
 	// 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
+	DeleteSms();
 
 	Sleep(500);
 	if( Serial.isOpen() )
@@ -444,7 +421,7 @@
 	
 	if(db.IsOpen())
 	{
-	db.Close();
+		db.Close();
 	}
 	
 	OnOK();
@@ -454,8 +431,16 @@
 void CFlisServerDlg::OnBnClickedGsmpin()
 {
 	// TODO: Add your control notification handler code here
+	m_Textwindow.SetWindowText("Indsætter Pinkode, efterfuldt af 60sec pause");
+	UpdateWindow();
 	SetPin();
-	Sleep(35000);
+	Sleep(50000);
+
+	while (Serial.getComstat().cbInQue > 0)
+	{
+		Serial.readByte(); //Flush the incoming queue
+	}
+
 	OnBnClickedStart();
 }
 void CFlisServerDlg::DeleteSms()
@@ -583,9 +568,11 @@
 						{
 							data.push_back(smscount[i]);
 						}
+						m_Textwindow.GetWindowText(oldteskst);
+						oldteskst.Append("\r\n");
 						for (int i=0; i<data.size();i++)
 						{
-						oldteskst.AppendChar(data[i]);
+							oldteskst.AppendChar(data[i]);
 						}
 						m_Textwindow.SetWindowText(oldteskst);
 						writeFrame(data);
@@ -603,17 +590,31 @@
 					m_Textwindow.SetWindowText(oldtekst);
 				}
 			}
-			if(ResetSms == 50)
+			else
+			{
+				m_Textwindow.GetWindowText(oldtekst);
+				oldtekst.Append("\r\n");
+				oldtekst.Append("Anden tekst end forventet");
+				oldtekst.Append("\r\n");
+				oldtekst.Append(tekst);
+				m_Textwindow.SetWindowText(oldtekst);
+			}
+			if(ResetSms == 20)
 			{
 				DeleteSms();
+				m_Textwindow.GetWindowText(oldtekst);
+				oldtekst.Append("\r\n");
+				oldtekst.Append("Slettet Sendte og læste beskeder da vi nåede grænsen.");
+				m_Textwindow.SetWindowText(oldtekst);
 			}
 
 		}
 		if (continueThread = 1)
 		{
 			
-			////////////////DBRead stuff//////////////////
 			CString testdata, dataframe,testprint, sIDnr, sCommandID, sInstallationsID, sImei;
+			int commandtest = 0;
+			int iAll = 1;
 			std::vector<Commands> data;
 			data = DBRead();
 			for (int i=0; i<data.size(); i++)
@@ -622,39 +623,54 @@
 				testdata.Append(":");
 				testdata.Append(data[i].CommandID);
 				testdata.Append(":");
-				testdata.Append(data[i].InstallationsID);
-				testdata.Append(":");
+				commandtest = atoi(data[i].CommandID);
+
+				if(commandtest > 1)
+				{
+					testdata.Append(data[i].InstallationsID);
+					testdata.Append(":");
+				}
 			}
 			sIDnr = Splitter(testdata);
 			sCommandID = Splitter(testdata);
-			sInstallationsID = Splitter(testdata);
+			sInstallationsID = "0";
+			if (commandtest > 1)
+			{
+				sInstallationsID = Splitter(testdata);
+				iAll = 0;
+			}
 
 			if (sIDnr.GetLength() > 0)
 			{
 				DBReadData(sIDnr,sCommandID,sInstallationsID);
 			}
 			Sleep(500);
-			////////////////DBRead stuff//////////////////	
 		}
 }
 void CFlisServerDlg::DBReadData(CString IDnr,CString CommandID,CString InstallationsID)
 {
-	CString TlfNr, Imei, ServerTlfNr, updaterate;
-
+	CString ServerTlfNr;
+	int i = 0;
 	ServerTlfNr = "29860132";
 		
-	//kald dbreadphone som du kalder dbread
+	
 	std::vector<Installation> inst;
 	inst = DBReadPhone(InstallationsID);
-	for (int i=0; i<inst.size(); i++)
+	while (i < inst.size())
 	{
+		CString TlfNr, Imei, updaterate;
+		TlfNr.Empty();
+		Imei.Empty();
+		updaterate.Empty();
+
 		CString dataen = inst[i].InstPhoneNr;
 		TlfNr.Append(dataen);
 		CString Imeidata = inst[i].Imei;
 		Imei.Append(Imeidata);
 		CString updaterat = inst[i].Updaterate;
 		updaterate.Append(updaterat);
-	}
+		i++;
+	
 	vector<unsigned char> tlfnr;
 	for (int i=0; i<TlfNr.GetLength(); i++)
 	{
@@ -662,8 +678,7 @@
 	}
 	
 	int calcimei; 
-	double buf;
-	Imei.Remove('0');
+	__int64 buf;
 
 	buf = atof(Imei);
 	
@@ -672,8 +687,8 @@
 	Imei.Format("%d",calcimei);
 	
 	SendSmsHead(tlfnr);
-	Sleep(500);
-	//35:29860132:75 <--- demo pakke;
+	Sleep(250);
+	
 	vector<unsigned char> smsdata;
 	
 	for (int i=0; i<Imei.GetLength(); i++)
@@ -692,13 +707,17 @@
 	}
 
 	SendSmsData(smsdata);
-	Sleep(250);
-
-	CString SQL;
-
-	SQL.Format("update command set executed=now() where id=%s",IDnr);
-	db.ExecuteSQL(SQL);
-	Sleep(150);
+	Sleep(500);
+	
+	}
+		CString SQL, Textwindow;
+		SQL.Format("update command set executed=now() where id=%s",IDnr);
+		db.ExecuteSQL(SQL);
+		m_Textwindow.GetWindowText(Textwindow);
+		Textwindow.Append("\r\n");
+		Textwindow.Append("Command executed");
+		m_Textwindow.SetWindowText(Textwindow);
+		Sleep(150);
 
 }
 vector<Installation> CFlisServerDlg::DBReadPhone(CString sInstallationsID)
@@ -706,7 +725,17 @@
 	vector<Installation> buffer;
 
 	CString SQL, phonenr, imei, updaterate;
-	SQL.Format("select installationphonenr, imei, updaterate from installation WHERE id = %s",sInstallationsID);
+	int installernull;
+	Installation Myinst;
+	installernull = atoi(sInstallationsID);
+	if (installernull > 1)
+	{
+		SQL.Format("select installationphonenr, imei, updaterate from installation WHERE id = %s", sInstallationsID);
+	}
+	else if(installernull < 2)
+	{
+		SQL.Format("select installationphonenr, imei, updaterate from installation");
+	}
 	CRecordset rs(&db);
 	rs.Open(AFX_DB_USE_DEFAULT_TYPE, SQL);
 	if (rs.GetRecordCount()>0) 
@@ -714,23 +743,23 @@
 		rs.MoveFirst();
 		while(!rs.IsEOF())
 		{
-		Installation Myinst;
-		rs.GetFieldValue((short)0,phonenr);
-		rs.GetFieldValue(1,imei);
-		rs.GetFieldValue(2,updaterate);
-
-		Myinst.InstPhoneNr.Append(phonenr);
-		Myinst.Imei.Append(imei);
-		Myinst.Updaterate.Append(updaterate);
+		
+			rs.GetFieldValue((short)0,phonenr);
+			rs.GetFieldValue(1,imei);
+			rs.GetFieldValue(2,updaterate);
+
+			Myinst.InstPhoneNr = phonenr;
+			Myinst.Imei = imei;
+			Myinst.Updaterate = updaterate;
 
-		buffer.push_back(Myinst);
-		rs.MoveNext();
+			buffer.push_back(Myinst);
+			rs.MoveNext();
 		}
 	}
 	rs.Close();
 	return buffer;
 }
-int CFlisServerDlg::tversum(unsigned input)
+int CFlisServerDlg::tversum(__int64 input)
 {
 	int sum = 0;
 	while (input > 0)
@@ -745,6 +774,6 @@
 // TODO: Add your control notification handler code here
 
 	continueThread = 1;
-
+	m_Textwindow.SetWindowText("Started");
 	AfxBeginThread(threadWrapper,AfxGetMainWnd());
 }