Author: mlandres
Date: Tue Jun 26 14:01:02 2007
New Revision: 5845
URL: http://svn.opensuse.org/viewcvs/zypp?rev=5845&view=rev
Log:
fix cached Repository to provide Product data
Modified:
branches/REFACTORING-10_3/libzypp/zypp/parser/susetags/RepoParser.cc
branches/REFACTORING-10_3/libzypp/zypp/repo/cached/RepoImpl.cc
Modified: branches/REFACTORING-10_3/libzypp/zypp/parser/susetags/RepoParser.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/parser/susetags/RepoParser.cc?rev=5845&r1=5844&r2=5845&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/parser/susetags/RepoParser.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/parser/susetags/RepoParser.cc Tue Jun 26 14:01:02 2007
@@ -69,6 +69,7 @@
void consumeProd( const data::Product_Ptr & data_r )
{
MIL << "[Product] " << data_r << endl;
+ ++_stats.prod;
_prodData = data_r;
_consumer.consumeProduct( _repositoryId, data_r );
}
@@ -76,18 +77,21 @@
void consumePkg( const data::Package_Ptr & data_r )
{
//SEC << "[Package]" << data_r << endl;
+ ++_stats.pack;
_consumer.consumePackage( _repositoryId, data_r );
}
void consumeSrcPkg( const data::SrcPackage_Ptr & data_r )
{
//SEC << "[SrcPackage]" << data_r << endl;
+ ++_stats.srcp;
_consumer.consumeSourcePackage( _repositoryId, data_r );
}
void consumePat( const data::Pattern_Ptr & data_r )
{
//SEC << "[Pattern]" << data_r << endl;
+ ++_stats.patt;
_consumer.consumePattern( _repositoryId, data_r );
}
//@}
@@ -166,6 +170,14 @@
/** Translations processed by \ref parseLocaleIf so far.*/
std::set<Locale> _parsedLocales;
+
+ struct Stats {
+ DefaultIntegral prod;
+ DefaultIntegral patt;
+ DefaultIntegral pack;
+ DefaultIntegral srcp;
+ };
+ Stats _stats;
};
///////////////////////////////////////////////////////////////////
@@ -238,6 +250,12 @@
// Done
if ( ! _ticks.toMax() )
ZYPP_THROW( AbortRequestException() );
+
+ MIL << "DONE " << reporoot_r << "("
+ << _stats.prod << " products, "
+ << _stats.patt << " patterns, "
+ << _stats.pack << " packages, "
+ << _stats.srcp << " srcpackages)" << endl;
}
///////////////////////////////////////////////////////////////////
//
Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/cached/RepoImpl.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/cached/RepoImpl.cc?rev=5845&r1=5844&r2=5845&view=diff
==============================================================================
--- branches/REFACTORING-10_3/libzypp/zypp/repo/cached/RepoImpl.cc (original)
+++ branches/REFACTORING-10_3/libzypp/zypp/repo/cached/RepoImpl.cc Tue Jun 26 14:01:02 2007
@@ -19,6 +19,7 @@
#include "zypp/Package.h"
#include "zypp/SrcPackage.h"
+#include "zypp/Product.h"
#include "zypp/Pattern.h"
#include "zypp/Patch.h"
#include "zypp/Message.h"
@@ -28,6 +29,7 @@
#include "zypp/repo/cached/RepoImpl.h"
#include "zypp/repo/cached/PackageImpl.h"
#include "zypp/repo/cached/SrcPackageImpl.h"
+#include "zypp/repo/cached/ProductImpl.h"
#include "zypp/repo/cached/PatternImpl.h"
#include "zypp/repo/cached/PatchImpl.h"
#include "zypp/repo/cached/MessageImpl.h"
@@ -111,43 +113,49 @@
{
ResImplTraitscached::PackageImpl::Ptr impl = new cached::PackageImpl(it->first, this);
Package::Ptr package = detail::makeResolvableFromImpl( it->second.second, impl );
- _store.insert (package);
+ _store.insert( package );
}
else if ( it->second.first == ResTraits<SrcPackage>::kind )
{
ResImplTraitscached::SrcPackageImpl::Ptr impl = new cached::SrcPackageImpl(it->first, this);
SrcPackage::Ptr srcpackage = detail::makeResolvableFromImpl( it->second.second, impl );
- _store.insert (srcpackage);
+ _store.insert( srcpackage );
+ }
+ else if ( it->second.first == ResTraits<Product>::kind )
+ {
+ ResImplTraitscached::ProductImpl::Ptr impl = new cached::ProductImpl(it->first, this);
+ Product::Ptr product = detail::makeResolvableFromImpl( it->second.second, impl );
+ _store.insert( product );
}
else if ( it->second.first == ResTraits<Pattern>::kind )
{
ResImplTraitscached::PatternImpl::Ptr impl = new cached::PatternImpl(it->first, this);
Pattern::Ptr pattern = detail::makeResolvableFromImpl( it->second.second, impl );
- _store.insert (pattern);
+ _store.insert( pattern );
}
else if ( it->second.first == ResTraits<Patch>::kind )
{
ResImplTraitscached::PatchImpl::Ptr impl = new cached::PatchImpl(it->first, this);
Patch::Ptr patch = detail::makeResolvableFromImpl( it->second.second, impl );
- _store.insert (patch);
+ _store.insert( patch );
}
else if ( it->second.first == ResTraits<Message>::kind )
{
ResImplTraitscached::MessageImpl::Ptr impl = new cached::MessageImpl(it->first, this);
Message::Ptr message = detail::makeResolvableFromImpl( it->second.second, impl );
- _store.insert (message);
+ _store.insert( message );
}
else if ( it->second.first == ResTraits<Script>::kind )
{
ResImplTraitscached::ScriptImpl::Ptr impl = new cached::ScriptImpl(it->first, this);
Script::Ptr script = detail::makeResolvableFromImpl( it->second.second, impl );
- _store.insert (script);
+ _store.insert( script );
}
else if ( it->second.first == ResTraits<Atom>::kind )
{
ResImplTraitscached::AtomImpl::Ptr impl = new cached::AtomImpl(it->first, this);
Atom::Ptr atom = detail::makeResolvableFromImpl( it->second.second, impl );
- _store.insert (atom);
+ _store.insert( atom );
}
}
con.executenonquery("COMMIT;");
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
