version 0.3.33

[fms.git] / include / freenet / iindexinserter.h

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