Author: dmacvicar Date: Wed Jul 18 16:42:58 2007 New Revision: 6072 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6072&view=rev Log: Fix reading container attributes from the cache Modified: trunk/libzypp/tests/cache/CacheStore_test.cc trunk/libzypp/tests/repo/susetags/data/stable-x86-subset/content trunk/libzypp/tests/repo/susetags/data/stable-x86-subset/content.asc trunk/libzypp/zypp/Url.cc trunk/libzypp/zypp/Url.h trunk/libzypp/zypp/cache/ResolvableQuery.h Modified: trunk/libzypp/tests/cache/CacheStore_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/cache/CacheStore_test.cc?rev=6072&r1=6071&r2=6072&view=diff ============================================================================== --- trunk/libzypp/tests/cache/CacheStore_test.cc (original) +++ trunk/libzypp/tests/cache/CacheStore_test.cc Wed Jul 18 16:42:58 2007 @@ -112,6 +112,32 @@ BOOST_CHECK_EQUAL( p->distributionName(), "SuSE-Linux-STABLE-X86" ); BOOST_CHECK_EQUAL( p->distributionEdition(), Edition("10.2.42-factory") ); BOOST_CHECK_EQUAL( p->summary(), "openSUSE FACTORY 10.3" ); + + list<Url>::const_iterator it; + list<Url> urls; + + BOOST_CHECK_EQUAL( urls.size(), 0 ); + + urls = p->extraUrls(); + it = find( urls.begin(), urls.end(), Url("http://download.opensuse.org/distribution/10.2/repo/oss/")); + BOOST_CHECK_EQUAL( p->extraUrls().size(), 1 ); + BOOST_CHECK( it != urls.end() ); + + urls = p->optionalUrls(); + BOOST_CHECK_EQUAL( urls.size(), 2 ); + + it = find( urls.begin(), urls.end(), Url("http://download.opensuse.org/distribution/10.2/repo/non-oss/")); + BOOST_CHECK( it != urls.end() ); + it = find( urls.begin(), urls.end(), Url("http://download.opensuse.org/distribution/10.2/repo/debug/")); + BOOST_CHECK( it != urls.end() ); + + for ( it = urls.begin(); + it != urls.end(); + ++it ) + { + MIL << *it << endl; + } + // BOOST_CHECK_EQUAL( p->description().substr(0, 16), "NO DESC?"); // BOOST_CHECK_EQUAL( p->category(), "Graphical Environments"); // BOOST_CHECK_EQUAL( p->userVisible(), true); Modified: trunk/libzypp/tests/repo/susetags/data/stable-x86-subset/content URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/repo/susetags/data/stable-x86-subset/content?rev=6072&r1=6071&r2=6072&view=diff ============================================================================== --- trunk/libzypp/tests/repo/susetags/data/stable-x86-subset/content (original) +++ trunk/libzypp/tests/repo/susetags/data/stable-x86-subset/content Wed Jul 18 16:42:58 2007 @@ -17,6 +17,8 @@ SHORTLABEL FACTORY LABEL openSUSE FACTORY 10.3 LABEL.de openSUSE FACTORY 10.3 +EXTRAURLS http://download.opensuse.org/distribution/10.2/repo/oss/ +OPTIONALURLS http://download.opensuse.org/distribution/10.2/repo/non-oss/ http://download.opensuse.org/distribution/10.2/repo/debug/ DESCRDIR suse/setup/descr DATADIR suse FLAGS update Modified: trunk/libzypp/tests/repo/susetags/data/stable-x86-subset/content.asc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/repo/susetags/data/stable-x86-subset/content.asc?rev=6072&r1=6071&r2=6072&view=diff ============================================================================== --- trunk/libzypp/tests/repo/susetags/data/stable-x86-subset/content.asc (original) +++ trunk/libzypp/tests/repo/susetags/data/stable-x86-subset/content.asc Wed Jul 18 16:42:58 2007 @@ -1,27 +1,29 @@ -----BEGIN PGP MESSAGE----- Version: GnuPG v1.4.6 (GNU/Linux) -owGFVb1vW1UUD41opScxFEaW+wfU9v3+iIrQS+w4FsYufnZoBhTdzyQk/qjfM0k6 -IgbEVLGA1AEkVhAd6MjC1pEJBmBgQ2Jkh/vsmNotqJJ1n3zP+f3OOb/f0XsPXtnc -uHbz4Z8/PP71kdh/6ZvrD8wNOx4VflTsfnbvyZ1etz7Y6YPxxI+yQdaoBG2L8fQy -2W/0sla3AxCskqTeyvrLzGwWs9ono9lFJeun2+1G5a7k84wVCK5SvELVqXd7oKQH -7VZncBfcmY7dzBY5aA7N3i3QmfnpyPjp0S3Q9NOhHl0mvUa70+03skGvDY6LYrJV -q52fn1fzWe6rdjysTf3ZaFz4vHZCJK8tu6/tpjv9bu+gDHud+8o8pzqdDJO0t7NX -vZD8kFNw9TjhkoMTVh60PCITGI311B4vshfxFyWxF8Tp/4fIM7f1xm46aPe30yhU -SRlVeGfQ6jWyp/ZcDQbemBsDJrooonZbJt7ll3nhh0n0ab9Vj5jJQuStJXaBKZ1J -uttZt93orySVCYcLc57D3V4AkxhuDtIM2Bw4DZwHfhR/h81t4HMQTkCYguMZOCnA -+xqcDsHoDIwMmJyBSXG43QP3jw93OuXZfzfJ9rq9fjvdbrTBlWPJ4t+/Na+uF+s3 -j1Vjwf8Ox2F3evVWD5TbUct9MZvUnM/tNKmn/XQZSHbbaTMDs4nThY+U5SzNRjnA -IEvebvRTkO2lCFgiAjWaYsw4g5JSwolASCBoicRUM2kVRM4BcOp8paxfEWi+BdVo -xgqRhEEZg4LyinljvQlOGYwDITIIoTyG1DoGDYgm2lN95PMVsLKEIqcIwnFzYIDE -QIi4RAwRq6Ew1EGrpSBPwdX6YAWvqQyaQaGDtbG24IZRFYFEUV8SS0Q8NxCt4P1o -BS84UxAGVtaLiYEqHnuF3LgQKAsSMs+RUmIVv9p/MIZr7LgSPApqlebGG4atJiwI -pqj2xIeAPFhucJ681Ti4cgASRiFXFkGJFBfUxUkhlxh75KiJkyOhhFcAHE2OKpOZ -OfWXFeiCIUjKCkXeKaxMVef2KSf2RHoGiY12WuYgxMZZggRjVuIIg5Q65TBa4yRQ -eOIYrVCKo+XMrXMKiJki2McXBI/PQKWiOIoCoWCBeBfNg5h4vc7pMHPEqQrhHmEH -6TpncBxRbrWVFlFBLIuisUhMuPNCxGaMcYwjuMYpfBzPQBb7FFRqo9c5rRPaxf3T -KHjmhNFYGCaoEkgKSpDCTuLoKF7jVFZCqK2uUOgk5MQ/MzsjkUp5gnyI24ijDCyK -YQxVTiGKlZAGx8Vf49RIIYxh9IhyDaVSc87k4zc3X94ov0XLj9TNawefb3zx3gff -vpoWf8ifPvr+3qd/71188suXH248vP548z76+rvXf//50Y+v/Xb7xl9nXz35Bw== -=iYSm +owGdVTuIJFUUHXeVhYJFNhAMn2AguN39/p9F0Zrpmg+202tX9TgbDe9XM+3MVDVd +1cyOGhhqIGhiogxGBoogiGwqJoJgbqBmZgaCiaGvuqfd7lVZWGhe0XXvOe/dc05V +fXD96tqVGx///t03v3wl9h778tq+uWbLovZFvXnxVHx70O8ONzJQjn2RDtOklWtb +l5PzaC8ZpDv9XYBgm0TdnTRbdKbT0NUbFdO7rTSL13tJa1/yWccSBLcpXqLa7fYH +oKEHvZ3d4T64PSnd1NYV2Do12zfB7tRPCuMnhzfBlp+c6uI8GiS93X6WpMNBDxzV +9fhWp3N2dtauppVv2/K0M/EnRVn7qjMikncWp+9sxhtZf3CnKXtd+daspz0Zn0bx +YGO7fVfyA07B5WXEJQcj1iy0WQITKEo9sUfz7nn9YU3sIXX6/yXywN1ushkPe9l6 +HIRqKIMKrw13Bkl6357LwcCLM2PAWNd10O6WCfeq86r2p1HwaW+nGzDjuci3Ftg5 +pnEm6q+n/V6SLTU1DQdzc/6Fe2EOjEJ5axinwFbAaeA88EX4HWytA1+BfATyCTia +glEN3tDg+BQUJ6AwYHwCxvXB+gC8eXSwsdus2etRut0fZL14PemBS8ei+b9/9ry8 +PY/frNYOG/53OdnPBnEISrpIiivPipNSu3bTP4tMOTnsuFFVT0ZmWo/KotMMFFIy +LjtlVXWi/u0sJDfuPTJLURathumRwM6b6WEn2J9uDLo7A9D0dypfT8ehVNlJ1I2z +eFGINnvxVgqmY6drH6RpPNlKGiOGafRqksUg3Y4RsETk1GiKMeMMSkoJJwIhgaAl +ElPNpFUQOQfAsfOtRseWQLM0t0OologkzJUxKFdeMW+sN7lTBuOcEJkLoTyG1DoG +DQhhtMf60FdLYGUJRU4RhMMTAHNIDISIS8QQsRoKQx20WgpyH9zuDpfwmspcMyh0 +bm3YW3DDqApAoqhviCUinhuIlvC+WMILzhSEOWv2C405VTycFXLj8pyyXELmOVJK +LOOXz58bwzV2XAkeBLVKc+MNw1YTlgumqPbE5znyYPEkVtEryZ1LByBhFHJlEZRI +cUFdmBRyibFHjpowORJKeAXA4fiwNZ6aY3/egi43BEnZosg7hZVp68re58SeSM8g +scFOyxyE2DhLkGDMShxgkFKnHEYrnAQKTxyjLUpxsJy5VU4BMVME+/Ci4+GaU6ko +DqJAKFhOvAvmQUy8XuV0mDniVItwj7CDdJUzdxxRbrWVFlFBLAuisUBMuPNChMMY +4xhHcIVT+DCegSycU1CpjV7ltE5oF/KnUe6ZE0ZjYZigSiApKEEKO4mDo3iFU1kJ +oba6RaGTkBP/wOyMBCrlCfJ5SCMOMrAghjFUOYUoVkIaHIK/wqmRQhjD4BHlGkql +ZpzRuy9dfWKt+aYuPrY3rqT31i6ezd52X3z0w/H3z3327c8/vfPbry//9cfaxTPJ +54/fe/7sz/feuv70h+//+PWTn3x6528= +=KMVc -----END PGP MESSAGE----- Modified: trunk/libzypp/zypp/Url.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Url.cc?rev=6072&r1=6071&r2=6072&view=diff ============================================================================== --- trunk/libzypp/zypp/Url.cc (original) +++ trunk/libzypp/zypp/Url.cc Wed Jul 18 16:42:58 2007 @@ -788,6 +788,11 @@ return (lhs.asString() < rhs.asString()); } + bool operator==( const Url &lhs, const Url &rhs ) + { + return (lhs.asString() == rhs.asString()); + } + //////////////////////////////////////////////////////////////////// } // namespace zypp ////////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/Url.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Url.h?rev=6072&r1=6071&r2=6072&view=diff ============================================================================== --- trunk/libzypp/zypp/Url.h (original) +++ trunk/libzypp/zypp/Url.h Wed Jul 18 16:42:58 2007 @@ -777,6 +777,11 @@ */ bool operator<( const Url &lhs, const Url &rhs ); + /** + * needed for find + */ + bool operator==( const Url &lhs, const Url &rhs ); + //////////////////////////////////////////////////////////////////// } // namespace zypp ////////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/cache/ResolvableQuery.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/cache/ResolvableQuery.h?rev=6072&r1=6071&r2=6072&view=diff ============================================================================== --- trunk/libzypp/zypp/cache/ResolvableQuery.h (original) +++ trunk/libzypp/zypp/cache/ResolvableQuery.h Wed Jul 18 16:42:58 2007 @@ -9,6 +9,7 @@ #include "zypp/data/ResolvableData.h" #include "zypp/data/RecordId.h" #include "zypp/cache/Attribute.h" +#include "zypp/ZConfig.h" /////////////////////////////////////////////////////////////////// namespace zypp @@ -183,7 +184,7 @@ std::string all = queryStringAttribute( record_id, klass, name); //FIXME use zypp separator - str::split( all, result ); + str::split( all, result, ZConfig().cacheDBSplitJoinSeparator() ); } /** \overload */ template<class _OutputIterator> -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org