Author: kmachalkova Date: Mon Mar 30 16:01:12 2009 New Revision: 56464 URL: http://svn.opensuse.org/viewcvs/yast?rev=56464&view=rev Log: Exclude pkgs with matching keywords from search results, unless specifically requested (#470069) Modified: trunk/ncurses-pkg/src/NCPkgFilterSearch.cc trunk/ncurses-pkg/src/NCPkgFilterSearch.h Modified: trunk/ncurses-pkg/src/NCPkgFilterSearch.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterSearch.cc?rev=56464&r1=56463&r2=56464&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterSearch.cc (original) +++ trunk/ncurses-pkg/src/NCPkgFilterSearch.cc Mon Mar 30 16:01:12 2009 @@ -162,6 +162,7 @@ bool NCPkgFilterSearch::fillSearchList( string & expr, bool ignoreCase, bool checkName, + bool checkKeywords, bool checkSummary, bool checkDescr, bool checkProvides, @@ -201,8 +202,6 @@ q.addString( expr ); q.addKind( zypp::ResKind::package ); - //no clue what this means, but it segfaults if it's not here :) - q.addAttribute( zypp::sat::SolvAttr::keywords ); if ( !ignoreCase ) q.setCaseSensitive(); @@ -210,6 +209,8 @@ q.addAttribute( zypp::sat::SolvAttr::name ); if ( checkSummary ) q.addAttribute( zypp::sat::SolvAttr::summary ); + if ( checkKeywords ) + q.addAttribute( zypp::sat::SolvAttr::keywords ); if ( checkDescr ) q.addAttribute( zypp::sat::SolvAttr::description ); if ( checkProvides ) @@ -271,14 +272,14 @@ if ( !packager->isYouMode() ) { // fill the package list with packages matching the search expression - fillSearchList( filter, - getCheckBoxValue( ignoreCase ), - settings->doCheckName(), - settings->doCheckSummary(), - settings->doCheckDescr(), - settings->doCheckProvides(), - settings->doCheckRequires() - ); + fillSearchList( filter, getCheckBoxValue( ignoreCase ), + settings->doCheckName(), + settings->doCheckSummary(), + settings->doCheckKeywords(), + settings->doCheckDescr(), + settings->doCheckProvides(), + settings->doCheckRequires() + ); } else { Modified: trunk/ncurses-pkg/src/NCPkgFilterSearch.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterSearch.h?rev=56464&r1=56463&r2=56464&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterSearch.h (original) +++ trunk/ncurses-pkg/src/NCPkgFilterSearch.h Mon Mar 30 16:01:12 2009 @@ -83,6 +83,7 @@ bool fillSearchList( string & expr, bool ignoreCase, bool checkName, + bool checkKeywords, bool checkSummary, bool checkDescr, bool checkProvides, -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org