Author: jkupec Date: Tue Apr 8 12:36:41 2008 New Revision: 9447 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9447&view=rev Log: - getters added Modified: trunk/libzypp/zypp/PoolQuery.cc trunk/libzypp/zypp/PoolQuery.h Modified: trunk/libzypp/zypp/PoolQuery.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PoolQuery.cc?rev=9447&r1=9446&r2=9447&view=diff ============================================================================== --- trunk/libzypp/zypp/PoolQuery.cc (original) +++ trunk/libzypp/zypp/PoolQuery.cc Tue Apr 8 12:36:41 2008 @@ -105,7 +105,7 @@ public: /** Raw search strings. */ - vector<string> _strings; + StrContainer _strings; /** Regex-compiled search strings. */ string _rcstrings; /** Raw attributes */ @@ -114,9 +114,9 @@ CompiledAttrMap _rcattrs; /** Repos to search. */ - vector<string> _repos; + StrContainer _repos; /** Kinds to search */ - vectorResolvable::Kind _kinds; + Kinds _kinds; /** Sat solver search flags */ int _flags; @@ -692,10 +692,48 @@ { _pimpl->_status_flags = flags; } - void PoolQuery::requireAll(const bool require_all) + void PoolQuery::setRequireAll(const bool require_all) { _pimpl->_require_all = require_all; } + const PoolQuery::StrContainer & + PoolQuery::strings() const + { return _pimpl->_strings; } + + const PoolQuery::AttrMap & + PoolQuery::attributes() const + { return _pimpl->_attrs; } + + const PoolQuery::Kinds & + PoolQuery::kinds() const + { return _pimpl->_kinds; } + + const PoolQuery::StrContainer & + PoolQuery::repos() const + { return _pimpl->_repos; } + + bool PoolQuery::caseSensitive() + { return _pimpl->_flags & SEARCH_NOCASE; } + + bool PoolQuery::matchExact() const + { return (_pimpl->_flags & SEARCH_STRINGMASK) == SEARCH_STRING; } + bool PoolQuery::matchSubstring() const + { return (_pimpl->_flags & SEARCH_STRINGMASK) == SEARCH_SUBSTRING; } + bool PoolQuery::matchGlob() const + { return (_pimpl->_flags & SEARCH_STRINGMASK) == SEARCH_GLOB; } + bool PoolQuery::matchRegex() const + { return (_pimpl->_flags & SEARCH_STRINGMASK) == SEARCH_REGEX; } + int PoolQuery::matchType() const + { return _pimpl->_flags & SEARCH_STRINGMASK; } + + bool PoolQuery::matchWord() const + { return _pimpl->_match_word; } + + bool PoolQuery::requireAll() const + { return _pimpl->_require_all; } + + + PoolQuery::ResultIterator PoolQuery::begin() { return _pimpl->begin(); } Modified: trunk/libzypp/zypp/PoolQuery.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PoolQuery.h?rev=9447&r1=9446&r2=9447&view=diff ============================================================================== --- trunk/libzypp/zypp/PoolQuery.h (original) +++ trunk/libzypp/zypp/PoolQuery.h Tue Apr 8 12:36:41 2008 @@ -36,8 +36,10 @@ class PoolQuery { public: - typedef std::mapstd::string > AttrMap; - typedef std::map CompiledAttrMap; + typedef std::vectorstd::string StrContainer; + typedef std::vectorResolvable::Kind Kinds; + typedef std::map AttrMap; + typedef std::map CompiledAttrMap; typedef unsigned int size_type; class Impl; @@ -226,10 +228,42 @@ /** - * Require that all of the query conditions set by - * addAttribute, addString, addDep are satisfied. + * Require that all of the values set by addString, addAttribute, addDep + * match the values of respective attributes. */ - void requireAll(const bool require_all = true); + void setRequireAll(const bool require_all = true); + + /** \name getters */ + //@{ + + /** Search strings added via addString() */ + const StrContainer & strings() const; + /** + * Map (map) of attribute values added via + * addAttribute(), addDep in string form */ + const AttrMap & attributes() const; + + const Kinds & kinds() const; + + const StrContainer & repos() const; + + bool caseSensitive() const; + + bool matchExact() const; + bool matchSubstring() const; + bool matchGlob() const; + bool matchRegex() const; + /** + * Returns currently used string matching type. + * \see satsolver/repo.h + */ + int matchType() const; + + bool matchWord() const; + + bool requireAll() const; + + //@} /** * Reads from stream query. Attributes is sepated by delim. Query is -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org