X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Fglobal.cpp;h=7f635791088beb7281125b2110f27a67c3e7539e;hp=42a4726ed834fcba41c71cec1f095bb2798fcfb2;hb=df316253862dc50e8e5a790d9634ef90be37badb;hpb=f60495a029c54358f82956482fe203fe2b7b5b23

diff --git a/src/global.cpp b/src/global.cpp
index 42a4726..7f63579 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -49,6 +49,8 @@ void SetupDB()
 		if(major==1 && minor==0)
 		{
 			ConvertDB0100To0101();
+			major=1;
+			minor=1;
 		}
 	}
 	else
@@ -56,6 +58,8 @@ void SetupDB()
 		db->Execute("INSERT INTO tblDBVersion(Major,Minor) VALUES(1,1);");
 	}
 
+	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=2;");
+
 	db->Execute("CREATE TABLE IF NOT EXISTS tblOption(\
 				Option				TEXT UNIQUE,\
 				OptionValue			TEXT NOT NULL,\
@@ -168,10 +172,10 @@ void SetupDB()
 				DateAdded			DATETIME\
 				);");
 
-	db->Execute("INSERT INTO tblBoard(BoardName,BoardDescription,DateAdded) VALUES('fms','Freenet Message System','2007-12-01');");
-	db->Execute("INSERT INTO tblBoard(BoardName,BoardDescription,DateAdded) VALUES('freenet','Discussion about Freenet','2007-12-01');");
-	db->Execute("INSERT INTO tblBoard(BoardName,BoardDescription,DateAdded) VALUES('public','Public discussion','2007-12-01');");
-	db->Execute("INSERT INTO tblBoard(BoardName,BoardDescription,DateAdded) VALUES('test','Test board','2007-12-01');");
+	db->Execute("INSERT INTO tblBoard(BoardName,BoardDescription,DateAdded) VALUES('fms','Freenet Message System','2007-12-01 12:00:00');");
+	db->Execute("INSERT INTO tblBoard(BoardName,BoardDescription,DateAdded) VALUES('freenet','Discussion about Freenet','2007-12-01 12:00:00');");
+	db->Execute("INSERT INTO tblBoard(BoardName,BoardDescription,DateAdded) VALUES('public','Public discussion','2007-12-01 12:00:00');");
+	db->Execute("INSERT INTO tblBoard(BoardName,BoardDescription,DateAdded) VALUES('test','Test board','2007-12-01 12:00:00');");
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblMessage(\
 				MessageID			INTEGER PRIMARY KEY,\
@@ -233,6 +237,20 @@ void SetupDB()
 				ModifyLocalTrustListTrust	INTEGER\
 				);");
 
+	db->Execute("CREATE TABLE IF NOT EXISTS tblBoardListInserts(\
+				LocalIdentityID		INTEGER,\
+				Day					DATE,\
+				InsertIndex			INTEGER,\
+				Inserted			BOOL CHECK(Inserted IN('true','false')) DEFAULT 'false'\
+				);");
+
+	db->Execute("CREATE TABLE IF NOT EXISTS tblBoardListRequests(\
+				IdentityID			INTEGER,\
+				Day					DATE,\
+				RequestIndex		INTEGER,\
+				Found				BOOL CHECK(Found IN('true','false')) DEFAULT 'false'\
+				);");	
+
 	// MessageInserter will insert a record into this temp table which the MessageListInserter will query for and insert a MessageList when needed
 	db->Execute("CREATE TEMPORARY TABLE IF NOT EXISTS tmpMessageListInsert(\
 				LocalIdentityID		INTEGER,\
@@ -535,6 +553,18 @@ void SetupDefaultOptions()
 	st.Step();
 	st.Reset();
 
+	st.Bind(0,"MaxBoardListRequests");
+	st.Bind(1,"5");
+	st.Bind(2,"The maximum number of concurrent requests for new Board Lists.  Set to 0 to disable.");
+	st.Step();
+	st.Reset();
+
+	st.Bind(0,"MaxBoardsPerMessage");
+	st.Bind(1,"8");
+	st.Bind(2,"The maximum number of boards a received message may be sent to.  Boards over this limit will be ignored.");
+	st.Step();
+	st.Reset();
+
 }
 
 void SetupLogFile()