Author: mlandres Date: Fri Jul 13 14:49:04 2007 New Revision: 6004 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6004&view=rev Log: Clean ResObject::archiveSize artefacts; fix target store Modified: branches/REFACTORING-10_3/libzypp/zypp/cache/CacheAttributes.h branches/REFACTORING-10_3/libzypp/zypp/parser/xmlstore/XMLParserData.h branches/REFACTORING-10_3/libzypp/zypp/parser/xmlstore/XMLResObjectParser.cc branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PatternImpl.cc branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PatternImpl.h branches/REFACTORING-10_3/libzypp/zypp/repo/memory/MessageImpl.h branches/REFACTORING-10_3/libzypp/zypp/repo/memory/PatchImpl.cc branches/REFACTORING-10_3/libzypp/zypp/repo/memory/PatternImpl.cc branches/REFACTORING-10_3/libzypp/zypp/repo/memory/ProductImpl.cc branches/REFACTORING-10_3/libzypp/zypp/solver/detail/ResolverContext.cc branches/REFACTORING-10_3/libzypp/zypp/target/CommitPackageCacheReadAhead.cc branches/REFACTORING-10_3/libzypp/zypp/target/store/XMLFilesBackend.cc branches/REFACTORING-10_3/libzypp/zypp/target/store/serialize.cc branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLAtomImpl.h branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLMessageImpl.h branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLPatchImpl.h branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLPatternImpl.h branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLProductImpl.h branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLScriptImpl.h branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLSelectionImpl.h Modified: branches/REFACTORING-10_3/libzypp/zypp/cache/CacheAttributes.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/cache/CacheAttributes.h?rev=6004&r1=6003&r2=6004&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/cache/CacheAttributes.h (original) +++ branches/REFACTORING-10_3/libzypp/zypp/cache/CacheAttributes.h Fri Jul 13 14:49:04 2007 @@ -80,7 +80,6 @@ inline const Attribute & attrProductShortName() { static Attribute a("Product","shortName"); return a; } inline const Attribute & attrProductUpdateUrls() { static Attribute a("Product","updateUrls"); return a; } /////////////////////////////////////////////////////////////////// - inline const Attribute & attrResObjectArchiveSize() { static Attribute a("ResObject","archiveSize"); return a; } inline const Attribute & attrResObjectBuildTime() { static Attribute a("ResObject","buildTime"); return a; } inline const Attribute & attrResObjectDelnotify() { static Attribute a("ResObject","delnotify", Attribute::SHARED); return a; } inline const Attribute & attrResObjectDescription() { static Attribute a("ResObject","description", Attribute::SHARED); return a; } Modified: branches/REFACTORING-10_3/libzypp/zypp/parser/xmlstore/XMLParserData.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/parser/xmlstore/XMLParserData.h?rev=6004&r1=6003&r2=6004&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/parser/xmlstore/XMLParserData.h (original) +++ branches/REFACTORING-10_3/libzypp/zypp/parser/xmlstore/XMLParserData.h Fri Jul 13 14:49:04 2007 @@ -77,7 +77,7 @@ TranslatedText license_to_confirm; std::string vendor; ByteCount size; - ByteCount archive_size; + ByteCount downloadSize; bool install_only; Date build_time; Date install_time; Modified: branches/REFACTORING-10_3/libzypp/zypp/parser/xmlstore/XMLResObjectParser.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/parser/xmlstore/XMLResObjectParser.cc?rev=6004&r1=6003&r2=6004&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/parser/xmlstore/XMLResObjectParser.cc (original) +++ branches/REFACTORING-10_3/libzypp/zypp/parser/xmlstore/XMLResObjectParser.cc Fri Jul 13 14:49:04 2007 @@ -83,7 +83,7 @@ dataPtr->size = str::strtonumByteCount::SizeType(_helper.content(child)); } else if (name == "archive-size") { - dataPtr->archive_size = str::strtonumByteCount::SizeType(_helper.content(child)); + dataPtr->downloadSize = str::strtonumByteCount::SizeType(_helper.content(child)); } else if (name == "install-only") { dataPtr->install_only = (_helper.content(child) == "true") ? true : false; Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PatternImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PatternImpl.cc?rev=6004&r1=6003&r2=6004&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PatternImpl.cc (original) +++ branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PatternImpl.cc Fri Jul 13 14:49:04 2007 @@ -84,11 +84,6 @@ return _repository->resolvableQuery().queryNumericAttribute( _id, cache::attrResObjectInstalledSize() ); } -ByteCount PatternImpl::archivesize() const -{ - return _repository->resolvableQuery().queryNumericAttribute( _id, cache::attrResObjectArchiveSize() ); -} - bool PatternImpl::installOnly() const { return _repository->resolvableQuery().queryBooleanAttribute( _id, cache::attrResObjectInstallOnly() ); Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PatternImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PatternImpl.h?rev=6004&r1=6003&r2=6004&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PatternImpl.h (original) +++ branches/REFACTORING-10_3/libzypp/zypp/repo/cached/PatternImpl.h Fri Jul 13 14:49:04 2007 @@ -30,7 +30,7 @@ public: PatternImpl( const data::RecordId &id, repo::cached::RepoImpl::Ptr repository_r ); - + virtual TranslatedText summary() const; virtual TranslatedText description() const; virtual TranslatedText insnotify() const; @@ -38,13 +38,12 @@ virtual TranslatedText licenseToConfirm() const; virtual Vendor vendor() const; virtual ByteCount size() const; - virtual ByteCount archivesize() const; virtual bool installOnly() const; virtual Date buildtime() const; virtual Date installtime() const; - + virtual unsigned mediaNr() const; - + // PATTERN virtual bool isDefault() const; virtual bool userVisible() const; @@ -55,10 +54,10 @@ //virtual std::setstd::string install_packages( const Locale & lang = Locale("") ) const; // virtual const CapSet & includes() const; // virtual const CapSet & extends() const; - - + + virtual Repository repository() const; - + private: repo::cached::RepoImpl::Ptr _repository; data::RecordId _id; Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/memory/MessageImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/memory/MessageImpl.h?rev=6004&r1=6003&r2=6004&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/repo/memory/MessageImpl.h (original) +++ branches/REFACTORING-10_3/libzypp/zypp/repo/memory/MessageImpl.h Fri Jul 13 14:49:04 2007 @@ -30,7 +30,7 @@ public: MessageImpl( memory::RepoImpl::Ptr repo, data::Message_Ptr ptr); - + virtual TranslatedText summary() const; virtual TranslatedText description() const; virtual TranslatedText insnotify() const; @@ -41,16 +41,16 @@ virtual bool installOnly() const; virtual Date buildtime() const; virtual Date installtime() const; - + // MESSAGE virtual TranslatedText text() const; virtual Patch::constPtr patch() const; - + virtual Repository repository() const; - + protected: repo::memory::RepoImpl::Ptr _repository; - + //ResObject TranslatedText _summary; TranslatedText _description; @@ -59,11 +59,10 @@ TranslatedText _license_to_confirm; Vendor _vendor; ByteCount _size; - ByteCount _archivesize; bool _install_only; Date _buildtime; Date _installtime; - + TranslatedText _text; }; ///////////////////////////////////////////////////////////////// Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/memory/PatchImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/memory/PatchImpl.cc?rev=6004&r1=6003&r2=6004&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/repo/memory/PatchImpl.cc (original) +++ branches/REFACTORING-10_3/libzypp/zypp/repo/memory/PatchImpl.cc Fri Jul 13 14:49:04 2007 @@ -30,10 +30,8 @@ _license_to_confirm(ptr->licenseToConfirm), _vendor(ptr->vendor), _size(ptr->installedSize), - //_archivesize(ptr->repositoryLocation.fileSize), _install_only(false), _buildtime(ptr->buildTime), - //_media_nr(ptr->repositoryLocation.mediaNr), _patch_id(ptr->id), _timestamp(ptr->timestamp), Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/memory/PatternImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/memory/PatternImpl.cc?rev=6004&r1=6003&r2=6004&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/repo/memory/PatternImpl.cc (original) +++ branches/REFACTORING-10_3/libzypp/zypp/repo/memory/PatternImpl.cc Fri Jul 13 14:49:04 2007 @@ -29,10 +29,8 @@ _license_to_confirm(ptr->licenseToConfirm), _vendor(ptr->vendor), _size(ptr->installedSize), - //_archivesize(ptr->repositoryLocation.fileSize), _install_only(false), _buildtime(ptr->buildTime) - //_media_nr(ptr->repositoryLocation.mediaNr) //TODO pattern attrs { Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/memory/ProductImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/memory/ProductImpl.cc?rev=6004&r1=6003&r2=6004&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/repo/memory/ProductImpl.cc (original) +++ branches/REFACTORING-10_3/libzypp/zypp/repo/memory/ProductImpl.cc Fri Jul 13 14:49:04 2007 @@ -30,10 +30,8 @@ _license_to_confirm(ptr->licenseToConfirm), _vendor(ptr->vendor), _size(ptr->installedSize), - //_archivesize(ptr->repositoryLocation.fileSize), _install_only(false), _buildtime(ptr->buildTime) - //_media_nr(ptr->repositoryLocation.mediaNr) // TODO products attrs {} Modified: branches/REFACTORING-10_3/libzypp/zypp/solver/detail/ResolverContext.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/solver/detail/ResolverContext.cc?rev=6004&r1=6003&r2=6004&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/solver/detail/ResolverContext.cc (original) +++ branches/REFACTORING-10_3/libzypp/zypp/solver/detail/ResolverContext.cc Fri Jul 13 14:49:04 2007 @@ -291,7 +291,7 @@ Package::constPtr pkg = asKind<Package>(res); // try to access it as a package if (pkg) { // if its !=NULL, get size information - _download_size += pkg->archivesize(); + _download_size += pkg->downloadSize(); _install_size += pkg->size(); } @@ -393,7 +393,7 @@ pkg = asKind<Package>(res); // try to access it as a package if (pkg) { // if its !=NULL, get size information - _download_size += pkg->archivesize(); + _download_size += pkg->downloadSize(); _install_size += pkg->size(); } Modified: branches/REFACTORING-10_3/libzypp/zypp/target/CommitPackageCacheReadAhead.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/target/CommitPackageCacheReadAhead.cc?rev=6004&r1=6003&r2=6004&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/target/CommitPackageCacheReadAhead.cc (original) +++ branches/REFACTORING-10_3/libzypp/zypp/target/CommitPackageCacheReadAhead.cc Fri Jul 13 14:49:04 2007 @@ -112,7 +112,7 @@ if ( _cacheMap.find( *it ) == _cacheMap.end() ) { addToCache[*it]; - addSize += it->resolvable()->archivesize(); + addSize += it->resolvable()->downloadSize(); } } } Modified: branches/REFACTORING-10_3/libzypp/zypp/target/store/XMLFilesBackend.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/target/store/XMLFilesBackend.cc?rev=6004&r1=6003&r2=6004&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/target/store/XMLFilesBackend.cc (original) +++ branches/REFACTORING-10_3/libzypp/zypp/target/store/XMLFilesBackend.cc Fri Jul 13 14:49:04 2007 @@ -808,7 +808,7 @@ impl->_delete_notify = parsed.delete_notify; impl->_license_to_confirm = parsed.license_to_confirm; impl->_size = parsed.size; - impl->_archive_size = parsed.archive_size; + impl->_downloadSize = parsed.downloadSize; impl->_install_only = parsed.install_only; impl->_build_time = parsed.build_time; impl->_install_time = parsed.install_time; @@ -898,7 +898,7 @@ impl->_delete_notify = parsed.delete_notify; impl->_license_to_confirm = parsed.license_to_confirm; impl->_size = parsed.size; - impl->_archive_size = parsed.archive_size; + impl->_downloadSize = parsed.downloadSize; impl->_install_only = parsed.install_only; impl->_build_time = parsed.build_time; impl->_install_time = parsed.install_time; @@ -933,7 +933,7 @@ impl->_delete_notify = parsed.delete_notify; impl->_license_to_confirm = parsed.license_to_confirm; impl->_size = parsed.size; - impl->_archive_size = parsed.archive_size; + impl->_downloadSize = parsed.downloadSize; impl->_install_only = parsed.install_only; impl->_build_time = parsed.build_time; impl->_install_time = parsed.install_time; @@ -985,7 +985,7 @@ impl->_delete_notify = parsed.delete_notify; impl->_license_to_confirm = parsed.license_to_confirm; impl->_size = parsed.size; - impl->_archive_size = parsed.archive_size; + impl->_downloadSize = parsed.downloadSize; impl->_install_only = parsed.install_only; impl->_build_time = parsed.build_time; impl->_install_time = parsed.install_time; @@ -1040,7 +1040,7 @@ impl->_delete_notify = parsed.delete_notify; impl->_license_to_confirm = parsed.license_to_confirm; impl->_size = parsed.size; - impl->_archive_size = parsed.archive_size; + impl->_downloadSize = parsed.downloadSize; impl->_install_only = parsed.install_only; impl->_build_time = parsed.build_time; impl->_install_time = parsed.install_time; @@ -1182,7 +1182,7 @@ impl->_delete_notify = parsed.delete_notify; impl->_license_to_confirm = parsed.license_to_confirm; impl->_size = parsed.size; - impl->_archive_size = parsed.archive_size; + impl->_downloadSize = parsed.downloadSize; impl->_install_only = parsed.install_only; impl->_build_time = parsed.build_time; impl->_install_time = parsed.install_time; @@ -1224,7 +1224,7 @@ impl->_delete_notify = parsed.delete_notify; impl->_license_to_confirm = parsed.license_to_confirm; impl->_size = parsed.size; - impl->_archive_size = parsed.archive_size; + impl->_downloadSize = parsed.downloadSize; impl->_install_only = parsed.install_only; impl->_build_time = parsed.build_time; impl->_install_time = parsed.install_time; Modified: branches/REFACTORING-10_3/libzypp/zypp/target/store/serialize.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/target/store/serialize.cc?rev=6004&r1=6003&r2=6004&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/target/store/serialize.cc (original) +++ branches/REFACTORING-10_3/libzypp/zypp/target/store/serialize.cc Fri Jul 13 14:49:04 2007 @@ -186,7 +186,7 @@ out << translatedTextToXML(pipp->licenseToConfirm(), "license-to-confirm"); out << " <vendor>" << xml_escape(obj->vendor()) << "</vendor>" << endl; out << " <size>" << static_castByteCount::SizeType(obj->size()) << "</size>" << endl; - out << " <archive-size>" << static_castByteCount::SizeType(obj->archivesize()) << "</archive-size>" << endl; + out << " <archive-size>" << static_castByteCount::SizeType(obj->downloadSize()) << "</archive-size>" << endl; out << " <install-only>" << ( obj->installOnly() ? "true" : "false" ) << "</install-only>" << endl; out << " <build-time>" << obj->buildtime().asSeconds() << "</build-time>" << endl; // we assume we serialize on storeObject, set install time to NOW Modified: branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLAtomImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLAtomImpl.h?rev=6004&r1=6003&r2=6004&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLAtomImpl.h (original) +++ branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLAtomImpl.h Fri Jul 13 14:49:04 2007 @@ -47,8 +47,8 @@ { return _vendor; } virtual ByteCount size() const { return _size; } - virtual ByteCount archivesize() const - { return _archive_size; } + virtual ByteCount downloadSize() const + { return _downloadSize; } virtual unsigned sourceMediaNr() const { return 0; } virtual bool installOnly() const @@ -66,7 +66,7 @@ TranslatedText _license_to_confirm; std::string _vendor; ByteCount _size; - ByteCount _archive_size; + ByteCount _downloadSize; bool _install_only; Date _build_time; Date _install_time; Modified: branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLMessageImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLMessageImpl.h?rev=6004&r1=6003&r2=6004&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLMessageImpl.h (original) +++ branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLMessageImpl.h Fri Jul 13 14:49:04 2007 @@ -48,8 +48,8 @@ { return _vendor; } virtual ByteCount size() const { return _size; } - virtual ByteCount archivesize() const - { return _archive_size; } + virtual ByteCount downloadSize() const + { return _downloadSize; } virtual unsigned sourceMediaNr() const { return 0; } virtual bool installOnly() const @@ -73,7 +73,7 @@ TranslatedText _license_to_confirm; std::string _vendor; ByteCount _size; - ByteCount _archive_size; + ByteCount _downloadSize; bool _install_only; Date _build_time; Date _install_time; Modified: branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLPatchImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLPatchImpl.h?rev=6004&r1=6003&r2=6004&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLPatchImpl.h (original) +++ branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLPatchImpl.h Fri Jul 13 14:49:04 2007 @@ -44,8 +44,8 @@ { return _vendor; } virtual ByteCount size() const { return _size; } - virtual ByteCount archivesize() const - { return _archive_size; } + virtual ByteCount downloadSize() const + { return _downloadSize; } virtual unsigned sourceMediaNr() const { return 0; } virtual bool installOnly() const @@ -83,7 +83,7 @@ TranslatedText _license_to_confirm; std::string _vendor; ByteCount _size; - ByteCount _archive_size; + ByteCount _downloadSize; bool _install_only; Date _build_time; Date _install_time; Modified: branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLPatternImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLPatternImpl.h?rev=6004&r1=6003&r2=6004&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLPatternImpl.h (original) +++ branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLPatternImpl.h Fri Jul 13 14:49:04 2007 @@ -47,8 +47,8 @@ { return _vendor; } virtual ByteCount size() const { return _size; } - virtual ByteCount archivesize() const - { return _archive_size; } + virtual ByteCount downloadSize() const + { return _downloadSize; } virtual unsigned sourceMediaNr() const { return 0; } virtual bool installOnly() const @@ -74,7 +74,7 @@ TranslatedText _license_to_confirm; std::string _vendor; ByteCount _size; - ByteCount _archive_size; + ByteCount _downloadSize; bool _install_only; Date _build_time; Date _install_time; Modified: branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLProductImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLProductImpl.h?rev=6004&r1=6003&r2=6004&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLProductImpl.h (original) +++ branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLProductImpl.h Fri Jul 13 14:49:04 2007 @@ -46,8 +46,8 @@ { return _vendor; } virtual ByteCount size() const { return _size; } - virtual ByteCount archivesize() const - { return _archive_size; } + virtual ByteCount downloadSize() const + { return _downloadSize; } virtual unsigned sourceMediaNr() const { return 0; } virtual bool installOnly() const @@ -86,7 +86,7 @@ TranslatedText _license_to_confirm; std::string _vendor; ByteCount _size; - ByteCount _archive_size; + ByteCount _downloadSize; bool _install_only; Date _build_time; Date _install_time; Modified: branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLScriptImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLScriptImpl.h?rev=6004&r1=6003&r2=6004&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLScriptImpl.h (original) +++ branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLScriptImpl.h Fri Jul 13 14:49:04 2007 @@ -50,8 +50,8 @@ { return _vendor; } virtual ByteCount size() const { return _size; } - virtual ByteCount archivesize() const - { return _archive_size; } + virtual ByteCount downloadSize() const + { return _downloadSize; } virtual unsigned sourceMediaNr() const { return 0; } virtual bool installOnly() const @@ -79,7 +79,7 @@ TranslatedText _license_to_confirm; std::string _vendor; ByteCount _size; - ByteCount _archive_size; + ByteCount _downloadSize; bool _install_only; Date _build_time; Date _install_time; Modified: branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLSelectionImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLSelectionImpl.h?rev=6004&r1=6003&r2=6004&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLSelectionImpl.h (original) +++ branches/REFACTORING-10_3/libzypp/zypp/target/store/xml/XMLSelectionImpl.h Fri Jul 13 14:49:04 2007 @@ -47,8 +47,8 @@ { return _vendor; } virtual ByteCount size() const { return _size; } - virtual ByteCount archivesize() const - { return _archive_size; } + virtual ByteCount downloadSize() const + { return _downloadSize; } virtual unsigned sourceMediaNr() const { return 0; } virtual bool installOnly() const @@ -79,7 +79,7 @@ TranslatedText _license_to_confirm; std::string _vendor; ByteCount _size; - ByteCount _archive_size; + ByteCount _downloadSize; bool _install_only; Date _build_time; Date _install_time; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org