X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=include%2Ffreenet%2Fiindexinserter.h;h=edcc86bd2e70cf1de200b50de69ff43d68f2181f;hb=6836fbb5db8464f56e682989996b2210b14231d0;hp=d7093a39814ce6ba79467e1909e063bcae646f30;hpb=6b896a9e1dc143bba86795be1e9336549db9b85f;p=fms.git

diff --git a/include/freenet/iindexinserter.h b/include/freenet/iindexinserter.h
index d7093a3..edcc86b 100644
--- a/include/freenet/iindexinserter.h
+++ b/include/freenet/iindexinserter.h
@@ -11,12 +11,17 @@
 #include "ifcpmessagehandler.h"
 #include "iperiodicprocessor.h"
 
+#ifdef XMEM
+	#include <xmem.h>
+#endif
+
 template <class IDTYPE>
 class IIndexInserter:public IFreenetRegistrable,public IFCPConnected,public IFCPMessageHandler,public IPeriodicProcessor,public IDatabase,public ILogger
 {
 public:
 	IIndexInserter();
 	IIndexInserter(FCPv2 *fcp);
+	virtual ~IIndexInserter()		{}
 
 	virtual void FCPConnected();
 	virtual void FCPDisconnected();
@@ -31,7 +36,7 @@ protected:
 	virtual void Initialize()=0;		// initialize m_fcpuniquename
 	virtual const bool HandlePutSuccessful(FCPMessage &message)=0;
 	virtual const bool HandlePutFailed(FCPMessage &message)=0;
-	virtual void StartInsert(const IDTYPE &id)=0;
+	virtual const bool StartInsert(const IDTYPE &id)=0;
 	virtual void CheckForNeededInsert()=0;
 	virtual void RemoveFromInsertList(const IDTYPE id);
 
@@ -61,11 +66,11 @@ void IIndexInserter<IDTYPE>::FCPConnected()
 	// make sure variables have been initialized by the derived class
 	if(m_fcpuniquename=="")
 	{
-		m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"IIndexInserter<IDTYPE>::FCPConnected fcpuniquename not initialized correctly!");
+		m_log->WriteLog(LogFile::LOGLEVEL_FATAL,"IIndexInserter<IDTYPE>::FCPConnected fcpuniquename not initialized correctly!");
 	}
 	if(m_fcpuniquename.find("|")!=std::string::npos)
 	{
-		m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"IIndexInserter<IDTYPE>::FCPConnected fcpuniquename contains | character!  This is not a valid character!");
+		m_log->WriteLog(LogFile::LOGLEVEL_FATAL,"IIndexInserter<IDTYPE>::FCPConnected fcpuniquename contains | character!  This is not a valid character!");
 	}
 
 	m_inserting.clear();
@@ -106,6 +111,7 @@ const bool IIndexInserter<IDTYPE>::HandleMessage(FCPMessage &message)
 			StringFunctions::Split(message["Identifier"],"|",idparts);
 			StringFunctions::Convert(idparts[1],id);
 			RemoveFromInsertList(id);
+			m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"IIndexInserter<IDTYPE>::HandleMessage IdentifierCollision for "+m_fcpuniquename+" "+message["Identifier"]);
 			return true;
 		}
 	}
@@ -117,7 +123,7 @@ template <class IDTYPE>
 void IIndexInserter<IDTYPE>::InitializeIIndexInserter()
 {
 	m_fcpuniquename="";
-	Option::instance()->Get("MessageBase",m_messagebase);
+	Option::Instance()->Get("MessageBase",m_messagebase);
 	m_lastchecked.SetToGMTime();
 }
 
@@ -145,7 +151,7 @@ void IIndexInserter<IDTYPE>::RegisterWithThread(FreenetMasterThread *thread)
 template <class IDTYPE>
 void IIndexInserter<IDTYPE>::RemoveFromInsertList(const IDTYPE identityid)
 {
-	std::vector<IDTYPE>::iterator i=m_inserting.begin();
+	typename std::vector<IDTYPE>::iterator i=m_inserting.begin();
 	while(i!=m_inserting.end() && (*i)!=identityid)
 	{
 		i++;