X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Fperiodicdbmaintenance.cpp;h=f199fd2e04f63842877d388be32ce3a60047d880;hb=9b22dd53fe62e312c1647310b7ec43aa127090af;hp=073da197e92296fd7d07547abd01af6c8f2af9c4;hpb=bae54a5dae027ad0a6b0126ec9eeecd3bd2739eb;p=fms.git

diff --git a/src/freenet/periodicdbmaintenance.cpp b/src/freenet/periodicdbmaintenance.cpp
index 073da19..f199fd2 100644
--- a/src/freenet/periodicdbmaintenance.cpp
+++ b/src/freenet/periodicdbmaintenance.cpp
@@ -143,8 +143,6 @@ void PeriodicDBMaintenance::Do1DayMaintenance()
 	m_db->Execute("DELETE FROM tblIntroductionPuzzleInserts WHERE Day<='"+date.Format("%Y-%m-%d")+"';");
 	m_db->Execute("DELETE FROM tblIntroductionPuzzleRequests WHERE Day<='"+date.Format("%Y-%m-%d")+"';");
 
-	m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"PeriodicDBMaintenance::Do1DayMaintenance");
-
 	// delete all identities we've never seen and were added more than 20 days ago
 	date.SetToGMTime();
 	date.Add(0,0,0,-20);
@@ -191,6 +189,7 @@ void PeriodicDBMaintenance::Do1DayMaintenance()
 	while(st.RowReturned())
 	{
 		std::string name="";
+		std::string namepart="";
 		std::string publickey="";
 		int identityid=0;
 		st.ResultText(0,name);
@@ -198,9 +197,19 @@ void PeriodicDBMaintenance::Do1DayMaintenance()
 		std::vector<std::string> parts;
 		StringFunctions::Split(name,"@",parts);
 
+		// name can have a @ in it - so reattach all parts except the last which is the key
+		for(long i=0; i<parts.size()-1; i++)
+		{
+			if(i!=0)
+			{
+				namepart+="@";
+			}
+			namepart+=parts[i];
+		}
+
 		// find identities with this name
 		SQLite3DB::Statement st2=m_db->Prepare("SELECT IdentityID,PublicKey FROM tblIdentity WHERE Name=?;");
-		st2.Bind(0,name);
+		st2.Bind(0,namepart);
 		st2.Step();
 		while(st2.RowReturned())
 		{
@@ -213,7 +222,7 @@ void PeriodicDBMaintenance::Do1DayMaintenance()
 				// we have the identity - so update the messages table with the identityid
 				st2.ResultInt(0,identityid);
 
-				SQLite3DB::Statement st3=m_db->Prepare("UPDATE tblMessage SET IdentityID=? WHERE Name=? AND IdentityID IS NULL;");
+				SQLite3DB::Statement st3=m_db->Prepare("UPDATE tblMessage SET IdentityID=? WHERE FromName=? AND IdentityID IS NULL;");
 				st3.Bind(0,identityid);
 				st3.Bind(1,name);
 				st3.Step();
@@ -249,6 +258,8 @@ void PeriodicDBMaintenance::Do1DayMaintenance()
 	m_db->Execute("DELETE FROM tblIdentityTrust WHERE LocalIdentityID NOT IN (SELECT LocalIdentityID FROM tblLocalIdentity);");
 	m_db->Execute("DELETE FROM tblIdentityTrust WHERE IdentityID NOT IN (SELECT IdentityID FROM tblIdentity);");
 
+	m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"PeriodicDBMaintenance::Do1DayMaintenance");
+
 }
 
 void PeriodicDBMaintenance::Process()