X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=include%2Ffreenet%2Fiindexinserter.h;h=bbbd31a8dff32f3997969a36097142fb25079a06;hb=ed0732b2550c23c05fc9faf925620e87ee6dee12;hp=fb65b0eb7d038ee5464c952607364e0e4cd3399d;hpb=4e96d123460d6363cf7274e36bd9357768eb86ad;p=fms.git

diff --git a/include/freenet/iindexinserter.h b/include/freenet/iindexinserter.h
index fb65b0e..bbbd31a 100644
--- a/include/freenet/iindexinserter.h
+++ b/include/freenet/iindexinserter.h
@@ -22,8 +22,8 @@ template <class IDTYPE>
 class IIndexInserter:public IFreenetRegistrable,public IFCPConnected,public IFCPMessageHandler,public IPeriodicProcessor,public IDatabase,public ILogger
 {
 public:
-	IIndexInserter();
-	IIndexInserter(FCPv2::Connection *fcp);
+	IIndexInserter(SQLite3DB::DB *db);
+	IIndexInserter(SQLite3DB::DB *db, FCPv2::Connection *fcp);
 	virtual ~IIndexInserter()		{}
 
 	virtual void FCPConnected();
@@ -52,13 +52,13 @@ protected:
 };
 
 template <class IDTYPE>
-IIndexInserter<IDTYPE>::IIndexInserter()
+IIndexInserter<IDTYPE>::IIndexInserter(SQLite3DB::DB *db):IDatabase(db)
 {
 	InitializeIIndexInserter();
 }
 
 template <class IDTYPE>
-IIndexInserter<IDTYPE>::IIndexInserter(FCPv2::Connection *fcp):IFCPConnected(fcp)
+IIndexInserter<IDTYPE>::IIndexInserter(SQLite3DB::DB *db, FCPv2::Connection *fcp):IDatabase(db),IFCPConnected(fcp)
 {
 	InitializeIIndexInserter();
 }
@@ -127,20 +127,19 @@ const bool IIndexInserter<IDTYPE>::HandleMessage(FCPv2::Message &message)
 template <class IDTYPE>
 void IIndexInserter<IDTYPE>::InitializeIIndexInserter()
 {
+	Option option(m_db);
 	m_fcpuniquename="";
-	Option::Instance()->Get("MessageBase",m_messagebase);
+	option.Get("MessageBase",m_messagebase);
 	m_lastchecked=Poco::Timestamp();
 }
 
 template <class IDTYPE>
 void IIndexInserter<IDTYPE>::Process()
 {
-	Poco::DateTime now;
-
-	if(m_lastchecked<(now-Poco::Timespan(0,0,1,0,0)))
+	if(m_lastchecked<(Poco::DateTime()-Poco::Timespan(0,0,1,0,0)))
 	{
 		CheckForNeededInsert();
-		m_lastchecked=now;
+		m_lastchecked=Poco::DateTime();
 	}
 }