Swiftdiff options
6 files changed, 28 insertions, 0 deletions
diff --git a/Sluift/ElementConvertors/ResultSetConvertor.cpp b/Sluift/ElementConvertors/ResultSetConvertor.cpp index bd517b3..f5df2bd 100644 --- a/Sluift/ElementConvertors/ResultSetConvertor.cpp +++ b/Sluift/ElementConvertors/ResultSetConvertor.cpp @@ -30,12 +30,17 @@ boost::shared_ptr<ResultSet> ResultSetConvertor::doConvertFromLua(lua_State* L) lua_pop(L, 1); lua_getfield(L, -1, "count"); if (lua_isnumber(L, -1)) { result->setCount(boost::numeric_cast<int>(lua_tonumber(L, -1))); } lua_pop(L, 1); + lua_getfield(L, -1, "index"); + if (lua_isnumber(L, -1)) { + result->setIndex(boost::numeric_cast<int>(lua_tonumber(L, -1))); + } + lua_pop(L, 1); lua_getfield(L, -1, "first_id_index"); if (lua_isstring(L, -1)) { result->setFirstIDIndex(boost::numeric_cast<int>(lua_tonumber(L, -1))); } lua_pop(L, 1); lua_getfield(L, -1, "first_id"); @@ -68,12 +73,16 @@ void ResultSetConvertor::doConvertToLua(lua_State* L, boost::shared_ptr<ResultSe lua_setfield(L, -2, "max_items"); } if (payload->getCount()) { lua_pushnumber(L, *payload->getCount()); lua_setfield(L, -2, "count"); } + if (payload->getIndex()) { + lua_pushnumber(L, *payload->getIndex()); + lua_setfield(L, -2, "index"); + } if (payload->getFirstIDIndex()) { lua_pushnumber(L, *payload->getFirstIDIndex()); lua_setfield(L, -2, "first_id_index"); } if (payload->getFirstID()) { lua_pushstring(L, (*payload->getFirstID()).c_str()); diff --git a/Swiften/Elements/ResultSet.h b/Swiften/Elements/ResultSet.h index e84be35..b7c5574 100644 --- a/Swiften/Elements/ResultSet.h +++ b/Swiften/Elements/ResultSet.h @@ -18,12 +18,15 @@ namespace Swift { void setMaxItems(const boost::optional<int>& maxItems) { maxItems_ = maxItems; } const boost::optional<int>& getMaxItems() const { return maxItems_; } void setCount(const boost::optional<int>& count) { count_ = count; } const boost::optional<int>& getCount() const { return count_; } + void setIndex(const boost::optional<int>& index) { index_ = index; } + const boost::optional<int>& getIndex() const { return index_; } + void setFirstIDIndex(const boost::optional<int>& firstIndex) { firstIndex_ = firstIndex; } const boost::optional<int>& getFirstIDIndex() const { return firstIndex_; } void setFirstID(const boost::optional<std::string>& firstID) { firstID_ = firstID; } const boost::optional<std::string>& getFirstID() const { return firstID_; } @@ -33,15 +36,17 @@ namespace Swift { void setBefore(const boost::optional<std::string>& before) { before_ = before; } const boost::optional<std::string>& getBefore() const { return before_; } void setAfter(const boost::optional<std::string>& after) { after_ = after; } const boost::optional<std::string>& getAfter() const { return after_; } + private: boost::optional<int> maxItems_; boost::optional<int> count_; + boost::optional<int> index_; boost::optional<int> firstIndex_; boost::optional<std::string> firstID_; boost::optional<std::string> lastID_; boost::optional<std::string> before_; boost::optional<std::string> after_; }; diff --git a/Swiften/Parser/PayloadParsers/ResultSetParser.cpp b/Swiften/Parser/PayloadParsers/ResultSetParser.cpp index 4c8283b..4829f98 100644 --- a/Swiften/Parser/PayloadParsers/ResultSetParser.cpp +++ b/Swiften/Parser/PayloadParsers/ResultSetParser.cpp @@ -40,12 +40,17 @@ void ResultSetParser::handleEndElement(const std::string& element, const std::st } } else if (element == "count") { try { getPayloadInternal()->setCount(boost::lexical_cast<int>(currentText_)); } catch(boost::bad_lexical_cast&) { } + } else if (element == "index") { + try { + getPayloadInternal()->setIndex(boost::lexical_cast<int>(currentText_)); + } catch(boost::bad_lexical_cast&) { + } } else if (element == "first") { getPayloadInternal()->setFirstID(currentText_); } else if (element == "last") { getPayloadInternal()->setLastID(currentText_); } else if (element == "before") { getPayloadInternal()->setBefore(currentText_); diff --git a/Swiften/Parser/PayloadParsers/UnitTest/ResultSetParserTest.cpp b/Swiften/Parser/PayloadParsers/UnitTest/ResultSetParserTest.cpp index e345323..17d9eb2 100644 --- a/Swiften/Parser/PayloadParsers/UnitTest/ResultSetParserTest.cpp +++ b/Swiften/Parser/PayloadParsers/UnitTest/ResultSetParserTest.cpp @@ -23,24 +23,27 @@ class ResultSetParserTest : public CppUnit::TestFixture void testParse() { PayloadsParserTester parser; CPPUNIT_ASSERT(parser.parse( "<set xmlns=\"http://jabber.org/protocol/rsm\">" "<max>100</max>" "<count>800</count>" + "<index>0</index>" "<first index=\"123\">stpeter@jabber.org</first>" "<last>peterpan@neverland.lit</last>" "<before>decaf-badba-dbad1</before>" "<after>09af3-cc343-b409f</after>" "</set>")); boost::shared_ptr<ResultSet> payload = parser.getPayload<ResultSet>(); CPPUNIT_ASSERT(!!payload); CPPUNIT_ASSERT(payload->getMaxItems()); CPPUNIT_ASSERT_EQUAL(100, *payload->getMaxItems()); CPPUNIT_ASSERT(payload->getCount()); CPPUNIT_ASSERT_EQUAL(800, *payload->getCount()); + CPPUNIT_ASSERT(payload->getIndex()); + CPPUNIT_ASSERT_EQUAL(0, *payload->getIndex()); CPPUNIT_ASSERT(payload->getFirstID()); CPPUNIT_ASSERT_EQUAL(std::string("stpeter@jabber.org"), *payload->getFirstID()); CPPUNIT_ASSERT(payload->getFirstIDIndex()); CPPUNIT_ASSERT_EQUAL(123, *payload->getFirstIDIndex()); CPPUNIT_ASSERT(payload->getLastID()); CPPUNIT_ASSERT_EQUAL(std::string("peterpan@neverland.lit"), *payload->getLastID()); diff --git a/Swiften/Serializer/PayloadSerializers/ResultSetSerializer.cpp b/Swiften/Serializer/PayloadSerializers/ResultSetSerializer.cpp index 0f464a4..263c7de 100644 --- a/Swiften/Serializer/PayloadSerializers/ResultSetSerializer.cpp +++ b/Swiften/Serializer/PayloadSerializers/ResultSetSerializer.cpp @@ -30,12 +30,16 @@ std::string ResultSetSerializer::serializePayload(boost::shared_ptr<ResultSet> p } if (payload->getCount()) { element.addNode(boost::make_shared<XMLElement>("count", "", boost::lexical_cast<std::string>(*payload->getCount()))); } + if (payload->getIndex()) { + element.addNode(boost::make_shared<XMLElement>("index", "", boost::lexical_cast<std::string>(*payload->getIndex()))); + } + if (payload->getFirstID()) { boost::shared_ptr<XMLElement> firstElement = boost::make_shared<XMLElement>("first", "", *payload->getFirstID()); if (payload->getFirstIDIndex()) { firstElement->setAttribute("index", boost::lexical_cast<std::string>(*payload->getFirstIDIndex())); } element.addNode(firstElement); diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/ResultSetSerializerTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/ResultSetSerializerTest.cpp index 354db85..7431fcd 100644 --- a/Swiften/Serializer/PayloadSerializers/UnitTest/ResultSetSerializerTest.cpp +++ b/Swiften/Serializer/PayloadSerializers/UnitTest/ResultSetSerializerTest.cpp @@ -29,22 +29,24 @@ class ResultSetSerializerTest : public CppUnit::TestFixture { ResultSetSerializer serializer; boost::shared_ptr<ResultSet> resultSet(boost::make_shared<ResultSet>()); resultSet->setMaxItems(100); resultSet->setCount(800); + resultSet->setIndex(0); resultSet->setFirstIDIndex(123); resultSet->setFirstID(std::string("stpeter@jabber.org")); resultSet->setLastID(std::string("peterpan@neverland.lit")); resultSet->setAfter(std::string("09af3-cc343-b409f")); resultSet->setBefore(std::string("decaf-badba-dbad1")); std::string expectedResult = "<set xmlns=\"http://jabber.org/protocol/rsm\">" "<max>100</max>" "<count>800</count>" + "<index>0</index>" "<first index=\"123\">stpeter@jabber.org</first>" "<last>peterpan@neverland.lit</last>" "<before>decaf-badba-dbad1</before>" "<after>09af3-cc343-b409f</after>" "</set>"; |