--- trunk/FlisServer/FlisServerDlg.cpp	2007/12/03 11:46:03	132
+++ trunk/FlisServer/FlisServerDlg.cpp	2007/12/03 14:13:20	136
@@ -63,7 +63,6 @@
 	ON_WM_SYSCOMMAND()
 	ON_WM_PAINT()
 	ON_WM_QUERYDRAGICON()
-	ON_MESSAGE(UWM_MYMESSAGE, OnShowString)
 	//}}AFX_MSG_MAP
 	ON_BN_CLICKED(IDCLOSE, OnBnClickedClose)
 	ON_BN_CLICKED(IDC_GSMPIN, OnBnClickedGsmpin)
@@ -158,20 +157,45 @@
 }
 int CFlisServerDlg::StartSerial(void)
 {
+	
 	int Baud;
-	CString SerialPort = "COM3";
 
+	ConfigFile config;
+	try {
+		config.ReadSettings();
+	} catch(...) {
+		MessageBox("Could not open config file");
+		OnOK();
+		return true;
+	}
+	
 	Baud = 1200;
 	if( Serial.isOpen() )
 	{
-		Serial.close();
-		Serial.open( SerialPort, Baud );
+		try
+		{
+			Serial.close();
+			Serial.open( config.comport, Baud );
+		}
+		catch (exception* e)
+		{
+			MessageBox( "Serial.open() exception" );
+			return 0;
+		}
 	}
-	else 
+	else
 	{
-		Serial.open( SerialPort, Baud );
+		try
+		{
+			Serial.open( config.comport, Baud );
+		}
+		catch (exception* e)
+		{
+			MessageBox( "Serial.open() exception 2" );
+			return 0;
+		}
 	}
-
+	
 		
 return 0;
 }
@@ -232,25 +256,19 @@
 		CString tekst;
 		std::vector<unsigned char> answer = readFrame();
 		Sleep(50);
-			char array1[150];
-			int i;
-			for (int i=0; i<answer.size(); i++)
-			{
-				array1[i] = answer[i];
-			}
-		
-			for (int i=0; i<answer.size(); i++)
+
+		for (int i=0; i<answer.size(); i++)
 			{
-				if ((array1[i] != 0x0A) && (array1[i] != 0x0D))
+				if ((answer[i] != 0x0A) && (answer[i] != 0x0D))
 				{
-					tekst.AppendChar(array1[i]);
+					tekst.AppendChar(answer[i]);
 				}
 			}
-			m_Textwindow.SetWindowText(tekst);
+			AppendText(tekst);
 	}
 
 }
-void CFlisServerDlg::SendSmsHead(std::vector<unsigned char> data)
+void CFlisServerDlg::SendSmsHead(std::vector<unsigned char> tlfnr)
 {
 	vector<unsigned char> atcommand;
 	atcommand.push_back('a');
@@ -270,9 +288,9 @@
 		Sleep(5);
 	}
 	
-	for (int i=0; i<data.size(); i++)
+	for (int i=0; i<tlfnr.size(); i++)
 	{
-		Serial.writeByte( data[i] );
+		Serial.writeByte( tlfnr[i] );
 		Sleep(5);
 	}
 	Serial.writeByte(atcommand[s]);
@@ -282,35 +300,40 @@
 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");	//Torben
-	dsn.Format("ODBC;Description=asd;DRIVER=PostgreSQL ANSI;SERVER=192.168.134.132; uid=serrenab;password=furnacemonitor;database=flisfyr;sslmode=prefer");   //skole server
+	ConfigFile config;
+	try {
+		config.ReadSettings();
+	} catch(...) {
+		MessageBox("Could not open config file");
+	}
+	
+	dsn.Format("ODBC;Description=asd;DRIVER=PostgreSQL ANSI;SERVER=%s; uid=%s;password=%s;database=%s;sslmode=prefer",config.host,config.username, config.password, config.database);
 	db.OpenEx(dsn, CDatabase::noOdbcDialog);
 }
-vector<Commands> CFlisServerDlg::DBRead(void)
+vector<Commands> CFlisServerDlg::DBReadCommands(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;";
+	SQL = "select id,date_trunc('second', created) as created,executed,commandid,installationid from command WHERE executed IS NULL ORDER BY created ASC LIMIT 1;";
 	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;
+		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();
 	return buffer;
@@ -318,30 +341,21 @@
 void CFlisServerDlg::ReadSms()
 {
 	CString tekst, oldtekst;
-	Sleep(950);
+	Sleep(950);		//Holder en pause for at lade hele sms'en komme ind i serial køen.
 	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];
-			}
-		
+		//Sleep(50);
+
 			for (int i=0; i<answer.size(); i++)
 			{
-				if ((array1[i] != 0x0A) && (array1[i] != 0x0D))
+				if ((answer[i] != 0x0A) && (answer[i] != 0x0D))
 				{
-					tekst.AppendChar(array1[i]);
+					tekst.AppendChar(answer[i]);
 				}
 			}
 
-			m_Textwindow.GetWindowText(oldtekst);
-			oldtekst.Append("\r\n");
-			oldtekst.Append(tekst);
-			m_Textwindow.SetWindowText(oldtekst);
+			AppendText(tekst);
 			SmsSplit(tekst);
 	}
 }
@@ -350,18 +364,8 @@
 	CString FyrData, TlfNr, SmsCount, Temper, Flamme, Flis, FremFejl, PowerFail, oldtekst;
 	char CharData[150];
 	strcpy(CharData,data);
-
-	int s=24;
-	for (int i=0; i<=7; i++)
-	{
-		TlfNr.AppendChar(CharData[s]);
-		s++;
-	}
-
-	for (int s=57; s<=(data.GetLength()-3); s++)
-	{
-		FyrData.AppendChar(CharData[s]);
-	}
+	TlfNr = data.Mid(24,8);
+	FyrData = data.Mid(57,data.GetLength()-3);
 	FyrData.Append(":");
 	
 	SmsCount = Splitter(FyrData);
@@ -386,14 +390,8 @@
 		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);
+		AppendText("Sms added to Log");
 		Sleep(150);
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////// Her skal sendes data til databasen //////////////////////////////////////////////
 }
 CString CFlisServerDlg::Splitter(CString& fyrdata)
 {
@@ -461,15 +459,7 @@
 	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)
+UINT threadWrapper(LPVOID thread)
 {
 	CFlisServerDlg *t = (CFlisServerDlg*) thread;
 	t->runthread();
@@ -497,18 +487,12 @@
 			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))
+				if ((answer[i] != 0x0A) && (answer[i] != 0x0D))
 				{
-					tekst.AppendChar(array1[i]);
+					tekst.AppendChar(answer[i]);
 				}
 			}
 			tekst.Append(":");
@@ -528,22 +512,19 @@
 			
 			if(tekst == "OK")
 			{	
-				m_Textwindow.GetWindowText(oldtekst);
-				oldtekst.Append("\r\n");
-				oldtekst.Append("OK tekst modtaget");
-				m_Textwindow.SetWindowText(oldtekst);
+				AppendText("OK tekst modtaget");
 			}
 			else if (tekst == "error")
 			{
-				m_Textwindow.GetWindowText(oldtekst);
-				oldtekst.Append("\r\n");
-				oldtekst.Append("error tekst");
-				oldtekst.Append(tekst);
-				m_Textwindow.SetWindowText(oldtekst);
+				CString send;
+				send.Append("error tekst");
+				send.Append("\r\n");
+				send.Append(tekst);
+				AppendText(send);
 			}
-			else if (plus = true)
+			else if (plus == true)
 			{
-				if (command = "cmti")
+				if (command == "cmti")
 				{
 					CString smscount, oldteskst;
 					int pos = tekst.Find(',',0);
@@ -581,54 +562,48 @@
 						ResetSms++;
 
 				}
-				else if(command = "wind")
+				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);
+
+					CString send;
+					send.Append("Wind modtaget");
+					send.Append("\r\n");
+					send.Append(tekst);
+					AppendText(send);
 				}
 			}
 			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);
+				CString send;
+				send.Append("Anden tekst end forventet");
+				send.Append("\r\n");
+				send.Append(tekst);
+				AppendText(send);
 			}
 			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);
+				AppendText("Sms'er slettet da vi nåede grænsen");
 			}
 
 		}
-		if (continueThread = 1)
+		if (continueThread == 1)
 		{
 			
 			CString testdata, dataframe,testprint, sIDnr, sCommandID, sInstallationsID, sImei;
 			int commandtest = 0;
 			int iAll = 1;
 			std::vector<Commands> data;
-			data = DBRead();
+			data = DBReadCommands();
 			for (int i=0; i<data.size(); i++)
 			{
-				testdata.Append(data[i].IDnr);
-				testdata.Append(":");
-				testdata.Append(data[i].CommandID);
-				testdata.Append(":");
+				sIDnr = data[i].IDnr;
+				sCommandID = data[i].CommandID;
 				commandtest = atoi(data[i].CommandID);
 
 				if(commandtest > 1)
 				{
-					testdata.Append(data[i].InstallationsID);
-					testdata.Append(":");
+					sInstallationsID = data[i].InstallationsID;
 				}
 			}
 			sIDnr = Splitter(testdata);
@@ -642,12 +617,12 @@
 
 			if (sIDnr.GetLength() > 0)
 			{
-				DBReadData(sIDnr,sCommandID,sInstallationsID);
+				SendConfig(sIDnr,sCommandID,sInstallationsID);
 			}
 			Sleep(500);
 		}
 }
-void CFlisServerDlg::DBReadData(CString IDnr,CString CommandID,CString InstallationsID)
+void CFlisServerDlg::SendConfig(CString IDnr,CString CommandID,CString InstallationsID)
 {
 	CString ServerTlfNr;
 	int i = 0;
@@ -713,10 +688,7 @@
 		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);
+		AppendText("Command executed");
 		Sleep(150);
 
 }
@@ -777,3 +749,47 @@
 	m_Textwindow.SetWindowText("Started");
 	AfxBeginThread(threadWrapper,AfxGetMainWnd());
 }
+void CFlisServerDlg::AppendText(CString s)
+{
+	CString Tekst;
+	m_Textwindow.GetWindowText(Tekst);
+	Tekst.Append("\r\n");
+	Tekst.Append(s);
+	m_Textwindow.SetWindowText(Tekst);
+
+}
+void ConfigFile::ReadSettings()
+{
+	ifstream file("Server-Settings.ini");
+	if (!file.is_open())
+		throw("Could not open file");
+
+	char buf[200];
+	while (!file.eof() ) {
+		file.getline(buf,200);
+		CString tmp(buf);
+
+		if (tmp.GetAt(0) == '#')
+			continue;
+
+		int pos = tmp.Find('=');
+		if (pos>0) {
+			CString key = tmp.Left(pos).Trim().MakeLower();;
+			CString value = tmp.Right(tmp.GetLength()-pos-1).Trim();
+
+			if (key == "host")
+				host = value;
+			else if (key == "username")
+				username = value;
+			else if (key == "password")
+				password = value;
+			else if (key == "database")
+				database = value;
+			else if (key == "comport")
+				comport = value;
+		}
+
+	}
+
+	file.close();
+}
\ No newline at end of file