X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fboard.cpp;h=9d249ad50c1355d14d53e2380b77c92cc45fd3eb;hb=59a5414ec47a2932a7802fcd1d98c4d80166564f;hp=99350f5d7508ab6789766cbfb0d3ca4cc56da610;hpb=3dc3ac3cfe10b7196a7977e9c041c29fa141c35e;p=fms.git

diff --git a/src/board.cpp b/src/board.cpp
index 99350f5..9d249ad 100644
--- a/src/board.cpp
+++ b/src/board.cpp
@@ -1,33 +1,36 @@
 #include "../include/board.h"
 #include "../include/stringfunctions.h"
 
+#include <Poco/DateTimeParser.h>
+
 #ifdef XMEM
 	#include <xmem.h>
 #endif
 
-Board::Board()
+Board::Board(SQLite3DB::DB *db):IDatabase(db)
 {
 	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_savereceivedmessages=true;
+	m_addedmethod="";
 }
 
-Board::Board(const long boardid)
+Board::Board(SQLite3DB::DB *db, const long boardid):IDatabase(db)
 {
 	Load(boardid);	
 }
 
-Board::Board(const std::string &boardname)
+Board::Board(SQLite3DB::DB *db, const std::string &boardname):IDatabase(db)
 {
 	Load(boardname);
 }
 
-Board::Board(const long boardid, const std::string &boardname, const std::string &boarddescription, const std::string datecreated, const long lowmessageid, const long highmessageid, const long messagecount, const bool savereceivedmessages)
+Board::Board(SQLite3DB::DB *db, const long boardid, const std::string &boardname, const std::string &boarddescription, const std::string datecreated, const long lowmessageid, const long highmessageid, const long messagecount, const bool savereceivedmessages, const std::string &addedmethod):IDatabase(db)
 {
 	m_boardid=boardid;
 	m_boardname=boardname;
@@ -36,6 +39,7 @@ Board::Board(const long boardid, const std::string &boardname, const std::string
 	m_highmessageid=highmessageid;
 	m_messagecount=messagecount;
 	m_savereceivedmessages=savereceivedmessages;
+	m_addedmethod=addedmethod;
 
 	SetDateFromString(datecreated);
 
@@ -48,12 +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 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();
 
@@ -88,6 +95,7 @@ const bool Board::Load(const long boardid)
 		{
 			m_savereceivedmessages=false;
 		}
+		st.ResultText(7,m_addedmethod);
 
 		return true;
 	}
@@ -99,33 +107,21 @@ const bool Board::Load(const long boardid)
 
 const bool Board::Load(const std::string &boardname)		// same as loading form boardid - but using name
 {
-	/*
-	SQLite3DB::Statement st=m_db->Prepare("SELECT BoardID FROM tblBoard WHERE BoardName=?;");
-	st.Bind(0,boardname);
-	st.Step();
-	if(st.RowReturned())
-	{
-		int tempint;
-		st.ResultInt(0,tempint);
-		return Load(tempint);
-	}
-	else
-	{
-		return false;
-	}
-	*/
 
 	// clear current values
 	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 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();
 
@@ -161,6 +157,7 @@ const bool Board::Load(const std::string &boardname)		// same as loading form bo
 		{
 			m_savereceivedmessages=false;
 		}
+		st.ResultText(8,m_addedmethod);
 
 		return true;
 	}
@@ -173,38 +170,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);
 	}
 }