X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Ffreenet%2Fmessagelistxml.cpp;h=eb57240d3fdbf33f3863d75b0e610ce47dac4e6b;hp=c35e10f7aea356761ff0265ff1e508168ee8f543;hb=76805933f794915a72b7f0a21b12af6654759f4f;hpb=047cea32f848d605c549ec123c12c1c400dd7ec1

diff --git a/src/freenet/messagelistxml.cpp b/src/freenet/messagelistxml.cpp
index c35e10f..eb57240 100644
--- a/src/freenet/messagelistxml.cpp
+++ b/src/freenet/messagelistxml.cpp
@@ -135,73 +135,49 @@ const long MessageListXML::GetIndex(const long index)
 std::string MessageListXML::GetXML()
 {
 	Poco::AutoPtr<Poco::XML::Document> doc=new Poco::XML::Document;
-	//TiXmlDocument td;
-	//TiXmlDeclaration *tdec=new TiXmlDeclaration("1.0","UTF-8","");
-	Poco::XML::Element *root=doc->createElement("MessageList");
-	//TiXmlElement *tid;
-	//TiXmlPrinter tp;
+	Poco::AutoPtr<Poco::XML::Element> root=doc->createElement("MessageList");
 
 	doc->appendChild(root);
-	//td.LinkEndChild(tdec);
-	//tid=new TiXmlElement("MessageList");
-	//td.LinkEndChild(tid);
 
 	for(std::vector<message>::iterator i=m_messages.begin(); i!=m_messages.end(); i++)
 	{
-		Poco::XML::Element *tr=doc->createElement("Message");
-		//TiXmlElement *tr=new TiXmlElement("Message");
+		Poco::AutoPtr<Poco::XML::Element> tr=doc->createElement("Message");
 		root->appendChild(tr);
-		//tid->LinkEndChild(tr);
 		tr->appendChild(XMLCreateTextElement(doc,"Date",(*i).m_date));
-		//tr->LinkEndChild(XMLCreateTextElement("Date",(*i).m_date));
 		tr->appendChild(XMLCreateTextElement(doc,"Index",(*i).m_index));
-		//tr->LinkEndChild(XMLCreateTextElement("Index",(*i).m_index));
-		Poco::XML::Element *boards=doc->createElement("Boards");
-		//TiXmlElement *brds=new TiXmlElement("Boards");
+		
+		Poco::AutoPtr<Poco::XML::Element> boards=doc->createElement("Boards");
 		tr->appendChild(boards);
-		//tr->LinkEndChild(brds);
 		for(std::vector<std::string>::iterator j=(*i).m_boards.begin(); j!=(*i).m_boards.end(); j++)
 		{
 			boards->appendChild(XMLCreateCDATAElement(doc,"Board",(*j)));
-			//brds->LinkEndChild(XMLCreateCDATAElement("Board",(*j)));
 		}
 	}
 
 	for(std::vector<externalmessage>::iterator i=m_externalmessages.begin(); i!=m_externalmessages.end(); i++)
 	{
-		Poco::XML::Element *tr=doc->createElement("ExternalMessage");
-		//TiXmlElement *tr=new TiXmlElement("ExternalMessage");
+		Poco::AutoPtr<Poco::XML::Element> tr=doc->createElement("ExternalMessage");
 		root->appendChild(tr);
-		//tid->LinkEndChild(tr);
 		tr->appendChild(XMLCreateTextElement(doc,"Type",(*i).m_type));
-		//tr->LinkEndChild(XMLCreateTextElement("Type",(*i).m_type));
 		if((*i).m_type=="Keyed")
 		{
 			tr->appendChild(XMLCreateCDATAElement(doc,"Identity",(*i).m_identity));
-			//tr->LinkEndChild(XMLCreateCDATAElement("Identity",(*i).m_identity));
 			tr->appendChild(XMLCreateTextElement(doc,"Index",(*i).m_index));
-			//tr->LinkEndChild(XMLCreateTextElement("Index",(*i).m_index));
 		}
 		else
 		{
 			tr->appendChild(XMLCreateCDATAElement(doc,"MessageKey",(*i).m_messagekey));
-			//tr->LinkEndChild(XMLCreateCDATAElement("MessageKey",(*i).m_messagekey));
 		}
 		tr->appendChild(XMLCreateTextElement(doc,"Date",(*i).m_date));
-		//tr->LinkEndChild(XMLCreateTextElement("Date",(*i).m_date));
-		Poco::XML::Element *boards=doc->createElement("Boards");
-		//TiXmlElement *brds=new TiXmlElement("Boards");
+
+		Poco::AutoPtr<Poco::XML::Element> boards=doc->createElement("Boards");
 		tr->appendChild(boards);
-		//tr->LinkEndChild(brds);
 		for(std::vector<std::string>::iterator j=(*i).m_boards.begin(); j!=(*i).m_boards.end(); j++)
 		{
 			boards->appendChild(XMLCreateCDATAElement(doc,"Board",(*j)));
-			//brds->LinkEndChild(XMLCreateCDATAElement("Board",(*j)));
 		}
 	}
 
-	//td.Accept(&tp);
-	//return std::string(tp.CStr());
 	return GenerateXML(doc);
 }
 
@@ -331,116 +307,4 @@ const bool MessageListXML::ParseXML(const std::string &xml)
 	}
 
 	return parsed;
-
-	/*
-	TiXmlDocument td;
-	td.Parse(xml.c_str());
-
-	if(!td.Error())
-	{
-		std::string tempstr;
-		std::string date;
-		long index;
-		std::vector<std::string> boards;
-		TiXmlText *txt;
-		TiXmlHandle hnd(&td);
-		TiXmlNode *node;
-		TiXmlNode *node2;
-
-		Initialize();
-
-		node=hnd.FirstChild("MessageList").FirstChild("Message").ToNode();
-		while(node)
-		{
-			date="";
-			index=-1;
-			boards.clear();
-
-			TiXmlHandle hnd2(node);
-			txt=hnd2.FirstChild("Date").FirstChild().ToText();
-			if(txt)
-			{
-				date=SanitizeSingleString(txt->ValueStr());
-			}
-			txt=hnd2.FirstChild("Index").FirstChild().ToText();
-			if(txt)
-			{
-				tempstr=SanitizeSingleString(txt->ValueStr());
-				StringFunctions::Convert(tempstr,index);
-			}
-			node2=hnd2.FirstChild("Boards").FirstChild("Board").ToNode();
-			while(node2)
-			{
-				if(node2->FirstChild())
-				{
-					std::string boardname=SanitizeSingleString(node2->FirstChild()->ValueStr());
-					StringFunctions::LowerCase(boardname,boardname);
-					boards.push_back(boardname);
-				}
-				node2=node2->NextSibling("Board");
-			}
-
-			m_messages.push_back(message(date,index,boards));
-
-			node=node->NextSibling("Message");
-		}
-
-		node=hnd.FirstChild("MessageList").FirstChild("ExternalMessage").ToNode();
-		while(node)
-		{
-			std::string type="";
-			std::string identity="";
-			date="";
-			index=-1;
-			boards.clear();
-
-			TiXmlHandle hnd2(node);
-			txt=hnd2.FirstChild("Type").FirstChild().ToText();
-			if(txt)
-			{
-				type=SanitizeSingleString(txt->ValueStr());
-			}
-
-			if(type=="Keyed")
-			{
-				txt=hnd2.FirstChild("Identity").FirstChild().ToText();
-				if(txt)
-				{
-					identity=SanitizeSingleString(txt->ValueStr());
-				}
-				txt=hnd2.FirstChild("Date").FirstChild().ToText();
-				if(txt)
-				{
-					date=SanitizeSingleString(txt->ValueStr());
-				}
-				txt=hnd2.FirstChild("Index").FirstChild().ToText();
-				if(txt)
-				{
-					tempstr=SanitizeSingleString(txt->ValueStr());
-					StringFunctions::Convert(tempstr,index);
-				}
-				node2=hnd2.FirstChild("Boards").FirstChild("Board").ToNode();
-				while(node2)
-				{
-					if(node2->FirstChild())
-					{
-						std::string boardname=SanitizeSingleString(node2->FirstChild()->ValueStr());
-						StringFunctions::LowerCase(boardname,boardname);
-						boards.push_back(boardname);
-					}
-					node2=node2->NextSibling("Board");
-				}
-				m_externalmessages.push_back(externalmessage("Keyed",identity,date,index,boards));
-			}
-
-			node=node->NextSibling("ExternalMessage");
-		}
-
-		return true;
-	}
-	else
-	{
-		return false;
-	}
-	*/
 }