[zypp-commit] r8577 - in /branches/tmp/ma/jump_sat/libzypp: devel/devel.dmacvicar/testbed.cc tests/zypp/PoolQuery_test.cc zypp/PoolQuery.cc zypp/PoolQuery.h

Author: dmacvicar Date: Fri Feb 8 18:09:51 2008 New Revision: 8577 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8577&view=rev Log: - move the callback from constructor to query() - add filter by installed & uninstalled Modified: branches/tmp/ma/jump_sat/libzypp/devel/devel.dmacvicar/testbed.cc branches/tmp/ma/jump_sat/libzypp/tests/zypp/PoolQuery_test.cc branches/tmp/ma/jump_sat/libzypp/zypp/PoolQuery.cc branches/tmp/ma/jump_sat/libzypp/zypp/PoolQuery.h Modified: branches/tmp/ma/jump_sat/libzypp/devel/devel.dmacvicar/testbed.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/devel/devel.dmacvicar/testbed.cc?rev=8577&r1=8576&r2=8577&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/devel/devel.dmacvicar/testbed.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/devel/devel.dmacvicar/testbed.cc Fri Feb 8 18:09:51 2008 @@ -49,8 +49,8 @@ // } // } - PoolQuery query( &result_cb ); - query.execute("kde"); + PoolQuery query(); + query.execute("kde", &result_cb); } Modified: branches/tmp/ma/jump_sat/libzypp/tests/zypp/PoolQuery_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/tests/zypp/PoolQuery_test.cc?rev=8577&r1=8576&r2=8577&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/tests/zypp/PoolQuery_test.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/tests/zypp/PoolQuery_test.cc Fri Feb 8 18:09:51 2008 @@ -16,6 +16,7 @@ bool result_cb( const ResObject::Ptr &r ) { cout << r << endl; + return true; } void poolquery_simple_test() @@ -27,9 +28,16 @@ sat::Pool::instance().addRepoSolv(dir + "foo.solv"); - PoolQuery query( &result_cb ); - query.execute("kde"); + PoolQuery query; + //query.setInstalledOnly(); + query.execute("kde", &result_cb); + + cout << "search done." << endl; + + query.setMatchExact(true); + query.execute("kde", &result_cb); + cout << "search done." << endl; } test_suite* Modified: branches/tmp/ma/jump_sat/libzypp/zypp/PoolQuery.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/PoolQuery.cc?rev=8577&r1=8576&r2=8577&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/PoolQuery.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/PoolQuery.cc Fri Feb 8 18:09:51 2008 @@ -37,9 +37,9 @@ struct PoolQuery::Impl { - Impl(PoolQuery::ProcessResolvable fnc) + Impl() : _flags( 0 | SEARCH_NOCASE | SEARCH_SUBSTRING ) - , _fnc(fnc) + , _status_flags(ALL) {} ~Impl() @@ -56,7 +56,28 @@ //#define SEACH_STOP 3 PoolQuery *me = (PoolQuery*) cbdata; - bool r = me->_pimpl->_fnc( makeResObject(sat::Solvable(s - sat::Pool::instance().get()->solvables))); + + bool r = false; + + sat::Solvable solvable(s - sat::Pool::instance().get()->solvables); + + // now filter by kind here (we cant do it before) + if ( ! me->_pimpl->_kinds.empty() ) + { + // the user wants to filter by kind. + if ( find( me->_pimpl->_kinds.begin(), + me->_pimpl->_kinds.end(), + solvable.kind() ) + == me->_pimpl->_kinds.end() ) + { + // we did not find the kind in the list + // so this is not a result. + return SEARCH_NEXT_SOLVABLE; + } + } + + if (me->_pimpl->_fnc) + r = me->_pimpl->_fnc( makeResObject(solvable) ); if (!r) return SEARCH_STOP; @@ -67,7 +88,8 @@ vector<string> _names; vectorResolvable::Kind _kinds; int _flags; - PoolQuery::ProcessResolvable _fnc; + int _status_flags; + mutable PoolQuery::ProcessResolvable _fnc; private: friend Impl * rwcowClone<Impl>( const Impl * rhs ); /** clone for RWCOW_pointer */ @@ -88,8 +110,8 @@ // /////////////////////////////////////////////////////////////////// - PoolQuery::PoolQuery( PoolQuery::ProcessResolvable fnc ) - : _pimpl(new Impl(fnc)) + PoolQuery::PoolQuery() + : _pimpl(new Impl()) {} PoolQuery::~PoolQuery() @@ -106,32 +128,63 @@ _pimpl->_flags = (_pimpl->_flags | SEARCH_NOCASE); } + void PoolQuery::setMatchExact(const bool value) + { + if (value) + { + _pimpl->_flags = (_pimpl->_flags | SEARCH_STRING); + _pimpl->_flags = (_pimpl->_flags & ~SEARCH_REGEX); + _pimpl->_flags = (_pimpl->_flags & ~SEARCH_SUBSTRING); + _pimpl->_flags = (_pimpl->_flags & ~SEARCH_GLOB); + } + else + { + _pimpl->_flags = (_pimpl->_flags & ~SEARCH_STRING); + } + } + void PoolQuery::setFlags(int flags) { _pimpl->_flags = flags; } + void PoolQuery::setInstalledOnly() + { + _pimpl->_status_flags = (_pimpl->_status_flags | INSTALLED_ONLY); + } + + void PoolQuery::setUninstalledOnly() + { + _pimpl->_status_flags = (_pimpl->_status_flags | UNINSTALLED_ONLY); + } + + void PoolQuery::setStatusFilterFlags( int flags ) + { + _pimpl->_status_flags = (_pimpl->_status_flags | flags); + } - void PoolQuery::execute(const string &term) const + void PoolQuery::execute(const string &term, ProcessResolvable fnc) const { - + _pimpl->_fnc = fnc; + sat::Pool pool(sat::Pool::instance()); for ( sat::Pool::RepoIterator itr = pool.reposBegin(); itr != pool.reposEnd(); ++itr ) { - cout << "repo: " << itr->name() << endl; + // filter by installed uninstalled + if ( ( _pimpl->_status_flags & INSTALLED_ONLY ) && (itr->name() != sat::Pool::instance().systemRepoName()) ) + continue; + + if ( ( _pimpl->_status_flags & UNINSTALLED_ONLY ) && (itr->name() == sat::Pool::instance().systemRepoName()) ) + continue; + // is this repo in users repos? bool included = ( find(_pimpl->_repos.begin(), _pimpl->_repos.end(), itr->name()) != _pimpl->_repos.end() ); + // only look in user repos filter if the filter is not empty // in this case we search in all if ( _pimpl->_repos.empty() || included ) { - // now search in all names - //for ( vector<string>::const_iterator itn = _pimpl->_names.begin(); - // itn != _pimpl->_names.end(); - // ++itn ) - //{ - repo_search( itr->get(), 0, 0, term.c_str(), _pimpl->_flags, Impl::repo_search_cb, (void*) (this)); - //} + repo_search( itr->get(), 0, 0, term.c_str(), _pimpl->_flags, Impl::repo_search_cb, (void*) (this)); } } Modified: branches/tmp/ma/jump_sat/libzypp/zypp/PoolQuery.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/PoolQuery.h?rev=8577&r1=8576&r2=8577&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/PoolQuery.h (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/PoolQuery.h Fri Feb 8 18:09:51 2008 @@ -36,7 +36,7 @@ typedef function ProcessResolvable; - PoolQuery(PoolQuery::ProcessResolvable fnc); + PoolQuery(); ~PoolQuery(); public: @@ -46,7 +46,7 @@ * results are yielded on the callback passed on * construction */ - void execute(const std::string &term) const; + void execute(const std::string &term, PoolQuery::ProcessResolvable fnc) const; /** * Filter by selectable kind. @@ -67,6 +67,17 @@ */ //void addName(const std::string & name, bool isRegex = false); + /** + * Filter by status (installed uninstalled) + */ + enum StatusFilter { + ALL = 1, + INSTALLED_ONLY = 2, + UNINSTALLED_ONLY = 4 + }; + void setInstalledOnly(); + void setUninstalledOnly(); + void setStatusFilterFlags( int flags ); /** * Filter by the \a value of any available attribute of selectables. @@ -119,6 +130,11 @@ void setCaseSensitive(const bool value = true); /** + * Set match exact string + */ + void setMatchExact(const bool value = true); + + /** * Free function to set the satsolver repo search flags. -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org