misc compiles

diff --git a/zypp/RepoManager.cc b/zypp/RepoManager.cc
index d9044d2..b1f7412 100644 (file)
--- a/zypp/RepoManager.cc
+++ b/zypp/RepoManager.cc
@@ -118,19 +118,19 @@ namespace zypp
                                   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);
   }
 
   ////////////////////////////////////////////////////////////////////////////

diff --git a/zypp/cache/SolvStore.cc b/zypp/cache/SolvStore.cc
index b9a7e88..a542d8a 100644 (file)
--- a/zypp/cache/SolvStore.cc
+++ b/zypp/cache/SolvStore.cc
@@ -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 @@ namespace cache
 
 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 @@ struct SolvStore::Impl
     _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 @@ struct SolvStore::Impl
   int dir_cache_hits;
 
   _Pool *_pool;
+  _Repo *_repo;
 
-  map<string,Repo*> _repoid2repo;
-  
   Pathname _cachedir;
-  Attrstore *_attr;
+  Repodata *_repodata;
 
   Id _attr_package_authors;
   Id _attr_package_description;
@@ -126,14 +125,14 @@ struct SolvStore::Impl
 };
 
 
-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 @@ void SolvStore::updatePackageLang( const data::RecordId & resolvable_id,
 _Solvable* SolvStore::appendResolvable( const std::string & repository_id,
                                           const data::Resolvable_Ptr &res )
 {
-  Repo *repo;
-  map<string, Repo*>::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 @@ RepoStatus SolvStore::repositoryStatus( const string &alias )
   return RepoStatus();
 }
 
-bool SolvStore::isCached( const string &alias )
-{
-  return _pimpl->_repoid2repo.find(alias) != _pimpl->_repoid2repo.end();
-}
-
 }
 }
 

diff --git a/zypp/cache/SolvStore.h b/zypp/cache/SolvStore.h
index 6091a33..6702beb 100644 (file)
--- a/zypp/cache/SolvStore.h
+++ b/zypp/cache/SolvStore.h
@@ -51,7 +51,7 @@ namespace zypp
     {
     public:
 
-      SolvStore();
+      SolvStore( const std::string &alias );
       virtual ~SolvStore();
 
       /**
@@ -63,7 +63,7 @@ namespace zypp
        * 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 @@ namespace zypp
 
       RepoStatus repositoryStatus( const std::string &alias );
 
-      bool isCached( const std::string &alias );
+      //bool isCached( const std::string &alias );
 
     private:
       /** Implementation. */