X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=include%2Ffreenet%2Fiindexinserter.h;h=2135e452def5e05c38127e812c3999fda673bcd3;hb=59a5414ec47a2932a7802fcd1d98c4d80166564f;hp=ba5c9888bee0d687ec92cafdab0ec7c61c44fda1;hpb=221236a4d3aac4144529d418ce368db5c98facb0;p=fms.git

diff --git a/include/freenet/iindexinserter.h b/include/freenet/iindexinserter.h
index ba5c988..2135e45 100644
--- a/include/freenet/iindexinserter.h
+++ b/include/freenet/iindexinserter.h
@@ -22,13 +22,13 @@ template <class IDTYPE>
 class IIndexInserter:public IFreenetRegistrable,public IFCPConnected,public IFCPMessageHandler,public IPeriodicProcessor,public IDatabase,public ILogger
 {
 public:
-	IIndexInserter();
-	IIndexInserter(FCPv2 *fcp);
+	IIndexInserter(SQLite3DB::DB *db);
+	IIndexInserter(SQLite3DB::DB *db, FCPv2::Connection *fcp);
 	virtual ~IIndexInserter()		{}
 
 	virtual void FCPConnected();
 	virtual void FCPDisconnected();
-	virtual const bool HandleMessage(FCPMessage &message);
+	virtual const bool HandleMessage(FCPv2::Message &message);
 
 	virtual void Process();
 
@@ -37,8 +37,8 @@ public:
 protected:
 	void InitializeIIndexInserter();
 	virtual void Initialize()=0;		// initialize m_fcpuniquename
-	virtual const bool HandlePutSuccessful(FCPMessage &message)=0;
-	virtual const bool HandlePutFailed(FCPMessage &message)=0;
+	virtual const bool HandlePutSuccessful(FCPv2::Message &message)=0;
+	virtual const bool HandlePutFailed(FCPv2::Message &message)=0;
 	virtual const bool StartInsert(const IDTYPE &id)=0;
 	virtual void CheckForNeededInsert()=0;
 	virtual void RemoveFromInsertList(const IDTYPE id);
@@ -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 *fcp):IFCPConnected(fcp)
+IIndexInserter<IDTYPE>::IIndexInserter(SQLite3DB::DB *db, FCPv2::Connection *fcp):IDatabase(db),IFCPConnected(fcp)
 {
 	InitializeIIndexInserter();
 }
@@ -86,7 +86,7 @@ void IIndexInserter<IDTYPE>::FCPDisconnected()
 }
 
 template <class IDTYPE>
-const bool IIndexInserter<IDTYPE>::HandleMessage(FCPMessage &message)
+const bool IIndexInserter<IDTYPE>::HandleMessage(FCPv2::Message &message)
 {
 
 	if(message["Identifier"].find(m_fcpuniquename)==0)
@@ -127,8 +127,9 @@ const bool IIndexInserter<IDTYPE>::HandleMessage(FCPMessage &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();
 }