completed distrib items (chan,blog, forum and base unit tests)

- written test for new forumreadstatus item, and other recent changes to distrib items

added graphics support to blogs - can now have pics for html blogs! but removed attachment, a channels artifact
added copy constructor to rstlvimage, needed for tests to work

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3317 b45a01b8-16f6-495d-af2f-9b41ad6348cc

libretroshare/src/serialiser/rsblogitems.cc

@@ -40,9 +40,15 @@ void 	RsBlogMsg::clear()
 
 	subject.clear();
 	message.clear();
-	mIdReply.clear();
 
-	attachment.TlvClear();
+	std::list<RsTlvImage >::iterator it = graphic_set.begin();
+
+	for(; it != graphic_set.end(); it++)
+	{
+		it->TlvClear();
+	}
+
+	graphic_set.clear();
 }
 
 std::ostream &RsBlogMsg::print(std::ostream &out, uint16_t indent)
@@ -62,15 +68,13 @@ std::ostream &RsBlogMsg::print(std::ostream &out, uint16_t indent)
 	std::string cnv_message(message.begin(), message.end());
         out << "message:  " << cnv_message  << std::endl;
 
+    	std::list<RsTlvImage >::iterator it = graphic_set.begin();
 
-	printIndent(out, int_Indent);
+    	for(; it != graphic_set.end(); it++)
+    	{
+    		it->print(out, int_Indent);
+    	}
 
-	out << "mIdReply:" << mIdReply << std::endl;
-
-	printIndent(out, int_Indent);
-
-	out << "Attachment: " << std::endl;
-	attachment.print(out, int_Indent);
 
         printRsItemEnd(out, "RsBlogMsg", indent);
         return out;
@@ -85,14 +89,20 @@ uint32_t    RsBlogSerialiser::sizeMsg(RsBlogMsg *item)
 	uint32_t s = 8; /* header */
 	/* RsDistribMsg stuff */
 	s += GetTlvStringSize(item->grpId);
+	s += GetTlvStringSize(item->parentId);
+	s += GetTlvStringSize(item->threadId);
 	s += 4; /* timestamp */
 
-	/* RsChannelMsg stuff */
+	/* RsBlogMsg stuff */
 	s += GetTlvWideStringSize(item->subject);
 	s += GetTlvWideStringSize(item->message);
-	s += GetTlvStringSize(item->mIdReply);
 
-	s += item->attachment.TlvSize();
+	std::list<RsTlvImage >::iterator it = item->graphic_set.begin();
+
+	for(; it != item->graphic_set.end(); it++)
+	{
+		s += it->TlvSize();
+	}
 
 	return s;
 }
@@ -112,34 +122,42 @@ bool     RsBlogSerialiser::serialiseMsg(RsBlogMsg *item, void *data, uint32_t *p
 
 	ok &= setRsItemHeader(data, tlvsize, item->PacketId(), tlvsize);
 
-	std::cerr << "RsChannelSerialiser::serialiseMsg() Header: " << ok << std::endl;
+	std::cerr << "RsBlogSerialiser::serialiseMsg() Header: " << ok << std::endl;
-	std::cerr << "RsChannelSerialiser::serialiseMsg() Size: " << tlvsize << std::endl;
+	std::cerr << "RsBlogSerialiser::serialiseMsg() Size: " << tlvsize << std::endl;
 
 	/* skip the header */
 	offset += 8;
 
 	/* RsDistribMsg first */
 	ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_GROUPID, item->grpId);
-	std::cerr << "RsChannelSerialiser::serialiseMsg() grpId: " << ok << std::endl;
+	std::cerr << "RsBlogSerialiser::serialiseMsg() grpId: " << ok << std::endl;
+
+	ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_PARENTID, item->parentId);
+	std::cerr << "RsBlogSerialiser::serialiseMsg() parentId: " << ok << std::endl;
+
+	ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_THREADID, item->threadId);
+	std::cerr << "RsBlogSerialiser::serialiseMsg() threadpId: " << ok << std::endl;
 
 	ok &= setRawUInt32(data, tlvsize, &offset, item->timestamp);
-	std::cerr << "RsChannelSerialiser::serialiseMsg() timestamp: " << ok << std::endl;
+	std::cerr << "RsBlogSerialiser::serialiseMsg() timestamp: " << ok << std::endl;
 
 	/* RsBlogMsg */
 	ok &= SetTlvWideString(data, tlvsize, &offset, TLV_TYPE_WSTR_SUBJECT, item->subject);
 	std::cerr << "RsBlogSerialiser::serialiseMsg() subject: " << ok << std::endl;
 	ok &= SetTlvWideString(data, tlvsize, &offset, TLV_TYPE_WSTR_MSG, item->message);
 	std::cerr << "RsBlogSerialiser::serialiseMsg() msg: " << ok << std::endl;
-	ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_MSG, item->mIdReply);
-	std::cerr << "RsBlogSerialiser::serialiseMsg() mIdReply: " << ok << std::endl;
 
-	ok &= item->attachment.SetTlv(data, tlvsize, &offset);
+	std::list<RsTlvImage >::iterator it = item->graphic_set.begin();
-	std::cerr << "RsChannelSerialiser::serialiseMsg() Attachment: " << ok << std::endl;
+
+	for(; it != item->graphic_set.end(); it++)
+	{
+		ok &= it->SetTlv(data, tlvsize, &offset);
+	}
 
 	if (offset != tlvsize)
 	{
 		ok = false;
-		std::cerr << "RsChannelSerialiser::serialiseMsg() Size Error! " << std::endl;
+		std::cerr << "RsBlogSerialiser::serialiseMsg() Size Error! " << std::endl;
 	}
 
 	return ok;
@@ -180,15 +198,24 @@ RsBlogMsg *RsBlogSerialiser::deserialiseMsg(void *data, uint32_t *pktsize)
 
 	/* RsDistribMsg first */
 	ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_GROUPID, item->grpId);
+	ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_PARENTID, item->parentId);
+	ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_THREADID, item->threadId);
 	ok &= getRawUInt32(data, rssize, &offset, &(item->timestamp));
 
 	/* RsBlogMsg */
 
 	ok &= GetTlvWideString(data, rssize, &offset, TLV_TYPE_WSTR_SUBJECT, item->subject);
 	ok &= GetTlvWideString(data, rssize, &offset, TLV_TYPE_WSTR_MSG, item->message);
-	ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_MSG, item->mIdReply);
 
-    ok &= item->attachment.GetTlv(data, rssize, &offset);
+	RsTlvImage image;
+	image.TlvClear();
+
+	while(offset != rssize)
+	{
+		image.GetTlv(data, rssize, &offset);
+		item->graphic_set.push_back(image);
+		image.TlvClear();
+	}
 
 	if (offset != rssize)
 	{

libretroshare/src/serialiser/rsblogitems.h

@@ -54,13 +54,11 @@ virtual std::ostream& print(std::ostream &out, uint16_t indent = 0);
 	 * grpId, timestamp.
 	 * Not Used: parentId, threadId 
 	 */
-
 	std::wstring subject;
     std::wstring message;
-        /// message id to which the reply applies to
-        std::string mIdReply;
 
-        RsTlvFileSet attachment;
+    /// for adding images to graphics
+    std::list<RsTlvImage > graphic_set;
 
 };
 
@@ -68,7 +66,7 @@ class RsBlogSerialiser: public RsSerialType
 {
 	public:
 	RsBlogSerialiser()
-	:RsSerialType(RS_PKT_VERSION_SERVICE, RS_SERVICE_TYPE_CHANNEL)
+	:RsSerialType(RS_PKT_VERSION_SERVICE, RS_SERVICE_TYPE_QBLOG)
 	{ return; }
 virtual     ~RsBlogSerialiser()
 	{ return; }

libretroshare/src/serialiser/rsforumitems.cc

@@ -250,18 +250,18 @@ uint32_t    RsForumSerialiser::sizeReadStatus(RsForumReadStatus *item)
 	uint32_t s = 8; /* header */
 	/* RsDistribChildConfig stuff */
 
-	s += GetTlvUInt32Size(); /* save_type */
+	s += 4; /* save_type */
 
 	/* RsForumReadStatus stuff */
 
-	GetTlvStringSize(item->forumId);
+	s += GetTlvStringSize(item->forumId);
 
 	std::map<std::string, uint32_t>::iterator mit = item->msgReadStatus.begin();
 
 	for(; mit != item->msgReadStatus.end(); mit++)
 	{
-		GetTlvStringSize(mit->first); /* key */
+		s += GetTlvStringSize(mit->first); /* key */
-		s += GetTlvUInt32Size(); /* value */
+		s += 4; /* value */
 	}
 
 	return s;

libretroshare/src/serialiser/rsforumitems.h

@@ -74,6 +74,8 @@ public:
 	: RsDistribChildConfig(RS_SERVICE_TYPE_FORUM, RS_PKT_SUBTYPE_FORUM_READ_STATUS)
 	{ return; }
 
+	virtual ~RsForumReadStatus() {return; }
+
 	virtual void clear();
 	virtual std::ostream& print(std::ostream &out, uint16_t indent);
 

libretroshare/src/serialiser/rstlvimage.cc

@@ -192,3 +192,9 @@ std::ostream &RsTlvImage::print(std::ostream &out, uint16_t indent)
 
 }
 
+RsTlvImage::RsTlvImage(const RsTlvImage& rightOp)
+:RsTlvItem(), image_type(0), binData(TLV_TYPE_BIN_IMAGE)
+{
+	this->image_type = rightOp.image_type;
+	this->binData.setBinData(rightOp.binData.bin_data, rightOp.binData.bin_len);
+}

libretroshare/src/serialiser/rstlvtypes.h

@@ -241,11 +241,13 @@ class RsTlvImage: public RsTlvItem
 {
 	public:
 	 RsTlvImage(); 
+	 RsTlvImage(const RsTlvImage& );
 	 virtual ~RsTlvImage() { return; }
 virtual uint32_t TlvSize();
 virtual void	 TlvClear();
 virtual bool     SetTlv(void *data, uint32_t size, uint32_t *offset); /* serialise   */
 virtual bool     GetTlv(void *data, uint32_t size, uint32_t *offset); /* deserialise */
+
 virtual std::ostream &print(std::ostream &out, uint16_t indent);
 
 	uint32_t        image_type;   // Mandatory: 

libretroshare/src/tests/serialiser/distribitem_test.cc

@@ -241,6 +241,15 @@ bool operator==(const RsDistribSignedMsg& sMsg1,const  RsDistribSignedMsg& sMsg2
 	return true;
 }
 
+bool operator==(const RsTlvImage& img1, const RsTlvImage& img2)
+{
+	if(img1.image_type != img2.image_type) return false;
+	if(!(img1.binData == img2.binData)) return false;
+
+	return true;
+
+}
+
 /** channels, forums and blogs **/
 
 void init_item(RsTlvHashSet& hs)
@@ -401,13 +410,87 @@ bool operator==(const RsForumMsg& fMsg1, const RsForumMsg& fMsg2)
 
 RsSerialType* init_item(RsBlogMsg& bMsg)
 {
+	bMsg.timestamp = rand()%223;
+	randString(SHORT_STR, bMsg.grpId);
+	randString(LARGE_STR, bMsg.message);
+	randString(SHORT_STR, bMsg.subject);
+	randString(SHORT_STR, bMsg.parentId);
+	randString(SHORT_STR, bMsg.threadId);
+	RsTlvImage image;
+	int nImages = rand()%5;
+
+	for(int i=0; i < nImages; i++)
+	{
+		init_item(image);
+		bMsg.graphic_set.push_back(image);
+	}
 
 	return new RsBlogSerialiser();
 }
 
-bool operator==(RsBlogMsg& bMsg1, RsBlogMsg& bMsg2)
+RsSerialType* init_item(RsForumReadStatus& fRdStatus)
+{
+	randString(SHORT_STR, fRdStatus.forumId);
+	fRdStatus.save_type = rand()%42;
+
+	std::map<std::string, uint32_t>::iterator mit = fRdStatus.msgReadStatus.begin();
+
+	std::string id;
+	uint32_t status = 0;
+
+	int numMaps = rand()%12;
+
+	for(int i = 0; i < numMaps; i++)
+	{
+		randString(SHORT_STR, id);
+		status = rand()%23;
+
+		fRdStatus.msgReadStatus.insert(std::pair<std::string, uint32_t>(id, status));
+	}
+
+	return new RsForumSerialiser();
+}
+
+bool operator==(const RsForumReadStatus& frs1, const RsForumReadStatus& frs2)
+{
+	if(frs1.forumId != frs2.forumId) return false;
+	if(frs1.save_type != frs2.save_type) return false;
+
+	if(frs1.msgReadStatus.size() != frs2.msgReadStatus.size()) return false;
+
+	std::map<std::string, uint32_t>::const_iterator mit
+		= frs1.msgReadStatus.begin();
+
+
+
+	for(;mit != frs1.msgReadStatus.end(); mit++)
+	{
+		if(mit->second != frs2.msgReadStatus.find(mit->first)->second) return false;
+	}
+
+	return true;
+
+}
+
+bool operator==(const RsBlogMsg& bMsg1,const RsBlogMsg& bMsg2)
 {
 
+	if(bMsg1.timestamp != bMsg2.timestamp) return false;
+	if(bMsg1.grpId != bMsg2.grpId) return false;
+	if(bMsg1.message != bMsg2.message) return false;
+	if(bMsg1.subject != bMsg2.subject) return false;
+	if(bMsg1.threadId != bMsg2.threadId) return false;
+	if(bMsg1.parentId != bMsg2.parentId) return false;
+
+	std::list<RsTlvImage >::const_iterator it1 = bMsg1.graphic_set.begin(),
+			it2 = bMsg2.graphic_set.begin();
+
+	if(bMsg1.graphic_set.size() != bMsg2.graphic_set.size()) return false;
+
+	for(; it1 != bMsg1.graphic_set.end() ; it1++, it2++)
+	{
+		if(!(*it1 == *it2)) return false;
+	}
 
 	return true;
 }
@@ -489,8 +572,8 @@ int main(){
 	test_RsDistribItem<RsDistribSignedMsg>(); REPORT("Serialise/Deserialise RsDistribSignedMsg");
 	test_RsDistribItem<RsChannelMsg>(); REPORT("Serialise/Deserialise RsChannelMsg");
 	test_RsDistribItem<RsForumMsg>(); REPORT("Serialise/Deserialise RsForumMsg");
-	//test_RsDistribItem<RsForumReadStatus>(); REPORT("Serialise/Deserialise RsForumReadStatus");
+	test_RsDistribItem<RsForumReadStatus>(); REPORT("Serialise/Deserialise RsForumReadStatus");
-	//test_RsDistribItem<RsBlogMsg>(); REPORT("Serialise/Deserialise RsBlogMsg");
+	test_RsDistribItem<RsBlogMsg>(); REPORT("Serialise/Deserialise RsBlogMsg");
 
 
 	FINALREPORT("RsDistribItem Tests");

libretroshare/src/tests/serialiser/distribitem_test.h

@@ -64,6 +64,7 @@ bool operator==(const RsTlvBinaryData&, const RsTlvBinaryData&);
 bool operator==(const RsTlvFileItem&, const RsTlvFileItem&);
 bool operator==(const RsTlvFileSet&, const RsTlvFileSet& );
 bool operator==(const RsTlvHashSet&, const RsTlvHashSet&);
+bool operator==(const RsTlvImage&, const RsTlvImage& );