[zypp-commit] r9328 - in /trunk/libzypp: package/libzypp.changes zypp/sat/Solvable.cc zypp/sat/Solvable.h zypp/sat/WhatProvides.cc zypp/sat/WhatProvides.h zypp/sat/detail/PoolImpl.cc zypp/sat/detail/PoolMember.h

Author: mlandres Date: Tue Apr 1 22:03:24 2008 New Revision: 9328 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9328&view=rev Log: - Extend sat::WhatProvides to allow to query for possible providers of a collection of capabilies. E.g. all providers of a packages requirements. - Fixed retrieval of translated texts from .solv files, provided the solv file contains them. Modified: trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/sat/Solvable.cc trunk/libzypp/zypp/sat/Solvable.h trunk/libzypp/zypp/sat/WhatProvides.cc trunk/libzypp/zypp/sat/WhatProvides.h trunk/libzypp/zypp/sat/detail/PoolImpl.cc trunk/libzypp/zypp/sat/detail/PoolMember.h Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=9328&r1=9327&r2=9328&view=diff ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Tue Apr 1 22:03:24 2008 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Tue Apr 1 21:54:10 CEST 2008 - ma@suse.de + +- Extend sat::WhatProvides to allow to query for possible providers + of a collection of capabilies. E.g. all providers of a packages + requirements. +- Fixed retrieval of translated texts from .solv files, provided the + solv file contains them. +- revision 9328 + +------------------------------------------------------------------- Tue Apr 1 16:17:44 CEST 2008 - jreidinger@suse.cz - initial implementation of serialize/recovery PoolQuery Modified: trunk/libzypp/zypp/sat/Solvable.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/Solvable.cc?rev=9328&r1=9327&r2=9328&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/Solvable.cc (original) +++ trunk/libzypp/zypp/sat/Solvable.cc Tue Apr 1 22:03:24 2008 @@ -30,7 +30,7 @@ namespace sat { ///////////////////////////////////////////////////////////////// - const Solvable Solvable::nosolvable; + const Solvable Solvable::noSolvable; ///////////////////////////////////////////////////////////////// @@ -46,7 +46,7 @@ Solvable Solvable::nextInRepo() const { - NO_SOLVABLE_RETURN( nosolvable ); + NO_SOLVABLE_RETURN( noSolvable ); for ( detail::SolvableIdType next = _id+1; next < unsigned(_solvable->repo->end); ++next ) { ::_Solvable * nextS( myPool().getSolvable( next ) ); @@ -55,7 +55,7 @@ return Solvable( next ); } } - return nosolvable; + return noSolvable; } Repository Solvable::repository() const @@ -65,7 +65,10 @@ } bool Solvable::isSystem() const - { return repository().isSystemRepo(); } + { + NO_SOLVABLE_RETURN( _id == detail::systemSolvableId ); + return Repository( _solvable->repo ).isSystemRepo(); + } IdString Solvable::ident() const { @@ -76,26 +79,35 @@ std::string Solvable::lookupStrAttribute( const SolvAttr & attr ) const { NO_SOLVABLE_RETURN( std::string() ); - const char *s = ::repo_lookup_str( _solvable, attr.idStr().id() ); - return s ? s : std::string(); + const char * s = ::solvable_lookup_str( _solvable, attr.idStr().id() ); + return s ? s : std::string(); } std::string Solvable::lookupStrAttribute( const SolvAttr & attr, const Locale & lang_r ) const { -#warning FIX RETRIEVIENG TRANSLATIONS - return lookupStrAttribute( attr ); + NO_SOLVABLE_RETURN( std::string() ); + const char * s = 0; + if ( lang_r == Locale::noCode ) + { + s = ::solvable_lookup_str_poollang( _solvable, attr.idStr().id() ); + } + else + { + s = ::solvable_lookup_str_lang( _solvable, attr.idStr().id(), lang_r.code().c_str() ); + } + return s ? s : std::string(); } unsigned Solvable::lookupNumAttribute( const SolvAttr & attr ) const { NO_SOLVABLE_RETURN( 0 ); - return ::repo_lookup_num( _solvable, attr.idStr().id() ); + return ::solvable_lookup_num( _solvable, attr.idStr().id(), 0 ); } bool Solvable::lookupBoolAttribute( const SolvAttr & attr ) const { NO_SOLVABLE_RETURN( false ); - return ::repo_lookup_num( _solvable, attr.idStr().id() ); + return ::solvable_lookup_bool( _solvable, attr.idStr().id() ); } std::string Solvable::lookupLocation(unsigned &medianr) const @@ -399,7 +411,7 @@ std::ostream & operator<<( std::ostream & str, const Solvable & obj ) { if ( ! obj ) - return str << "sat::solvable()"; + return str << (obj.isSystem() ? "systemSolvable" : "noSolvable" ); return str << "(" << obj.id() << ")" << ( obj.isKind( ResKind::srcpackage ) ? "srcpackage:" : "" ) << obj.ident() Modified: trunk/libzypp/zypp/sat/Solvable.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/Solvable.h?rev=9328&r1=9327&r2=9328&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/Solvable.h (original) +++ trunk/libzypp/zypp/sat/Solvable.h Tue Apr 1 22:03:24 2008 @@ -49,8 +49,6 @@ * \ref Solvable will hide this inconsistency by treating source * packages as an own kind of solvable and map their arch to * \ref Arch_noarch. - * - * */ class Solvable : protected detail::PoolMember, private base::SafeBool<Solvable> @@ -59,7 +57,7 @@ typedef sat::detail::SolvableIdType IdType; public: - /** Default ctor creates \ref nosolvable.*/ + /** Default ctor creates \ref noSolvable.*/ Solvable() : _id( detail::noSolvableId ) {} @@ -69,12 +67,14 @@ public: /** Represents no \ref Solvable. */ - static const Solvable nosolvable; + static const Solvable noSolvable; - /** Evaluate \ref Solvable in a boolean context (\c != \c nosolvable). */ + /** Evaluate \ref Solvable in a boolean context (\c != \c noSolvable). */ using base::SafeBool<Solvable>::operator bool_type; - /** Return whether this \ref Solvable belongs to the system repo. */ + /** Return whether this \ref Solvable belongs to the system repo. + * \note This includes the otherwise hidden systemSolvable. + */ bool isSystem() const; /** The \ref Repository this \ref Solvable belongs to. */ @@ -89,11 +89,13 @@ std::string lookupStrAttribute( const SolvAttr & attr ) const; /** \overload Trying to look up a translated string attribute. * + * Returns the translation for \c lang_r (\b no fallback locales). + * * Passing an empty \ref Locale will return the string for the - * current default locale (\see \ref ZConfig::defaultTextLocale). + * current default locale (\see \ref ZConfig::defaultTextLocale), + * \b considering all fallback locales. * - * Returns the translation for \c lang_r considering all fallback - * locales. Returns an empty string if no translation is available. + * Returns an empty string if no translation is available. */ std::string lookupStrAttribute( const SolvAttr & attr, const Locale & lang_r ) const; @@ -175,9 +177,9 @@ //@} public: - /** Return next Solvable in \ref Pool (or \ref nosolvable). */ + /** Return next Solvable in \ref Pool (or \ref noSolvable). */ Solvable nextInPool() const; - /** Return next Solvable in \ref Repo (or \ref nosolvable). */ + /** Return next Solvable in \ref Repo (or \ref noSolvable). */ Solvable nextInRepo() const; public: Modified: trunk/libzypp/zypp/sat/WhatProvides.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/WhatProvides.cc?rev=9328&r1=9327&r2=9328&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/WhatProvides.cc (original) +++ trunk/libzypp/zypp/sat/WhatProvides.cc Tue Apr 1 22:03:24 2008 @@ -10,8 +10,9 @@ * */ #include <iostream> -#include "zypp/base/LogTools.h" +#include +#include "zypp/base/LogTools.h" #include "zypp/sat/WhatProvides.h" #include "zypp/sat/detail/PoolImpl.h" @@ -24,21 +25,54 @@ namespace sat { ///////////////////////////////////////////////////////////////// - WhatProvides::WhatProvides( Capability cap_r ) - : _begin( myPool().whatProvides( cap_r ) ) - { -#warning REMOVE THIS DEBUGSTUFF AGAIN - if ( ! _begin ) - return; - int limit = myPool()->nsolvables; - for ( const sat::detail::IdType * end = _begin; *end; ++end ) + /////////////////////////////////////////////////////////////////// + namespace + { ///////////////////////////////////////////////////////////////// + + /** WhatProvides ctor helper collecting providers from Capabilies. */ + template <class Iterator> + shared_ptr<void> allocatedProviders( Iterator begin_r, Iterator end_r, const sat::detail::IdType *& first_r ) { - if ( *end >= limit ) + // use a set to unify the collected results + std::tr1::unordered_setsat::detail::IdType ids; + for_( it, begin_r, end_r ) { - INT << "Illegal index: WhatProvides (" << cap_r << ") = " << *end << " (limit " << limit << ")" << endl; + WhatProvides providers( *it ); + for_( prv, providers.begin(), providers.end() ) + { + ids.insert( prv->id() ); + } } + + if ( ids.empty() ) + { + return shared_ptr<void>(); + } + + // use allocated private data to store the result + std::vectorsat::detail::IdType * pdata = new std::vectorsat::detail::IdType( ids.size(), sat::detail::noId ); + pdata->insert( pdata->begin(), ids.begin(), ids.end() ); + first_r = &pdata->front(); + return shared_ptr<void>( pdata ); } - } + + ///////////////////////////////////////////////////////////////// + } // namespace + /////////////////////////////////////////////////////////////////// + + WhatProvides::WhatProvides( Capability cap_r ) + : _begin( myPool().whatProvides( cap_r ) ) + {} + + WhatProvides::WhatProvides( Capabilities caps_r ) + : _begin( 0 ) + , _private( allocatedProviders( caps_r.begin(), caps_r.end(), _begin ) ) + {} + + WhatProvides::WhatProvides( const CapabilitySet & caps_r ) + : _begin( 0 ) + , _private( allocatedProviders( caps_r.begin(), caps_r.end(), _begin ) ) + {} WhatProvides::size_type WhatProvides::size() const { Modified: trunk/libzypp/zypp/sat/WhatProvides.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/WhatProvides.h?rev=9328&r1=9327&r2=9328&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/WhatProvides.h (original) +++ trunk/libzypp/zypp/sat/WhatProvides.h Tue Apr 1 22:03:24 2008 @@ -13,8 +13,9 @@ #define ZYPP_SAT_WHATPROVIDES_H #include <iosfwd> +#include <vector> -#include "zypp/base/DefaultIntegral.h" +#include "zypp/base/PtrTypes.h" #include "zypp/sat/detail/PoolMember.h" #include "zypp/sat/Solvable.h" @@ -30,14 +31,50 @@ // CLASS NAME : WhatProvides // /** Container of \ref Solvable providing a \ref Capability (read only). + * * \code * Capability cap("amarok < 1.13"); + * * WhatProvides q( cap ); + * Solvable firstMatch; + * * if ( ! q.empty() ) * { * cout << "Found " << q.size() << " matches for " << cap << ":" << endl; + * firstMatch = *q.begin(); + * * for_( it, q.begin(), q.end() ) - * cout << *it << end; + * cout << *it << endl; + * } + * + * if ( firstMatch ) + * { + * WhatProvides req( firstMatch.requires() ); + * if ( ! req.empty() ) + * { + * cout << "Found " << req.size() << " items providing requirements of " << firstMatch << ":" << endl; + * } + * } + * \endcode + * + * \note Note that there are capabilities which are not provided by any \ref Solvable, + * but are system properties. For example: + * \code + * rpmlib(PayloadIsBzip2) <= 3.0.5-1 + * \endcode + * In that case a \ref Solvable::noSolvable is returned, which has \c isSystem set \c true, although + * there should never be a \ref Solvable::noSolvable returned with \c isSystem set \c false. If so, + * please file a bugreport. + * \code + * WhatProvides q( Capability("rpmlib(PayloadIsBzip2) <= 3.0.5-1") ); + * for_( it, q.begin(), q.end() ) + * { + * if ( *it ) + * cout << "Capability is provided by package " << *it << endl; + * else if ( it->isSystem() ) + * cout << "Capability is a system property" << endl; + * else + * ; // never reaching this \c else * } * \endcode */ @@ -53,11 +90,19 @@ : _begin( 0 ) {} - /** Ctor from Id pointer (friend \ref Solvable). */ + /** Ctor from \ref Capability. */ explicit WhatProvides( Capability cap_r ); - public: + /** Ctor collecting all providers of capabilities in \c caps_r. */ + explicit + WhatProvides( Capabilities caps_r ); + + /** Ctor collecting all providers of capabilities in \c caps_r. */ + explicit + WhatProvides( const CapabilitySet & caps_r ); + + public: /** Whether the container is empty. */ bool empty() const { return ! ( _begin && *_begin ); } @@ -76,6 +121,7 @@ private: const sat::detail::IdType * _begin; + shared_ptr<void> _private; }; /////////////////////////////////////////////////////////////////// @@ -109,7 +155,7 @@ friend class boost::iterator_core_access; reference dereference() const - { return ( base() ) ? Solvable( *base() ) : Solvable::nosolvable; } + { return ( base() ) ? Solvable( *base() ) : Solvable::noSolvable; } template bool equal( const boost::iterator_adaptor & rhs ) const Modified: trunk/libzypp/zypp/sat/detail/PoolImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/detail/PoolImpl.cc?rev=9328&r1=9327&r2=9328&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/detail/PoolImpl.cc (original) +++ trunk/libzypp/zypp/sat/detail/PoolImpl.cc Tue Apr 1 22:03:24 2008 @@ -45,6 +45,9 @@ BOOST_MPL_ASSERT_RELATION( noId, ==, STRID_NULL ); BOOST_MPL_ASSERT_RELATION( emptyId, ==, STRID_EMPTY ); + BOOST_MPL_ASSERT_RELATION( noSolvableId, ==, ID_NULL ); + BOOST_MPL_ASSERT_RELATION( systemSolvableId, ==, SYSTEMSOLVABLE ); + BOOST_MPL_ASSERT_RELATION( solvablePrereqMarker, ==, SOLVABLE_PREREQMARKER ); BOOST_MPL_ASSERT_RELATION( solvableFileMarker, ==, SOLVABLE_FILEMARKER ); @@ -161,6 +164,22 @@ ::pool_addfileprovides( _pool, sat::Pool::instance().systemRepo().get() ); ::pool_createwhatprovides( _pool ); } + if ( ! _pool->languages ) + { + std::vectorstd::string fallbacklist; + for ( Locale l( ZConfig::instance().textLocale() ); l != Locale::noCode; l = l.fallback() ) + { + fallbacklist.push_back( l.code() ); + } + dumpRangeLine( MIL << "pool_set_languages: ", fallbacklist.begin(), fallbacklist.end() ) << endl; + + std::vector fallbacklist_cstr; + for_( it, fallbacklist.begin(), fallbacklist.end() ) + { + fallbacklist_cstr.push_back( it->c_str() ); + } + ::pool_set_languages( _pool, &fallbacklist_cstr.front(), fallbacklist_cstr.size() ); + } } /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/sat/detail/PoolMember.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/detail/PoolMember.h?rev=9328&r1=9327&r2=9328&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/detail/PoolMember.h (original) +++ trunk/libzypp/zypp/sat/detail/PoolMember.h Tue Apr 1 22:03:24 2008 @@ -41,14 +41,14 @@ class Capability; class Capabilities; class Repository; - class RepoInfo; + class RepoInfo; /////////////////////////////////////////////////////////////////// namespace detail - { + { class RepoIterator; - class ByRepository; - } + class ByRepository; + } /////////////////////////////////////////////////////////////////// namespace sat @@ -106,12 +106,14 @@ */ typedef unsigned SolvableIdType; typedef SolvableIdType size_type; - /** Id to denote \ref Solvable::nosolvable. */ + /** Id to denote \ref Solvable::noSolvable. */ static const SolvableIdType noSolvableId( 0 ); + /** Id to denote the usually hidden \ref Solvable::systemSolvable. */ + static const SolvableIdType systemSolvableId( 1 ); /** Id type to connect \ref Repo and sat-repo. */ typedef ::_Repo * RepoIdType; - /** Id to denote \ref Repo::nosolvable. */ + /** Id to denote \ref Repo::noRepository. */ static const RepoIdType noRepoId( 0 ); ///////////////////////////////////////////////////////////////// -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org