X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fboard.cpp;h=2d05fed8578407f6554a57255477d2faa63f02ab;hb=dabd19d7f764b8275c9c8370c7b89675b6a78243;hp=7ccac3bc787aaa51b7507d525655c49b9da5aa75;hpb=107bd97018964d48425306026d06afd038e84db0;p=fms.git

diff --git a/src/board.cpp b/src/board.cpp
index 7ccac3b..2d05fed 100644
--- a/src/board.cpp
+++ b/src/board.cpp
@@ -1,6 +1,8 @@
 #include "../include/board.h"
 #include "../include/stringfunctions.h"
 
+#include <Poco/DateTimeParser.h>
+
 #ifdef XMEM
 	#include <xmem.h>
 #endif
@@ -10,7 +12,7 @@ Board::Board()
 	m_boardid=-1;
 	m_boardname="";
 	m_boarddescription="";
-	m_datecreated.Set(1970,1,1);
+	m_datecreated.assign(1970,1,1);
 	m_lowmessageid=0;
 	m_highmessageid=0;
 	m_messagecount=0;
@@ -50,13 +52,15 @@ const bool Board::Load(const long boardid)
 	m_boardid=-1;
 	m_boardname="";
 	m_boarddescription="";
-	m_datecreated.Set(1970,1,1);
+	m_datecreated.assign(1970,1,1);
 	m_lowmessageid=0;
 	m_highmessageid=0;
 	m_messagecount=0;
 	m_addedmethod="";
 
-	SQLite3DB::Statement st=m_db->Prepare("SELECT BoardName, BoardDescription, DateAdded, HighMessageID, LowMessageID, MessageCount, SaveReceivedMessages, AddedMethod FROM tblBoard LEFT JOIN vwBoardStats ON tblBoard.BoardID=vwBoardStats.BoardID WHERE tblBoard.BoardID=?;");
+	// Optimize query by not using vwBoardStats
+	//SQLite3DB::Statement st=m_db->Prepare("SELECT BoardName, BoardDescription, DateAdded, HighMessageID, LowMessageID, MessageCount, SaveReceivedMessages, AddedMethod FROM tblBoard LEFT JOIN vwBoardStats ON tblBoard.BoardID=vwBoardStats.BoardID WHERE tblBoard.BoardID=?;");
+	SQLite3DB::Statement st=m_db->Prepare("SELECT BoardName, BoardDescription, DateAdded, IFNULL(MAX(MessageID),'0') AS HighMessageID, IFNULL(MIN(MessageID),'0') AS LowMessageID, COUNT(MessageID) AS MessageCount, SaveReceivedMessages, AddedMethod FROM tblBoard LEFT JOIN tblMessageBoard ON tblBoard.BoardID=tblMessageBoard.BoardID WHERE tblBoard.BoardID=? AND (MessageID IS NULL OR MessageID>=0);");
 	st.Bind(0,boardid);
 	st.Step();
 
@@ -123,14 +127,16 @@ const bool Board::Load(const std::string &boardname)		// same as loading form bo
 	m_boardid=-1;
 	m_boardname="";
 	m_boarddescription="";
-	m_datecreated.Set(1970,1,1);
+	m_datecreated.assign(1970,1,1);
 	m_lowmessageid=0;
 	m_highmessageid=0;
 	m_messagecount=0;
 	int tempint=-1;
 	m_addedmethod="";
 
-	SQLite3DB::Statement st=m_db->Prepare("SELECT BoardName, BoardDescription, DateAdded, HighMessageID, LowMessageID, MessageCount, SaveReceivedMessages, tblBoard.BoardID, AddedMethod FROM tblBoard LEFT JOIN vwBoardStats ON tblBoard.BoardID=vwBoardStats.BoardID WHERE tblBoard.BoardName=?;");
+	// Optimize query by not using vwBoardStats
+	//SQLite3DB::Statement st=m_db->Prepare("SELECT BoardName, BoardDescription, DateAdded, HighMessageID, LowMessageID, MessageCount, SaveReceivedMessages, tblBoard.BoardID, AddedMethod FROM tblBoard LEFT JOIN vwBoardStats ON tblBoard.BoardID=vwBoardStats.BoardID WHERE tblBoard.BoardName=?;");
+	SQLite3DB::Statement st=m_db->Prepare("SELECT BoardName, BoardDescription, DateAdded, IFNULL(MAX(MessageID),'0') AS HighMessageID, IFNULL(MIN(MessageID),'0') AS LowMessageID, COUNT(MessageID) AS MessageCount, SaveReceivedMessages, tblBoard.BoardID, AddedMethod FROM tblBoard LEFT JOIN tblMessageBoard ON tblBoard.BoardID=tblMessageBoard.BoardID WHERE tblBoard.BoardName=? AND (MessageID IS NULL OR MessageID>=0);");
 	st.Bind(0,boardname);
 	st.Step();
 
@@ -180,37 +186,9 @@ const bool Board::Load(const std::string &boardname)		// same as loading form bo
 void Board::SetDateFromString(const std::string &datestring)
 {
 	// break out date created  - date should be in format yyyy-mm-dd HH:MM:SS, so we split on "-", " " (space), and ":"
-	int tempint=0;
-	std::vector<std::string> dateparts;
-	StringFunctions::SplitMultiple(datestring,"- :",dateparts);
-	if(dateparts.size()>0)
-	{
-		StringFunctions::Convert(dateparts[0],tempint);
-		m_datecreated.SetYear(tempint);
-	}
-	if(dateparts.size()>1)
-	{
-		StringFunctions::Convert(dateparts[1],tempint);
-		m_datecreated.SetMonth(tempint);
-	}
-	if(dateparts.size()>2)
-	{
-		StringFunctions::Convert(dateparts[2],tempint);
-		m_datecreated.SetDay(tempint);
-	}
-	if(dateparts.size()>3)
-	{
-		StringFunctions::Convert(dateparts[3],tempint);
-		m_datecreated.SetHour(tempint);
-	}
-	if(dateparts.size()>4)
-	{
-		StringFunctions::Convert(dateparts[4],tempint);
-		m_datecreated.SetMinute(tempint);
-	}
-	if(dateparts.size()>5)
+	int tzdiff=0;
+	if(Poco::DateTimeParser::tryParse(datestring,m_datecreated,tzdiff)==false)
 	{
-		StringFunctions::Convert(dateparts[5],tempint);
-		m_datecreated.SetSecond(tempint);
+		m_log->error("Board::SetDateFromString could not parse date "+datestring);
 	}
 }