- prepare for the new search, but don't use it yet

diff --git a/src/zypper-search.cc b/src/zypper-search.cc
index d25473a..867debb 100644 (file)
--- a/src/zypper-search.cc
+++ b/src/zypper-search.cc
@@ -23,34 +23,20 @@ extern ZYpp::Ptr God;
 string selectable_search_repo_str(const ui::Selectable & s)
 {
   string repostr;
-  for_(it, s.installedBegin(), s.installedEnd())
-  {
-    if (!(*it)->repository().isSystemRepo())
-    {
-      cout << "can this ever be true?" << endl;
-      if (repostr.empty())
-        repostr = (*it)->repository().info().name();
-      else
-      {
-        repostr = _("(multiple)");
-        return repostr;
-      }
-    }
-  }
 
   // show available objects
   for_(it, s.availableBegin(), s.availableEnd())
   {      
     if (repostr.empty())
       repostr = (*it)->repository().info().name();
-    else
+    else if (repostr != (*it)->repository().info().name())
     {
       repostr = _("(multiple)");
       return repostr;
     }
   }
-  
-  return string();
+
+  return repostr;
 }
 
 

diff --git a/src/zypper-search.h b/src/zypper-search.h
index cf404b3..703cabd 100644 (file)
--- a/src/zypper-search.h
+++ b/src/zypper-search.h
@@ -108,6 +108,7 @@ struct FillSearchTableSolvable
       }
       else
         row << "";
+      
       row << pi->repository().info().name();
       row << (_gopts.is_rug_compatible ? "" : kind_to_string_localized(pi->kind(), 1))
           << pi->name()
@@ -145,6 +146,7 @@ struct FillSearchTableSelectable
     TableRow row;
 
     row << (s->installedEmpty() ? "" : "i");
+    row << s->name();
     //! \todo improve the abbreviation
     row << (_gopts.no_abbrev || s->theObj()->summary().size() < 33 ?
         s->theObj()->summary() : s->theObj()->summary().substr(0,28) + "...");