- adapt to unified query API of libzypp-3.18.x

- r6756

diff --git a/package/zypper.changes b/package/zypper.changes
index 10839d6..bd8205e 100644 (file)
--- a/package/zypper.changes
+++ b/package/zypper.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Mon Aug 20 13:55:53 CEST 2007 - kkaempf@suse.de
+
+- adapt to unified query API of libzypp-3.18.x
+- r6756
+
+-------------------------------------------------------------------
 Fri Aug 17 15:16:32 CEST 2007 - jkupec@suse.cz
 
 - text update from proof-reading

diff --git a/src/zypper-search.cc b/src/zypper-search.cc
index 82c93d6..077d285 100644 (file)
--- a/src/zypper-search.cc
+++ b/src/zypper-search.cc
@@ -91,7 +91,7 @@ ZyppSearch::invokeOnEachSearched(_Filter filter_r, _PoolCallback pool_cb, _Cache
         {
           std::vector<zypp::Resolvable::Kind> kinds;
          kinds.push_back( _options.kind() );
-          _query.iterateResolvablesByKindsAndName( kinds, _qstrings[0], _options.matchExact() ? 0 : 3, cache_cb );
+          _query.iterateResolvablesByKindsAndStrings( kinds, _qstrings, (_options.matchExact() ? cache::MATCH_EXACT : cache::MATCH_SUBSTRING)|cache::MATCH_NAME, cache_cb );
         }
       }
       catch ( const Exception & excpt_r )
@@ -127,7 +127,7 @@ ZyppSearch::invokeOnEachSearched(_Filter filter_r, _PoolCallback pool_cb, _Cache
 
         std::vector<zypp::Resolvable::Kind> kinds;
        kinds.push_back( ResTraits<Package>::kind );
-        _query.iterateResolvablesByKindsAndName( kinds, _qstrings[0], 0, cache_cb );
+        _query.iterateResolvablesByKindsAndStrings( kinds, _qstrings, cache::MATCH_EXACT|cache::MATCH_NAME, cache_cb );
       }
       catch ( const Exception & excpt_r )
       {
@@ -156,7 +156,7 @@ ZyppSearch::invokeOnEachSearched(_Filter filter_r, _PoolCallback pool_cb, _Cache
 
         std::vector<zypp::Resolvable::Kind> kinds;
        kinds.push_back( ResTraits<Package>::kind );
-        _query.iterateResolvablesByKindsAndName( kinds, _qstrings[0], 3, cache_cb );
+        _query.iterateResolvablesByKindsAndStrings( kinds, _qstrings, cache::MATCH_SUBSTRING|cache::MATCH_NAME, cache_cb );
       }
       catch ( const Exception & excpt_r )
       {

diff --git a/zypper.spec.cmake b/zypper.spec.cmake
index 8151617..cfea5a2 100644 (file)
--- a/zypper.spec.cmake
+++ b/zypper.spec.cmake
@@ -11,7 +11,7 @@
 # norootforbuild
 
 Name:           @PACKAGE@
-BuildRequires:  libzypp-devel >= 3.17.0 boost-devel >= 1.33.1 gettext-devel >= 0.15 readline-devel >= 5.1
+BuildRequires:  libzypp-devel >= 3.18.0 boost-devel >= 1.33.1 gettext-devel >= 0.15 readline-devel >= 5.1
 BuildRequires:  gcc-c++ >= 4.2 cmake >= 2.4.6 pkg-config >= 0.20
 Requires:      procps
 License:        GPL