Author: dmacvicar Date: Wed May 30 15:20:25 2007 New Revision: 5646 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5646&view=rev Log: - add some ResObject doc - install a ResolvableQuery inside the cached Package Impl. to get the attributes on the fly. - remove some old cache classes I hate. - Fix a bug in filechecker found by the testsuite. - Make the Digest callbacks return FALSE by default. Removed: trunk/libzypp/zypp2/cache/CachedResolvableDataProvider.cc trunk/libzypp/zypp2/cache/CachedResolvableDataProvider.h trunk/libzypp/zypp2/cache/CapabilityQuery.cc trunk/libzypp/zypp2/cache/CapabilityQuery.h trunk/libzypp/zypp2/cache/QueryFactory.cc trunk/libzypp/zypp2/cache/QueryFactory.h trunk/libzypp/zypp2/cache/sqlite_detail/ Modified: trunk/libzypp/CMakeLists.txt trunk/libzypp/zypp/CMakeLists.txt trunk/libzypp/zypp/Digest.cc trunk/libzypp/zypp/FileChecker.cc trunk/libzypp/zypp/ResObject.h trunk/libzypp/zypp2/CMakeLists.txt trunk/libzypp/zypp2/cache/CacheStore.cpp trunk/libzypp/zypp2/repository/cached/CachedRepositoryImpl.cc trunk/libzypp/zypp2/repository/cached/CachedRepositoryImpl.h trunk/libzypp/zypp2/repository/cached/CachedRepositoryPackageImpl.cc trunk/libzypp/zypp2/repository/cached/CachedRepositoryPackageImpl.h trunk/libzypp/zypp2/repository/cached/CachedSourcePackageImpl.cc Modified: trunk/libzypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/CMakeLists.txt?rev=5646&r1=5645&r2=5646&view=diff ============================================================================== --- trunk/libzypp/CMakeLists.txt (original) +++ trunk/libzypp/CMakeLists.txt Wed May 30 15:20:25 2007 @@ -183,7 +183,8 @@ # INCLUDES # #################################################################### -INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) +SET (CMAKE_INCLUDE_DIRECTORIES_BEFORE ON) +INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} SYSTEM ) #################################################################### # OTHERS # Modified: trunk/libzypp/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/CMakeLists.txt?rev=5646&r1=5645&r2=5646&view=diff ============================================================================== --- trunk/libzypp/zypp/CMakeLists.txt (original) +++ trunk/libzypp/zypp/CMakeLists.txt Wed May 30 15:20:25 2007 @@ -2,7 +2,7 @@ # INCLUDES # #################################################################### -INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) #################################################################### # SOURCES # Modified: trunk/libzypp/zypp/Digest.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Digest.cc?rev=5646&r1=5645&r2=5646&view=diff ============================================================================== --- trunk/libzypp/zypp/Digest.cc (original) +++ trunk/libzypp/zypp/Digest.cc Wed May 30 15:20:25 2007 @@ -27,13 +27,13 @@ namespace zypp { bool DigestReport::askUserToAcceptNoDigest( const zypp::Pathname &file ) - { return true; } + { return false; } bool DigestReport::askUserToAccepUnknownDigest( const Pathname &file, const std::string &name ) - { return true; } + { return false; } bool DigestReport::askUserToAcceptWrongDigest( const Pathname &file, const std::string &requested, const std::string &found ) - { return true; } + { return false; } // private data Modified: trunk/libzypp/zypp/FileChecker.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/FileChecker.cc?rev=5646&r1=5645&r2=5646&view=diff ============================================================================== --- trunk/libzypp/zypp/FileChecker.cc (original) +++ trunk/libzypp/zypp/FileChecker.cc Wed May 30 15:20:25 2007 @@ -47,7 +47,7 @@ } else { - if ( (real_checksum == _checksum) ) + if ( (real_checksum != _checksum) ) { if ( report->askUserToAcceptWrongDigest( file, _checksum.checksum(), real_checksum.checksum() ) ) { Modified: trunk/libzypp/zypp/ResObject.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResObject.h?rev=5646&r1=5645&r2=5646&view=diff ============================================================================== --- trunk/libzypp/zypp/ResObject.h (original) +++ trunk/libzypp/zypp/ResObject.h Wed May 30 15:20:25 2007 @@ -33,7 +33,10 @@ // // CLASS NAME : ResObject // - /** Interface base for resolvable objects (common data). + /** + * Interface base for resolvable objects (common data). + * That is, all data not needed for solving, but common + * across al Resolvable kinds. */ class ResObject : public Resolvable { @@ -45,22 +48,46 @@ typedef TraitsType::constPtrType constPtr; public: - /** */ + /** + * \short Short text describing the resolvable. + * This attribute is usually displayed in columns. + */ Text summary() const; - /** */ + /** + * \short Long text describing the resolvable. + */ Text description() const; - /** */ + /** + * \short Installation Notification + * + * This text can be used to tell the user some notes + * When he selects the resovable for installation. + */ Text insnotify() const; - /** */ + /** + * \short De-Installation Notification + * + * This text can be used to tell the user some notes + * When he selects the resovable for deinstall. + */ Text delnotify() const; - /** */ + /** + * \short License or agreement to accept + * + * Agreement, warning or license the user should + * accept before installing the resolvable. + */ Text licenseToConfirm() const; - /** */ + /** + * \short Vendor + * + * For Example "Novell Inc." + */ Vendor vendor() const; /** Installed size. */ @@ -69,30 +96,43 @@ /** Size of the rpm package. */ ByteCount archivesize() const; - /** Backlink to the source providing this. */ + /** + * Source providing this resolvable + */ Source_Ref source() const; - /** Number of the source media that provides the data - * required for installation. Zero, if no media access - * is required. + /** + * Media number where the resolvable is located + * 0 if no media access is required. */ unsigned sourceMediaNr() const; - /** Use sourceMediaNr */ + /** + * \deprecated Use sourceMediaNr + */ ZYPP_DEPRECATED unsigned mediaId() const { return sourceMediaNr(); } - /** */ + /** + * \TODO FIXME what is this? + */ bool installOnly() const; - /** */ + /** + * \short build time of the resolvable + */ Date buildtime() const; - /** Time of installation, or \c 0 */ + /** + * \short Installation time + * 0 if the resolvable is not installed. + */ Date installtime() const; - /** */ - ZmdId zmdid () const; + /** + * \deprecated No replacement. + */ + ZYPP_DEPRECATED ZmdId zmdid () const; protected: /** Ctor */ Modified: trunk/libzypp/zypp2/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/CMakeLists.txt?rev=5646&r1=5645&r2=5646&view=diff ============================================================================== --- trunk/libzypp/zypp2/CMakeLists.txt (original) +++ trunk/libzypp/zypp2/CMakeLists.txt Wed May 30 15:20:25 2007 @@ -38,12 +38,7 @@ ${CMAKE_BINARY_DIR}/zypp2/schema.h cache/CacheInitializer.cpp cache/CacheTypes.cc -# cache/QueryFactory.cc -# cache/CapabilityQuery.cc cache/ResolvableQuery.cc -# cache/CachedResolvableDataProvider.cc -# cache/sqlite_detail/CapabilityQueryImpl.cc -# cache/sqlite_detail/QueryFactoryImpl.cc cache/CacheStore.cpp cache/CacheFSCK.cc cache/Utils.cpp @@ -56,10 +51,7 @@ cache/CacheStore.h cache/CacheFSCK.h cache/ResolvableQuery.h -# cache/CapablityQuery.h -# cache/QueryFactory.h cache/Utils.h -# cache/CachedResolvableDataProvider.h ) #INSTALL( FILES Modified: trunk/libzypp/zypp2/cache/CacheStore.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/cache/CacheStore.cpp?rev=5646&r1=5645&r2=5646&view=diff ============================================================================== --- trunk/libzypp/zypp2/cache/CacheStore.cpp (original) +++ trunk/libzypp/zypp2/cache/CacheStore.cpp Wed May 30 15:20:25 2007 @@ -184,6 +184,14 @@ _pimpl->con.executenonquery("COMMIT;"); } +void CacheStore::consumeResObject( const data::RecordId &rid, data::ResObject_Ptr res ) +{ + appendTranslatedStringAttribute( rid, "ResObject", "description", res->description ); + appendTranslatedStringAttribute( rid, "ResObject", "summary", res->summary ); + appendNumericAttribute( rid, "ResObject", "installedSize", res->installedSize ); + appendNumericAttribute( rid, "ResObject", "buildTime", res->buildTime ); +} + void CacheStore::consumePackage( const RecordId &repository_id, data::Package_Ptr package ) { RecordId pkgid = appendResolvable( repository_id, ResTraits<Package>::kind, NVRA( package->name, package->edition, package->arch ), package->deps ); @@ -298,15 +306,6 @@ // be needed } - -void CacheStore::consumeResObject( const data::RecordId &rid, data::ResObject_Ptr res ) -{ - appendTranslatedStringAttribute( rid, "ResObject", "description", res->description ); - appendTranslatedStringAttribute( rid, "ResObject", "summary", res->summary ); - appendNumericAttribute( rid, "ResObject", "installedSize", res->installedSize ); - appendNumericAttribute( rid, "ResObject", "buildTime", res->buildTime ); -} - RecordId CacheStore::appendResolvable( const RecordId &repository_id, const Resolvable::Kind &kind, const NVRA &nvra, Modified: trunk/libzypp/zypp2/repository/cached/CachedRepositoryImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/repository/cached/CachedRepositoryImpl.cc?rev=5646&r1=5645&r2=5646&view=diff ============================================================================== --- trunk/libzypp/zypp2/repository/cached/CachedRepositoryImpl.cc (original) +++ trunk/libzypp/zypp2/repository/cached/CachedRepositoryImpl.cc Wed May 30 15:20:25 2007 @@ -12,12 +12,9 @@ #include "zypp/base/Logger.h" #include "zypp/base/Measure.h" - -#include "zypp2/cache/QueryFactory.h" -#include "zypp2/cache/CapabilityQuery.h" -#include "zypp2/cache/sqlite_detail/CacheSqlite.h" +#include "zypp/capability/Capabilities.h" +#include "zypp2/cache/ResolvableQuery.h" #include "zypp2/cache/CacheCommon.h" -#include "zypp2/cache/sqlite_detail/QueryFactoryImpl.h" #include "zypp/detail/ResImplTraits.h" #include "zypp/CapFactory.h" @@ -43,7 +40,8 @@ CachedRepositoryImpl::CachedRepositoryImpl( const Pathname &dbdir, const data::RecordId &repository_id ) : _dbdir(dbdir), _type_cache(dbdir), - _repository_id(repository_id) + _repository_id(repository_id), + _rquery(dbdir) { } @@ -96,7 +94,7 @@ for ( map::const_iterator it = nvras.begin(); it != nvras.end(); ++it ) { - ResImplTraits<CachedRepositoryPackageImpl>::Ptr impl = new CachedRepositoryPackageImpl(selfRepository()); + ResImplTraits<CachedRepositoryPackageImpl>::Ptr impl = new CachedRepositoryPackageImpl(it->first, this); Package::Ptr package = detail::makeResolvableFromImpl( it->second, impl ); _store.insert (package); } @@ -109,6 +107,12 @@ } + +ResolvableQuery CachedRepositoryImpl::resolvableQuery() +{ + return _rquery; +} + void CachedRepositoryImpl::read_capabilities( sqlite3_connection &con, map &nvras ) { CapFactory capfactory; Modified: trunk/libzypp/zypp2/repository/cached/CachedRepositoryImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/repository/cached/CachedRepositoryImpl.h?rev=5646&r1=5645&r2=5646&view=diff ============================================================================== --- trunk/libzypp/zypp2/repository/cached/CachedRepositoryImpl.h (original) +++ trunk/libzypp/zypp2/repository/cached/CachedRepositoryImpl.h Wed May 30 15:20:25 2007 @@ -18,11 +18,9 @@ #include "zypp/data/RecordId.h" #include "zypp2/repository/RepositoryImpl.h" #include "zypp/ResStore.h" - -#include #include "zypp2/cache/sqlite3x/sqlite3x.hpp" - #include "zypp2/cache/CacheTypes.h" +#include "zypp2/cache/ResolvableQuery.h" /////////////////////////////////////////////////////////////////// namespace zypp @@ -52,6 +50,9 @@ ~CachedRepositoryImpl(); public: + + cache::ResolvableQuery resolvableQuery(); + /** String identifying the type of the source. */ static std::string typeString() { return "CachedSource"; } @@ -88,6 +89,8 @@ cache::CacheTypes _type_cache; data::RecordId _repository_id; + + cache::ResolvableQuery _rquery; }; /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp2/repository/cached/CachedRepositoryPackageImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/repository/cached/CachedRepositoryPackageImpl.cc?rev=5646&r1=5645&r2=5646&view=diff ============================================================================== --- trunk/libzypp/zypp2/repository/cached/CachedRepositoryPackageImpl.cc (original) +++ trunk/libzypp/zypp2/repository/cached/CachedRepositoryPackageImpl.cc Wed May 30 15:20:25 2007 @@ -13,13 +13,13 @@ #include "zypp/TranslatedText.h" #include "zypp/base/String.h" #include "zypp/base/Logger.h" -#include "zypp2/cache/CachedResolvableDataProvider.h" #include "zypp2/repository/RepositoryImpl.h" #include "CachedRepositoryPackageImpl.h" using namespace std; using namespace zypp::detail; +using zypp::repository::cached::CachedRepositoryImpl; /////////////////////////////////////////////////////////////////// namespace zypp @@ -33,61 +33,62 @@ /** Default ctor */ -CachedRepositoryPackageImpl::CachedRepositoryPackageImpl (Repository repository_r) +CachedRepositoryPackageImpl::CachedRepositoryPackageImpl (const data::RecordId &id, repository::cached::CachedRepositoryImpl::Ptr repository_r) : _repository (repository_r) , _install_only(false) , _size_installed(0) , _size_archive(0) , _data_loaded(false) + , _id(id) {} Repository CachedRepositoryPackageImpl::repository() const { - return _repository; + return _repository->selfRepository(); } /** Package summary */ TranslatedText CachedRepositoryPackageImpl::summary() const { - return _summary; + return _repository->resolvableQuery().queryTranslatedStringAttribute( _id, "ResObject", "summary" ); } /** Package description */ TranslatedText CachedRepositoryPackageImpl::description() const { - return _description; + return _repository->resolvableQuery().queryTranslatedStringAttribute( _id, "ResObject", "description" ); } PackageGroup CachedRepositoryPackageImpl::group() const { - return _group; + return _repository->resolvableQuery().queryStringAttribute( _id, "Package", "group" ); } Pathname CachedRepositoryPackageImpl::location() const { - return _location; + return _repository->resolvableQuery().queryStringAttribute( _id, "Package", "group" ); } ByteCount CachedRepositoryPackageImpl::size() const { - return _size_installed; + return _repository->resolvableQuery().queryNumericAttribute( _id, "ResObject", "size" ); } /** */ ByteCount CachedRepositoryPackageImpl::archivesize() const { - return _size_archive; + return _repository->resolvableQuery().queryNumericAttribute( _id, "ResObject", "archivesize" ); } bool CachedRepositoryPackageImpl::installOnly() const { - return _install_only; + return _repository->resolvableQuery().queryNumericAttribute( _id, "ResObject", "installOnly" ); } unsigned CachedRepositoryPackageImpl::repositoryMediaNr() const { - return _media_nr; + return _repository->resolvableQuery().queryNumericAttribute( _id, "ResObject", "repositoryMediaNr" ); } Vendor CachedRepositoryPackageImpl::vendor() const Modified: trunk/libzypp/zypp2/repository/cached/CachedRepositoryPackageImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/repository/cached/CachedRepositoryPackageImpl.h?rev=5646&r1=5645&r2=5646&view=diff ============================================================================== --- trunk/libzypp/zypp2/repository/cached/CachedRepositoryPackageImpl.h (original) +++ trunk/libzypp/zypp2/repository/cached/CachedRepositoryPackageImpl.h Wed May 30 15:20:25 2007 @@ -13,8 +13,7 @@ #define CachedRepositoryPackageImpl_H #include "zypp/detail/PackageImpl.h" -#include "zypp2/Repository.h" -//#include +#include "zypp2/repository/cached/CachedRepositoryImpl.h" /////////////////////////////////////////////////////////////////// namespace zypp @@ -28,7 +27,7 @@ { public: - CachedRepositoryPackageImpl( Repository repository_r ); + CachedRepositoryPackageImpl( const data::RecordId &id, repository::cached::CachedRepositoryImpl::Ptr repository_r ); virtual TranslatedText summary() const; virtual TranslatedText description() const; @@ -42,7 +41,7 @@ virtual Vendor vendor() const; protected: - Repository _repository; + repository::cached::CachedRepositoryImpl::Ptr _repository; TranslatedText _summary; TranslatedText _description; PackageGroup _group; @@ -54,6 +53,7 @@ ByteCount _size_archive; bool _data_loaded; + data::RecordId _id; }; ///////////////////////////////////////////////////////////////// } // namespace zypp Modified: trunk/libzypp/zypp2/repository/cached/CachedSourcePackageImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/repository/cached/CachedSourcePackageImpl.cc?rev=5646&r1=5645&r2=5646&view=diff ============================================================================== --- trunk/libzypp/zypp2/repository/cached/CachedSourcePackageImpl.cc (original) +++ trunk/libzypp/zypp2/repository/cached/CachedSourcePackageImpl.cc Wed May 30 15:20:25 2007 @@ -15,7 +15,6 @@ #include "zypp/TranslatedText.h" #include "zypp/base/String.h" #include "zypp/base/Logger.h" -#include "zypp2/cache/CachedResolvableDataProvider.h" using namespace std; using namespace zypp::detail; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org