fix cache search output, implement 'byKind' iterator (incomplete)

diff --git a/src/zypper-search.cc b/src/zypper-search.cc
index a72958e..5192493 100644 (file)
--- a/src/zypper-search.cc
+++ b/src/zypper-search.cc
@@ -82,9 +82,9 @@ ZyppSearch::invokeOnEachSearched(_Filter filter_r, _PoolCallback pool_cb, _Cache
     {
       try
       {
-      // search cache on ALL or UNINSTALLED by TYPE
+        // search cache on ALL or UNINSTALLED by TYPE
 
-      _query.query( "%libzypp%", cache_cb );
+        _query.iterateResolvablesByKind( _options.kind(), cache_cb );
       }
       catch ( const Exception & excpt_r )
       {
@@ -117,7 +117,7 @@ ZyppSearch::invokeOnEachSearched(_Filter filter_r, _PoolCallback pool_cb, _Cache
       {
       // search cache on ALL or UNINSTALLED by EXACT NAME
 
-      _query.queryByName( _qstrings[0], 0, cache_cb );
+        _query.iterateResolvablesByName( _qstrings[0], 0, cache_cb );
       }
       catch ( const Exception & excpt_r )
       {
@@ -144,7 +144,7 @@ ZyppSearch::invokeOnEachSearched(_Filter filter_r, _PoolCallback pool_cb, _Cache
       {
       // search cache on ALL or UNINSTALLED by WILD NAME
 
-      _query.queryByName( _qstrings[0], 3, cache_cb );
+        _query.iterateResolvablesByName( _qstrings[0], 3, cache_cb );
       }
       catch ( const Exception & excpt_r )
       {

diff --git a/src/zypper-search.h b/src/zypper-search.h
index 9d0bd32..ea05101 100644 (file)
--- a/src/zypper-search.h
+++ b/src/zypper-search.h
@@ -330,7 +330,7 @@ struct FillTable
     // add other fields to the result table
     row << alias
         // TODO what about rug's Bundle?
-        << "kind"              // FIXME: (gSettings.is_rug_compatible ? "" : res->kind().asString()) 
+        << (gSettings.is_rug_compatible ? "" : res->kind.asString())
         << res->name
         << res->edition.asString()
         << res->arch.asString();