[zypp-commit] r9891 - in /trunk/libzypp: devel/devel.ma/NewPool.cc zypp/CMakeLists.txt zypp/PoolQueryResult.cc zypp/PoolQueryResult.h

Author: mlandres Date: Tue Apr 29 22:28:57 2008 New Revision: 9891 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9891&view=rev Log: Add class PoolQueryResult: Helper class to collect (not only) PoolQuery results. Added: trunk/libzypp/zypp/PoolQueryResult.cc trunk/libzypp/zypp/PoolQueryResult.h Modified: trunk/libzypp/devel/devel.ma/NewPool.cc trunk/libzypp/zypp/CMakeLists.txt Modified: trunk/libzypp/devel/devel.ma/NewPool.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/NewPool.cc?rev=9891&r1=9890&r2=9891&view=diff ============================================================================== --- trunk/libzypp/devel/devel.ma/NewPool.cc (original) +++ trunk/libzypp/devel/devel.ma/NewPool.cc Tue Apr 29 22:28:57 2008 @@ -1,5 +1,7 @@ #include "Tools.h" +#include "zypp/PoolQueryResult.h" + #include #include #include @@ -454,112 +456,6 @@ namespace zypp { - /** Helper class to collect (not only) \ref PoolQuery results. - * - * \note Unfortunately \ref PoolQuery::begin might throw. Exceptions - * are caught and the query is treated as empty. - * - * \ref PoolQueryResult maintains a set of \ref sat::Solvable. You can - * add/remove solvables to/from the set defined by: - * - * \li a single \ref sat::Solvable - * \li a \ref PoolQuery - * \li an other \ref PoolQueryResult - * \li any iterator pair with \c value_type \ref sat::Solvable or \ref PoolQuery - * or \ref PoolQueryResult (any type that fits \c operator+=) - */ - class PoolQueryResult : public sat::SolvIterMixinsat::Solvable::const_iterator> - { - public: - typedef std::tr1::unordered_setsat::Solvable ResultSet; - typedef ResultSet::size_type size_type; - typedef ResultSet::const_iterator const_iterator; - - public: - PoolQueryResult() - {} - - explicit PoolQueryResult( sat::Solvable result_r ) - { _result.insert( result_r ); } - - explicit PoolQueryResult( const PoolQuery & query_r ) - { operator+=( query_r ); } - - template<class _QueryResultIter> - PoolQueryResult( _QueryResultIter begin_r, _QueryResultIter end_r ) - { - for_( it, begin_r, end_r ) - { - operator+=( *it ); - } - } - - public: - /***/ - bool empty() const - { return _result.empty(); } - /***/ - size_type size() const - { return _result.size(); } - /***/ - const_iterator begin() const - { return _result.begin(); } - /***/ - const_iterator end() const - { return _result.end(); } - - public: - /** - */ - PoolQueryResult & operator+=( const PoolQueryResult & query_r ) - { - if ( ! query_r.empty() ) - _result.insert( query_r.begin(), query_r.end() ); - return *this; - } - /** \overload */ - PoolQueryResult & operator+=( const PoolQuery & query_r ) - { return operator+=( PoolQueryResult( query_r ) ); } - /** \overload */ - PoolQueryResult & operator+=( sat::Solvable result_r ) - { _result.insert( result_r ); return *this; } - - /** - */ - PoolQueryResult & operator-=( const PoolQueryResult & query_r ); - /** \overload */ - PoolQueryResult & operator-=( const PoolQuery & query_r ) - { return operator-=( PoolQueryResult( query_r ) ); } - /** \overload */ - PoolQueryResult & operator-=( sat::Solvable result_r ) - { return operator+=( PoolQueryResult( result_r ) ); } - - public: - /** - */ - PoolQueryResult operator+( const PoolQueryResult & query_r ) const - { return PoolQueryResult(*this) += query_r; } - /** \overload */ - PoolQueryResult operator+( const PoolQuery & query_r ) const - { return PoolQueryResult(*this) += query_r; } - /** \overload */ - PoolQueryResult operator+( sat::Solvable result_r ) const - { return PoolQueryResult(*this) += result_r; } - - /** - */ - PoolQueryResult operator-( const PoolQueryResult & query_r ) const - { return PoolQueryResult(*this) -= query_r; } - /** \overload */ - PoolQueryResult operator-( const PoolQuery & query_r ) const - { return PoolQueryResult(*this) -= query_r; } - /** \overload */ - PoolQueryResult operator-( sat::Solvable result_r ) const - { return PoolQueryResult(*this) -= result_r; } - - private: - ResultSet _result; - }; } void tt( const std::string & name_r, ResKind kind_r = ResKind::package ) @@ -719,7 +615,28 @@ /////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// + //ResPool pool( ResPool::instance() ); + + // + PoolQueryResult result( pool.byKindBegin<Package>(), pool.byKindEnd<Package>() ); + MIL << result.size() << endl; + + { + PoolQuery q; + q.addAttribute( sat::SolvAttr::name, "[a-zA-Z]*" ); + q.setMatchGlob(); + result -= q; + MIL << result.size() << endl; + } + MIL << result << endl; + + sat::WhatProvides poviders( Capability("3ddiag") ); + result -= PoolQueryResult( poviders.begin(), poviders.end() ); + MIL << result << endl; + + result -= result; + MIL << result << endl; /////////////////////////////////////////////////////////////////// INT << "===[END]============================================" << endl << endl; Modified: trunk/libzypp/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/CMakeLists.txt?rev=9891&r1=9890&r2=9891&view=diff ============================================================================== --- trunk/libzypp/zypp/CMakeLists.txt (original) +++ trunk/libzypp/zypp/CMakeLists.txt Tue Apr 29 22:28:57 2008 @@ -44,6 +44,7 @@ Pattern.cc PoolItem.cc PoolQuery.cc + PoolQueryResult.cc ProblemSolution.cc Product.cc ProgressData.cc @@ -135,6 +136,7 @@ PoolItem.h PoolQuery.h PoolQueryUtil.tcc + PoolQueryResult.h ProblemSolution.h ProblemTypes.h Product.h Added: trunk/libzypp/zypp/PoolQueryResult.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PoolQueryResult.cc?rev=9891&view=auto ============================================================================== --- trunk/libzypp/zypp/PoolQueryResult.cc (added) +++ trunk/libzypp/zypp/PoolQueryResult.cc Tue Apr 29 22:28:57 2008 @@ -0,0 +1,35 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file zypp/PoolQueryResult.cc + * +*/ +#include <iostream> +#include "zypp/base/LogTools.h" + +#include "zypp/PoolQueryResult.h" + +using std::endl; + +/////////////////////////////////////////////////////////////////// +namespace zypp +{ ///////////////////////////////////////////////////////////////// + + /****************************************************************** + ** + ** FUNCTION NAME : operator<< + ** FUNCTION TYPE : std::ostream & + */ + std::ostream & operator<<( std::ostream & str, const PoolQueryResult & obj ) + { + return dumpRange( str, obj.begin(), obj.end() ); + } + + ///////////////////////////////////////////////////////////////// +} // namespace zypp +/////////////////////////////////////////////////////////////////// Added: trunk/libzypp/zypp/PoolQueryResult.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PoolQueryResult.h?rev=9891&view=auto ============================================================================== --- trunk/libzypp/zypp/PoolQueryResult.h (added) +++ trunk/libzypp/zypp/PoolQueryResult.h Tue Apr 29 22:28:57 2008 @@ -0,0 +1,223 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file zypp/PoolQueryResult.h + * +*/ +#ifndef ZYPP_POOLQUERYRESULT_H +#define ZYPP_POOLQUERYRESULT_H + +#include <iosfwd> + +#include "zypp/base/Tr1hash.h" +#include "zypp/base/Exception.h" +#include "zypp/sat/SolvIterMixin.h" + +#include "zypp/PoolItem.h" +#include "zypp/PoolQuery.h" + +/////////////////////////////////////////////////////////////////// +namespace zypp +{ ///////////////////////////////////////////////////////////////// + + /////////////////////////////////////////////////////////////////// + // + // CLASS NAME : PoolQueryResult + // + /** Helper class to collect (not only) \ref PoolQuery results. + * + * \note Unfortunately \ref PoolQuery::begin might throw. Exceptions + * are caught and the query is treated as empty. + * + * \ref PoolQueryResult maintains a set of \ref sat::Solvable. You can + * add/remove solvables to/from the set defined by: + * + * \li a single \ref sat::Solvable + * \li a single \ref PoolItem + * \li a \ref PoolQuery + * \li an other \ref PoolQueryResult + * \li any iterator pair with \c value_type \ref sat::Solvable + * or \ref PoolItem or \ref PoolQuery or any type that fits + * \c operator+=. + * + * \code + * // Constructed from PoolItem iterator pair + * PoolQueryResult result( pool.byKindBegin<Package>(), pool.byKindEnd<Package>() ); + * MIL << result.size() << endl; + * + * { + * // Removing a PoolQuery result + * PoolQuery q; + * q.addAttribute( sat::SolvAttr::name, "[a-zA-Z]*" ); + * q.setMatchGlob(); + * result -= q; + * MIL << result.size() << endl; + * } + * MIL << result << endl; + * + * // Removing a range of sat::Solvables + * sat::WhatProvides poviders( Capability("3ddiag") ); + * result -= PoolQueryResult( poviders.begin(), poviders.end() ); + * + * // packages not starting with a letter, except 3ddiag + * MIL << result << endl; + * \endcode + */ + class PoolQueryResult : public sat::SolvIterMixinsat::Solvable::const_iterator> + { + public: + typedef std::tr1::unordered_setsat::Solvable ResultSet; + typedef ResultSet::size_type size_type; + typedef ResultSet::const_iterator const_iterator; + + public: + /** Default ctor (empty result) */ + PoolQueryResult() + {} + + /** Ctor adding one \ref sat::Solvable. */ + explicit PoolQueryResult( sat::Solvable result_r ) + { operator+=( result_r ); } + + /** Ctor adding one \ref PoolItem. */ + explicit PoolQueryResult( const PoolItem & result_r ) + { operator+=( result_r ); } + + /** Ctor adding one \ref PoolQuery result. */ + explicit PoolQueryResult( const PoolQuery & query_r ) + { operator+=( query_r ); } + + /** Ctor adding a range of items for which \ref operator+= is defined. */ + template<class _QueryResultIter> + PoolQueryResult( _QueryResultIter begin_r, _QueryResultIter end_r ) + { + for_( it, begin_r, end_r ) + { + operator+=( *it ); + } + } + + public: + /** Whether the result is empty. */ + bool empty() const + { return _result.empty(); } + /** The number of \ref sat::Solvables. */ + size_type size() const + { return _result.size(); } + /** */ + const_iterator begin() const + { return _result.begin(); } + /** */ + const_iterator end() const + { return _result.end(); } + + public: + /** Clear the result. */ + void clear() + { _result.clear(); } + + /** Add items to the result. */ + PoolQueryResult & operator+=( const PoolQueryResult & query_r ) + { + if ( ! query_r.empty() ) + _result.insert( query_r.begin(), query_r.end() ); + return *this; + } + /** \overload */ + PoolQueryResult & operator+=( const PoolQuery & query_r ) + { + try + { + for_( it, query_r.begin(), query_r.end() ) + _result.insert( *it ); + } + catch ( const Exception & ) + {} + return *this; + } + /** \overload */ + PoolQueryResult & operator+=( sat::Solvable result_r ) + { + _result.insert( result_r ); + return *this; + } + /** \overload */ + PoolQueryResult & operator+=( const PoolItem & result_r ) + { + _result.insert( result_r.satSolvable() ); + return *this; + } + + /** Remove Items from the result. */ + PoolQueryResult & operator-=( const PoolQueryResult & query_r ) + { + if ( &query_r == this ) // catch self intersection! + clear(); + else + for_( it, query_r.begin(), query_r.end() ) + _result.erase( *it ); + return *this; + } + /** \overload */ + PoolQueryResult & operator-=( const PoolQuery & query_r ) + { + try + { + for_( it, query_r.begin(), query_r.end() ) + _result.erase( *it ); + } + catch ( const Exception & ) + {} + return *this; + } + /** \overload */ + PoolQueryResult & operator-=( sat::Solvable result_r ) + { + _result.erase( result_r ); + return *this; + } + /** \overload */ + PoolQueryResult & operator-=( const PoolItem & result_r ) + { + _result.erase( result_r.satSolvable() ); + return *this; + } + + public: + /** Combine results. */ + PoolQueryResult operator+( const PoolQueryResult & query_r ) const + { return PoolQueryResult(*this) += query_r; } + /** \overload */ + PoolQueryResult operator+( const PoolQuery & query_r ) const + { return PoolQueryResult(*this) += query_r; } + /** \overload */ + PoolQueryResult operator+( sat::Solvable result_r ) const + { return PoolQueryResult(*this) += result_r; } + + /** Intersect results. */ + PoolQueryResult operator-( const PoolQueryResult & query_r ) const + { return PoolQueryResult(*this) -= query_r; } + /** \overload */ + PoolQueryResult operator-( const PoolQuery & query_r ) const + { return PoolQueryResult(*this) -= query_r; } + /** \overload */ + PoolQueryResult operator-( sat::Solvable result_r ) const + { return PoolQueryResult(*this) -= result_r; } + + private: + ResultSet _result; + }; + /////////////////////////////////////////////////////////////////// + + /** \relates PoolQueryResult Stream output */ + std::ostream & operator<<( std::ostream & str, const PoolQueryResult & obj ); + + ///////////////////////////////////////////////////////////////// +} // namespace zypp +/////////////////////////////////////////////////////////////////// +#endif // ZYPP_POOLQUERYRESULT_H -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org