Author: mlandres Date: Fri Aug 3 13:42:12 2007 New Revision: 6431 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6431&view=rev Log: Fixed pattern includes and extends attributes. Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/devel/devel.ma/Parse.cc trunk/libzypp/zypp/Pattern.h trunk/libzypp/zypp/cache/CacheAttributes.h trunk/libzypp/zypp/cache/CacheStore.cc trunk/libzypp/zypp/detail/PatternImplIf.h trunk/libzypp/zypp/repo/cached/PatternImpl.cc trunk/libzypp/zypp/repo/cached/PatternImpl.h Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=6431&r1=6430&r2=6431&view=diff ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Fri Aug 3 13:42:12 2007 @@ -47,4 +47,4 @@ SET(LIBZYPP_MAJOR "3") SET(LIBZYPP_MINOR "13") SET(LIBZYPP_COMPATMINOR "13") -SET(LIBZYPP_PATCH "7") +SET(LIBZYPP_PATCH "8") Modified: trunk/libzypp/devel/devel.ma/Parse.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/Parse.cc?rev=6431&r1=6430&r2=6431&view=diff ============================================================================== --- trunk/libzypp/devel/devel.ma/Parse.cc (original) +++ trunk/libzypp/devel/devel.ma/Parse.cc Fri Aug 3 13:42:12 2007 @@ -48,28 +48,20 @@ { bool operator()( const PoolItem & obj_r ) { + handle( asKind<Pattern>( obj_r ) ); return true; } - bool operator()( const ResObject_Ptr & obj_r ) + void handle( const Pattern_constPtr & p ) { - SrcPackage_constPtr p( asKind<SrcPackage>( obj_r ) ); - if ( p ) - { - getZYpp()->installSrcPackage( p ); - SEC << p << endl; - } - return true; - } + if ( !p ) + return; - bool operator()( const Repository & repo_r ) - { - USR << repo_r.resolvables() << endl; - std::for_each( repo_r.resolvables().begin(), repo_r.resolvables().end(), Xprint() ); - return true; + MIL << p << endl; + if ( ! p->includes().empty() ) DBG << p->includes() << endl; + if ( ! p->extends().empty() ) DBG << p->extends() << endl; } - template<class _C> bool operator()( const _C & obj_r ) { @@ -262,11 +254,6 @@ ///////////////////////////////////////////////////////////////// } // namespace zypp /////////////////////////////////////////////////////////////////// -bool repolst( const Repository & r ) -{ - USR << (r?"Y":"N") << ": " << r << endl; - return true; -} using namespace zypp; @@ -308,9 +295,6 @@ pool.begin(), pool.end() ) << endl; - - repolst( Repository::noRepository ); - for ( RepoInfoList::iterator it = repos.begin(); it != repos.end(); ++it ) { RepoInfo & nrepo( *it ); @@ -331,15 +315,12 @@ } SEC << nrepo << endl; - Repository nrep( repoManager.createFromCache( nrepo ) ); const zypp::ResStore & store( nrep.resolvables() ); dumpPoolStats( SEC << "Store: " << endl, store.begin(), store.end() ) << endl; getZYpp()->addResolvables( store ); - - repolst( nrep ); } USR << "pool: " << pool << endl; @@ -347,12 +328,14 @@ if ( 0 ) { - zypp::base::LogControl::TmpLineWriter shutUp; - getZYpp()->initTarget( sysRoot ); + { + zypp::base::LogControl::TmpLineWriter shutUp; + getZYpp()->initTarget( sysRoot ); + } + MIL << "Added target: " << pool << endl; } - MIL << "Added target: " << pool << endl; - std::for_each( pool.knownRepositoriesBegin(), pool.knownRepositoriesEnd(), Xprint() ); + std::for_each( pool.begin(), pool.end(), Xprint() ); /////////////////////////////////////////////////////////////////// INT << "===[END]============================================" << endl << endl; Modified: trunk/libzypp/zypp/Pattern.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Pattern.h?rev=6431&r1=6430&r2=6431&view=diff ============================================================================== --- trunk/libzypp/zypp/Pattern.h (original) +++ trunk/libzypp/zypp/Pattern.h Fri Aug 3 13:42:12 2007 @@ -51,11 +51,12 @@ /** */ Label order() const; - std::setstd::string install_packages( const Locale & lang = Locale("") ) const; + /** \deprecated AFAIK unused old Selection interface method. */ + std::setstd::string install_packages( const Locale & lang = Locale("") ) const ZYPP_DEPRECATED; - /** */ + /** Ui hint. */ const CapSet & includes() const; - /** */ + /** Ui hint. */ const CapSet & extends() const; protected: Modified: trunk/libzypp/zypp/cache/CacheAttributes.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/cache/CacheAttributes.h?rev=6431&r1=6430&r2=6431&view=diff ============================================================================== --- trunk/libzypp/zypp/cache/CacheAttributes.h (original) +++ trunk/libzypp/zypp/cache/CacheAttributes.h Fri Aug 3 13:42:12 2007 @@ -73,6 +73,9 @@ inline const Attribute & attrPatternIsDefault() { static Attribute a("Pattern","isDefault"); return a; } inline const Attribute & attrPatternOrder() { static Attribute a("Pattern","order"); return a; } inline const Attribute & attrPatternUserVisible() { static Attribute a("Pattern","userVisible"); return a; } + inline const Attribute & attrPatternUiIncludes() { static Attribute a("Pattern","uiIncludes"); return a; } + inline const Attribute & attrPatternUiExtends() { static Attribute a("Pattern","uiExtends"); return a; } + /////////////////////////////////////////////////////////////////// inline const Attribute & attrProductDistributionEdition() { static Attribute a("Product","distributionEdition"); return a; } inline const Attribute & attrProductDistributionName() { static Attribute a("Product","distributionName"); return a; } Modified: trunk/libzypp/zypp/cache/CacheStore.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/cache/CacheStore.cc?rev=6431&r1=6430&r2=6431&view=diff ============================================================================== --- trunk/libzypp/zypp/cache/CacheStore.cc (original) +++ trunk/libzypp/zypp/cache/CacheStore.cc Fri Aug 3 13:42:12 2007 @@ -2,7 +2,8 @@ #include <map> #include "zypp/cache/sqlite3x/sqlite3x.hpp" -#include "zypp/base/Logger.h" +#include "zypp/base/Easy.h" +#include "zypp/base/LogTools.h" #include "zypp/base/Measure.h" #include "zypp/ZYppFactory.h" #include "zypp/ZYpp.h" @@ -136,8 +137,8 @@ update_disk_usage_cmd.reset( new sqlite3_command (con, "insert or replace into resolvable_disk_usage (resolvable_id, dir_name_id, files, size) " "values (:resolvable_id, :dir_name_id, :files, :size)" )); - - + + // disable autocommit con.executenonquery("BEGIN;"); } @@ -202,7 +203,7 @@ sqlite3_command_ptr append_patch_baseversion_cmd; sqlite3_command_ptr update_disk_usage_cmd; - + map name_cache; map< pair, RecordId> type_cache; int name_cache_hits; @@ -392,7 +393,7 @@ } RecordId CacheStore::consumePattern( const data::RecordId & repository_id, - const data::Pattern_Ptr & pattern ) + const data::Pattern_Ptr & pattern ) { RecordId id = appendResolvable( repository_id, ResTraits<Pattern>::kind, NVRA( pattern->name, pattern->edition, pattern->arch ), pattern->deps ); @@ -403,6 +404,12 @@ appendTranslatedStringAttribute( id, attrPatternCategory(), pattern->category ); appendStringAttribute( id, attrPatternIcon(), pattern->icon ); appendStringAttribute( id, attrPatternOrder(), pattern->order ); + + // We store them as string. They are + // (sometimes) evaluated by the YaST UI. + appendStringContainerAttribute( id, attrPatternUiIncludes(), pattern->includes.begin(), pattern->includes.end() ); + appendStringContainerAttribute( id, attrPatternUiExtends(), pattern->extends.begin(), pattern->extends.end() ); + return id; } Modified: trunk/libzypp/zypp/detail/PatternImplIf.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/detail/PatternImplIf.h?rev=6431&r1=6430&r2=6431&view=diff ============================================================================== --- trunk/libzypp/zypp/detail/PatternImplIf.h (original) +++ trunk/libzypp/zypp/detail/PatternImplIf.h Fri Aug 3 13:42:12 2007 @@ -53,9 +53,9 @@ /** ui helper */ virtual std::setstd::string install_packages( const Locale & lang = Locale("") ) const; - virtual const CapSet & includes() const; + virtual const CapSet & includes() const PURE_VIRTUAL; - virtual const CapSet & extends() const; + virtual const CapSet & extends() const PURE_VIRTUAL; }; /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/repo/cached/PatternImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/cached/PatternImpl.cc?rev=6431&r1=6430&r2=6431&view=diff ============================================================================== --- trunk/libzypp/zypp/repo/cached/PatternImpl.cc (original) +++ trunk/libzypp/zypp/repo/cached/PatternImpl.cc Fri Aug 3 13:42:12 2007 @@ -6,21 +6,24 @@ | /_____||_| |_| |_| | | | \---------------------------------------------------------------------*/ -/** \file zmd/backend/dbrepository/PatternImpl.h +/** \file zypp/repo/cached/PatternImpl.cc * */ +#include <iostream> -#include "zypp/TranslatedText.h" -#include "zypp/base/String.h" +#include "zypp/base/Easy.h" #include "zypp/base/Logger.h" +#include "zypp/base/LogTools.h" +#include "zypp/base/String.h" + +#include "zypp/CapFactory.h" +#include "zypp/TranslatedText.h" #include "zypp/repo/RepositoryImpl.h" -#include "PatternImpl.h" +#include "zypp/repo/cached/PatternImpl.h" #include "zypp/cache/CacheAttributes.h" using namespace std; -using namespace zypp::detail; -using namespace::zypp::repo; /////////////////////////////////////////////////////////////////// namespace zypp { namespace repo { namespace cached { @@ -135,16 +138,38 @@ return _repository->resolvableQuery().queryStringAttribute( _id, cache::attrPatternOrder() ); } -//std::setstd::string install_packages( const Locale & lang = Locale("") ) const; -// const CapSet & PatternImpl::includes() const -// { -// -// } -// -// const CapSet & PatternImpl::extends() const -// { -// -// } + +void PatternImpl::initUiCapSetFromAttr( CapSet & caps_r, const cache::Attribute & attr_r ) const +{ + std::liststd::string capstr; + _repository->resolvableQuery().queryStringContainerAttribute( _id, attr_r, std::back_inserter(capstr) ); + for_( it, capstr.begin(), capstr.end() ) + { + caps_r.insert( CapFactory().parse<ResType>( *it ) ); + } +} + +const CapSet & PatternImpl::includes() const +{ + if ( ! _includes ) + { + // lazy init + _includes.reset( new CapSet ); + initUiCapSetFromAttr( *_includes, cache::attrPatternUiIncludes() ); + } + return *_includes; +} + +const CapSet & PatternImpl::extends() const +{ + if ( ! _extends ) + { + // lazy init + _extends.reset( new CapSet ); + initUiCapSetFromAttr( *_extends, cache::attrPatternUiExtends() ); + } + return *_extends; +} ///////////////////////////////////////////////////////////////// } } } // namespace zypp::repo::cached Modified: trunk/libzypp/zypp/repo/cached/PatternImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/cached/PatternImpl.h?rev=6431&r1=6430&r2=6431&view=diff ============================================================================== --- trunk/libzypp/zypp/repo/cached/PatternImpl.h (original) +++ trunk/libzypp/zypp/repo/cached/PatternImpl.h Fri Aug 3 13:42:12 2007 @@ -6,6 +6,9 @@ | /_____||_| |_| |_| | | | \---------------------------------------------------------------------*/ +/** \file zypp/repo/cached/PatternImpl.h + * +*/ #ifndef zypp_repo_cached_PatternImpl_H #define zypp_repo_cached_PatternImpl_H @@ -16,6 +19,13 @@ /////////////////////////////////////////////////////////////////// namespace zypp { ///////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////// + namespace cache + { ///////////////////////////////////////////////////////////////// + class Attribute; + ///////////////////////////////////////////////////////////////// + } // namespace cache + /////////////////////////////////////////////////////////////////// namespace repo { ///////////////////////////////////////////////////////////////// namespace cached @@ -49,16 +59,20 @@ virtual Pathname icon() const; virtual Pathname script() const; virtual Label order() const; - //virtual std::setstd::string install_packages( const Locale & lang = Locale("") ) const; -// virtual const CapSet & includes() const; -// virtual const CapSet & extends() const; - + virtual const CapSet & includes() const; + virtual const CapSet & extends() const; virtual Repository repository() const; private: + /** Lazy init _includes and _extends which are stored as plain stringlist. */ + void initUiCapSetFromAttr( CapSet & caps_r, const cache::Attribute & attr_r ) const; + + private: repo::cached::RepoImpl::Ptr _repository; - data::RecordId _id; + data::RecordId _id; + mutable scoped_ptr<CapSet> _includes; + mutable scoped_ptr<CapSet> _extends; }; ///////////////////////////////////////////////////////////////// } // namespace cached -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org