[zypp-commit] r5897 - in /branches/REFACTORING-10_3/libzypp/zypp: ./ repo/memory/

Author: dmacvicar Date: Thu Jul 5 18:37:30 2007 New Revision: 5897 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5897&view=rev Log: - enable scripts and messages in memory impl - more overload fixes Modified: branches/REFACTORING-10_3/libzypp/zypp/CMakeLists.txt branches/REFACTORING-10_3/libzypp/zypp/repo/memory/AtomImpl.h branches/REFACTORING-10_3/libzypp/zypp/repo/memory/MessageImpl.h branches/REFACTORING-10_3/libzypp/zypp/repo/memory/PackageImpl.h branches/REFACTORING-10_3/libzypp/zypp/repo/memory/PatchImpl.cc branches/REFACTORING-10_3/libzypp/zypp/repo/memory/PatchImpl.h branches/REFACTORING-10_3/libzypp/zypp/repo/memory/PatternImpl.cc branches/REFACTORING-10_3/libzypp/zypp/repo/memory/PatternImpl.h branches/REFACTORING-10_3/libzypp/zypp/repo/memory/ProductImpl.cc branches/REFACTORING-10_3/libzypp/zypp/repo/memory/ProductImpl.h branches/REFACTORING-10_3/libzypp/zypp/repo/memory/ScriptImpl.cc branches/REFACTORING-10_3/libzypp/zypp/repo/memory/ScriptImpl.h branches/REFACTORING-10_3/libzypp/zypp/repo/memory/SrcPackageImpl.h Modified: branches/REFACTORING-10_3/libzypp/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/CMakeLists.txt?rev=5897&r1=5896&r2=5897&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/CMakeLists.txt (original) +++ branches/REFACTORING-10_3/libzypp/zypp/CMakeLists.txt Thu Jul 5 18:37:30 2007 @@ -988,6 +988,8 @@ SET( zypp_repo_data_SRCS + repo/memory/ScriptImpl.cc + repo/memory/MessageImpl.cc repo/memory/PackageImpl.cc repo/memory/PatternImpl.cc repo/memory/ProductImpl.cc Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/memory/AtomImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/memory/AtomImpl.h?rev=5897&r1=5896&r2=5897&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/repo/memory/AtomImpl.h (original) +++ branches/REFACTORING-10_3/libzypp/zypp/repo/memory/AtomImpl.h Thu Jul 5 18:37:30 2007 @@ -55,7 +55,6 @@ TranslatedText _license_to_confirm; Vendor _vendor; ByteCount _size; - ByteCount _archivesize; bool _install_only; Date _buildtime; Date _installtime; 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=5897&r1=5896&r2=5897&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/repo/memory/MessageImpl.h (original) +++ branches/REFACTORING-10_3/libzypp/zypp/repo/memory/MessageImpl.h Thu Jul 5 18:37:30 2007 @@ -63,7 +63,6 @@ bool _install_only; Date _buildtime; Date _installtime; - unsigned _media_nr; TranslatedText _text; }; Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/memory/PackageImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/memory/PackageImpl.h?rev=5897&r1=5896&r2=5897&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/repo/memory/PackageImpl.h (original) +++ branches/REFACTORING-10_3/libzypp/zypp/repo/memory/PackageImpl.h Thu Jul 5 18:37:30 2007 @@ -77,7 +77,6 @@ TranslatedText _license_to_confirm; Vendor _vendor; ByteCount _size; - ByteCount _archivesize; bool _install_only; Date _buildtime; Date _installtime; 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=5897&r1=5896&r2=5897&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/repo/memory/PatchImpl.cc (original) +++ branches/REFACTORING-10_3/libzypp/zypp/repo/memory/PatchImpl.cc Thu Jul 5 18:37:30 2007 @@ -102,11 +102,6 @@ return _installtime; } -unsigned PatchImpl::mediaNr() const -{ - return _media_nr; -} - ////////////////////////////////////////// // PATCH ///////////////////////////////////////// Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/memory/PatchImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/memory/PatchImpl.h?rev=5897&r1=5896&r2=5897&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/repo/memory/PatchImpl.h (original) +++ branches/REFACTORING-10_3/libzypp/zypp/repo/memory/PatchImpl.h Thu Jul 5 18:37:30 2007 @@ -38,7 +38,6 @@ virtual bool installOnly() const; virtual Date buildtime() const; virtual Date installtime() const; - virtual unsigned mediaNr() const; // PATCH virtual std::string id() const; @@ -61,11 +60,9 @@ TranslatedText _license_to_confirm; Vendor _vendor; ByteCount _size; - ByteCount _archivesize; bool _install_only; Date _buildtime; Date _installtime; - unsigned _media_nr; // patch std::string _patch_id; 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=5897&r1=5896&r2=5897&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/repo/memory/PatternImpl.cc (original) +++ branches/REFACTORING-10_3/libzypp/zypp/repo/memory/PatternImpl.cc Thu Jul 5 18:37:30 2007 @@ -102,12 +102,6 @@ return _installtime; } -unsigned PatternImpl::mediaNr() const -{ - return _media_nr; -} - - /////////////////////////////////////// TranslatedText PatternImpl::category() const Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/memory/PatternImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/memory/PatternImpl.h?rev=5897&r1=5896&r2=5897&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/repo/memory/PatternImpl.h (original) +++ branches/REFACTORING-10_3/libzypp/zypp/repo/memory/PatternImpl.h Thu Jul 5 18:37:30 2007 @@ -44,7 +44,6 @@ virtual bool installOnly() const; virtual Date buildtime() const; virtual Date installtime() const; - virtual unsigned mediaNr() const; virtual TranslatedText category() const; virtual bool userVisible() const; @@ -62,11 +61,9 @@ TranslatedText _license_to_confirm; Vendor _vendor; ByteCount _size; - ByteCount _archivesize; bool _install_only; Date _buildtime; Date _installtime; - unsigned _media_nr; // Pattern TranslatedText _category; 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=5897&r1=5896&r2=5897&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/repo/memory/ProductImpl.cc (original) +++ branches/REFACTORING-10_3/libzypp/zypp/repo/memory/ProductImpl.cc Thu Jul 5 18:37:30 2007 @@ -100,11 +100,6 @@ return _installtime; } -unsigned ProductImpl::mediaNr() const -{ - return _media_nr; -} - /////////////////////////////////////////// std::string ProductImpl::category() const Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/memory/ProductImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/memory/ProductImpl.h?rev=5897&r1=5896&r2=5897&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/repo/memory/ProductImpl.h (original) +++ branches/REFACTORING-10_3/libzypp/zypp/repo/memory/ProductImpl.h Thu Jul 5 18:37:30 2007 @@ -50,7 +50,6 @@ virtual bool installOnly() const; virtual Date buildtime() const; virtual Date installtime() const; - virtual unsigned mediaNr() const; virtual std::string category() const; virtual Url releaseNotesUrl() const; @@ -72,11 +71,9 @@ TranslatedText _license_to_confirm; Vendor _vendor; ByteCount _size; - ByteCount _archivesize; bool _install_only; Date _buildtime; Date _installtime; - unsigned _media_nr; std::string _category; std::string _dist_name; Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/memory/ScriptImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/memory/ScriptImpl.cc?rev=5897&r1=5896&r2=5897&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/repo/memory/ScriptImpl.cc (original) +++ branches/REFACTORING-10_3/libzypp/zypp/repo/memory/ScriptImpl.cc Thu Jul 5 18:37:30 2007 @@ -30,7 +30,7 @@ /** Default ctor */ ScriptImpl::ScriptImpl ( memory::RepoImpl::Ptr repo, data::Script_Ptr ptr) - : _repository (repository_r), + : _repository (repo), _summary(ptr->summary), _description(ptr->description), _insnotify(ptr->insnotify), @@ -38,10 +38,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) + _buildtime(ptr->buildTime) //TODO script attrs {} @@ -105,12 +103,6 @@ return _installtime; } -unsigned ScriptImpl::mediaNr() const -{ - return _media_nr; -} - - ////////////////////////////////////////// // MESSAGE ///////////////////////////////////////// Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/memory/ScriptImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/memory/ScriptImpl.h?rev=5897&r1=5896&r2=5897&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/repo/memory/ScriptImpl.h (original) +++ branches/REFACTORING-10_3/libzypp/zypp/repo/memory/ScriptImpl.h Thu Jul 5 18:37:30 2007 @@ -29,7 +29,7 @@ { public: - ScriptImpl( const data::RecordId &id, repo::memory::RepoImpl::Ptr repository_r ); + ScriptImpl( memory::RepoImpl::Ptr repo, data::Script_Ptr ptr); virtual TranslatedText summary() const; virtual TranslatedText description() const; @@ -41,9 +41,7 @@ virtual bool installOnly() const; virtual Date buildtime() const; virtual Date installtime() const; - - virtual unsigned mediaNr() const; - + // SCRIPT virtual Pathname do_script() const; virtual Pathname undo_script() const; @@ -62,11 +60,9 @@ TranslatedText _license_to_confirm; Vendor _vendor; ByteCount _size; - ByteCount _archivesize; bool _install_only; Date _buildtime; Date _installtime; - unsigned _media_nr; }; ///////////////////////////////////////////////////////////////// } // namespace memory Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/memory/SrcPackageImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/memory/SrcPackageImpl.h?rev=5897&r1=5896&r2=5897&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/repo/memory/SrcPackageImpl.h (original) +++ branches/REFACTORING-10_3/libzypp/zypp/repo/memory/SrcPackageImpl.h Thu Jul 5 18:37:30 2007 @@ -61,7 +61,6 @@ TranslatedText _license_to_confirm; Vendor _vendor; ByteCount _size; - ByteCount _archivesize; bool _install_only; Date _buildtime; Date _installtime; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org