Author: dmacvicar Date: Tue Feb 12 11:51:38 2008 New Revision: 8621 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8621&view=rev Log: More attributes Modified: branches/tmp/ma/jump_sat/libzypp/zypp/Pattern.cc branches/tmp/ma/jump_sat/libzypp/zypp/ResObject.h branches/tmp/ma/jump_sat/libzypp/zypp/sat/SolvAttr.cc branches/tmp/ma/jump_sat/libzypp/zypp/sat/SolvAttr.h branches/tmp/ma/jump_sat/libzypp/zypp/sat/Solvable.cc branches/tmp/ma/jump_sat/libzypp/zypp/sat/Solvable.h Modified: branches/tmp/ma/jump_sat/libzypp/zypp/Pattern.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/Pattern.cc?rev=8621&r1=8620&r2=8621&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/Pattern.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/Pattern.cc Tue Feb 12 11:51:38 2008 @@ -43,19 +43,19 @@ /////////////////////////////////////////////////////////////////// /** */ bool Pattern::isDefault() const - { return false; } + { return lookupBoolAttribute( sat::SolvAttr::isdefault ); } /** */ bool Pattern::userVisible() const - { return true; } + { return lookupBoolAttribute( sat::SolvAttr::isvisible ); } /** */ std::string Pattern::category() const - { return std::string(); } + { return lookupStrAttribute( sat::SolvAttr::category ); } /** */ Pathname Pattern::icon() const - { return Pathname(); } + { return lookupStrAttribute( sat::SolvAttr::icon ); } /** */ Pathname Pattern::script() const - { return Pathname(); } + { return lookupStrAttribute( sat::SolvAttr::script ); } Label Pattern::order() const { return Label(); } Modified: branches/tmp/ma/jump_sat/libzypp/zypp/ResObject.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/ResObject.h?rev=8621&r1=8620&r2=8621&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/ResObject.h (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/ResObject.h Tue Feb 12 11:51:38 2008 @@ -47,6 +47,7 @@ typedef TraitsType::constPtrType constPtr; public: + /** * \short Short text describing the resolvable. * This attribute is usually displayed in columns. Modified: branches/tmp/ma/jump_sat/libzypp/zypp/sat/SolvAttr.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/sat/SolvAttr.cc?rev=8621&r1=8620&r2=8621&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/sat/SolvAttr.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/sat/SolvAttr.cc Tue Feb 12 11:51:38 2008 @@ -37,12 +37,29 @@ const SolvAttr SolvAttr::mediafile ( "mediafile" ); const SolvAttr SolvAttr::mediadir ( "mediadir" ); const SolvAttr SolvAttr::eula ( "eula" ); - + const SolvAttr SolvAttr::changelog ( "changelog" ); + const SolvAttr SolvAttr::buildhost ( "buildhost" ); + const SolvAttr SolvAttr::distribution ( "distribution" ); + const SolvAttr SolvAttr::packager ( "packager" ); + const SolvAttr SolvAttr::group ( "group" ); + const SolvAttr SolvAttr::keywords ( "keywords" ); + const SolvAttr SolvAttr::os ( "os" ); + const SolvAttr SolvAttr::prein ( "prein" ); + const SolvAttr SolvAttr::postin ( "postin" ); + const SolvAttr SolvAttr::preun ( "preun" ); + const SolvAttr SolvAttr::postun ( "postun" ); + const SolvAttr SolvAttr::sourcesize ( "sourcesize" ); + const SolvAttr SolvAttr::authors ( "authors" ); + const SolvAttr SolvAttr::filenames ( "filenames" ); + const SolvAttr SolvAttr::srcpkgname ( "srcpkgname" ); + const SolvAttr SolvAttr::srcpkgedition( "srcpkgedition" ); + //pattern - const SolvAttr SolvAttr::isvisible ( "isvisible" ); + const SolvAttr SolvAttr::isvisible ( "isvisible" ); const SolvAttr SolvAttr::icon ( "icon" ); - const SolvAttr SolvAttr::isdefault ( "isdefault" ); - const SolvAttr SolvAttr::category ( "category" ); + const SolvAttr SolvAttr::isdefault ( "isdefault" ); + const SolvAttr SolvAttr::category ( "category" ); // FIXME translate + const SolvAttr SolvAttr::script ( "script" ); } // namespace sat Modified: branches/tmp/ma/jump_sat/libzypp/zypp/sat/SolvAttr.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/sat/SolvAttr.h?rev=8621&r1=8620&r2=8621&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/sat/SolvAttr.h (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/sat/SolvAttr.h Tue Feb 12 11:51:38 2008 @@ -55,12 +55,29 @@ static const SolvAttr medianr; static const SolvAttr mediafile; static const SolvAttr eula; - + static const SolvAttr changelog; + static const SolvAttr buildhost; + static const SolvAttr distribution; + static const SolvAttr packager; + static const SolvAttr group; + static const SolvAttr keywords; + static const SolvAttr os; + static const SolvAttr prein; + static const SolvAttr postin; + static const SolvAttr preun; + static const SolvAttr postun; + static const SolvAttr sourcesize; + static const SolvAttr authors; + static const SolvAttr filenames; + static const SolvAttr srcpkgname; + static const SolvAttr srcpkgedition; + // patern static const SolvAttr isvisible; static const SolvAttr icon; static const SolvAttr isdefault; static const SolvAttr category; + static const SolvAttr script; //@} Modified: branches/tmp/ma/jump_sat/libzypp/zypp/sat/Solvable.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/sat/Solvable.cc?rev=8621&r1=8620&r2=8621&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/sat/Solvable.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/sat/Solvable.cc Tue Feb 12 11:51:38 2008 @@ -81,6 +81,11 @@ { return repo_lookup_num(this->get(), attr.idStr().id()); } + + bool Solvable::lookupBoolAttribute( const SolvAttr &attr ) const + { + return repo_lookup_num(this->get(), attr.idStr().id()) > 0; + } struct LocCallback { Modified: branches/tmp/ma/jump_sat/libzypp/zypp/sat/Solvable.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/sat/Solvable.h?rev=8621&r1=8620&r2=8621&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/sat/Solvable.h (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/sat/Solvable.h Tue Feb 12 11:51:38 2008 @@ -97,7 +97,12 @@ * with a subdirectory. */ std::string lookupLocation(unsigned &medianr) const; - + + /** + * + */ + bool lookupBoolAttribute( const SolvAttr &attr ) const; + public: /** The identifier. * This is the solvables \ref name, \b except for packages and -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org