[zypp-commit] r8398 - in /branches/tmp/ma/jump_sat/libzypp/zypp: RepoManager.cc cache/SolvStore.cc cache/SolvStore.h

Author: dmacvicar Date: Tue Jan 29 23:36:34 2008 New Revision: 8398 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8398&view=rev Log: misc compiles Modified: branches/tmp/ma/jump_sat/libzypp/zypp/RepoManager.cc branches/tmp/ma/jump_sat/libzypp/zypp/cache/SolvStore.cc branches/tmp/ma/jump_sat/libzypp/zypp/cache/SolvStore.h Modified: branches/tmp/ma/jump_sat/libzypp/zypp/RepoManager.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/RepoManager.cc?rev=8398&r1=8397&r2=8398&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/RepoManager.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/RepoManager.cc Tue Jan 29 23:36:34 2008 @@ -118,19 +118,19 @@ const RepoInfo &info, const ProgressData::ReceiverFnc & progressrcv = ProgressData::ReceiverFnc() ) { - ProgressData progress; - callback::SendReport<ProgressReport> report; - progress.sendTo( ProgressReportAdaptor( progressrcv, report ) ); - progress.name(str::form(_("Cleaning repository '%s' cache"), info.name().c_str())); - - if ( !store.isCached(info.alias()) ) - return; - - MIL << info.alias() << " cleaning cache..." << endl; - - CombinedProgressData subprogrcv(progress); - - store.cleanRepository(info.alias(), subprogrcv); +// ProgressData progress; +// callback::SendReport<ProgressReport> report; +// progress.sendTo( ProgressReportAdaptor( progressrcv, report ) ); +// progress.name(str::form(_("Cleaning repository '%s' cache"), info.name().c_str())); +// +// if ( !store.isCached(info.alias()) ) +// return; +// +// MIL << info.alias() << " cleaning cache..." << endl; +// +// CombinedProgressData subprogrcv(progress); +// +// store.cleanRepository(info.alias(), subprogrcv); } //////////////////////////////////////////////////////////////////////////// Modified: branches/tmp/ma/jump_sat/libzypp/zypp/cache/SolvStore.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/cache/SolvStore.cc?rev=8398&r1=8397&r2=8398&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/cache/SolvStore.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/cache/SolvStore.cc Tue Jan 29 23:36:34 2008 @@ -12,7 +12,6 @@ #include "zypp/cache/CacheAttributes.h" #include "satsolver/repo.h" -#include "satsolver/attr_store.h" using namespace std; using namespace zypp; @@ -51,13 +50,14 @@ struct SolvStore::Impl { - Impl( const Pathname &solvdir ) + Impl( const Pathname &solvdir, const string &alias ) : name_cache_hits(0) , dir_cache_hits(0) , _cachedir(solvdir) { _pool = pool_create(); - _attr = new_store(_pool); + _repo = repo_create(_pool, alias.c_str() ); + _repodata = repo_add_repodata(_repo); _attr_package_authors = str2id(_pool, "package:authors", 1); _attr_package_description = str2id(_pool, "package:description", 1); @@ -80,9 +80,9 @@ _attr_package_time = str2id(_pool, "package:time", 1); } - Impl() + Impl( const std::string &alias) { - Impl( getZYpp()->homePath() ); + Impl( getZYpp()->homePath(), alias ); } ~Impl() @@ -98,11 +98,10 @@ int dir_cache_hits; _Pool *_pool; + _Repo *_repo; - map _repoid2repo; - Pathname _cachedir; - Attrstore *_attr; + Repodata *_repodata; Id _attr_package_authors; Id _attr_package_description; @@ -126,14 +125,14 @@ }; -SolvStore::SolvStore( const Pathname &solvdir ) - : _pimpl( new Impl(solvdir) ) +SolvStore::SolvStore( const Pathname &solvdir, const string &alias ) + : _pimpl( new Impl(solvdir, alias) ) { } -SolvStore::SolvStore() - : _pimpl( new Impl() ) +SolvStore::SolvStore( const std::string &alias ) + : _pimpl( new Impl(alias) ) { } @@ -402,16 +401,8 @@ _Solvable* SolvStore::appendResolvable( const std::string & repository_id, const data::Resolvable_Ptr &res ) { - Repo *repo; - map::const_iterator it = _pimpl->_repoid2repo.find(repository_id); - if ( it == _pimpl->_repoid2repo.end() ) - { - // throw - } - repo = it->second; - //Id - _Solvable *s = pool_id2solvable(_pimpl->_pool, repo_add_solvable(repo)); + _Solvable *s = pool_id2solvable(_pimpl->_pool, repo_add_solvable(_pimpl->_repo)); s->evr = str2id(_pimpl->_pool, res->edition.c_str(), 1); // s->provides = adddep(pool, pd, s->provides, atts, 0); // @@ -455,11 +446,6 @@ return RepoStatus(); } -bool SolvStore::isCached( const string &alias ) -{ - return _pimpl->_repoid2repo.find(alias) != _pimpl->_repoid2repo.end(); -} - } } Modified: branches/tmp/ma/jump_sat/libzypp/zypp/cache/SolvStore.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/cache/SolvStore.h?rev=8398&r1=8397&r2=8398&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/cache/SolvStore.h (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/cache/SolvStore.h Tue Jan 29 23:36:34 2008 @@ -51,7 +51,7 @@ { public: - SolvStore(); + SolvStore( const std::string &alias ); virtual ~SolvStore(); /** @@ -63,7 +63,7 @@ * The data will be saved in the directory specified in * \a dbdir. \a dbdir must exist. */ - SolvStore( const Pathname &solvdir ); + SolvStore( const Pathname &solvdir, const std::string &alias ); /** * Commit the changes. @@ -285,7 +285,7 @@ RepoStatus repositoryStatus( const std::string &alias ); - bool isCached( const std::string &alias ); + //bool isCached( const std::string &alias ); private: /** Implementation. */ -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org