Author: jkupec Date: Thu Apr 17 11:36:25 2008 New Revision: 9675 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9675&view=rev Log: - prepare for the new search, but don't use it yet Modified: trunk/zypper/src/zypper-search.cc trunk/zypper/src/zypper-search.h Modified: trunk/zypper/src/zypper-search.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-search.cc?rev=9675&r1=9674&r2=9675&view=diff ============================================================================== --- trunk/zypper/src/zypper-search.cc (original) +++ trunk/zypper/src/zypper-search.cc Thu Apr 17 11:36:25 2008 @@ -23,34 +23,20 @@ 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; } Modified: trunk/zypper/src/zypper-search.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-search.h?rev=9675&r1=9674&r2=9675&view=diff ============================================================================== --- trunk/zypper/src/zypper-search.h (original) +++ trunk/zypper/src/zypper-search.h Thu Apr 17 11:36:25 2008 @@ -108,6 +108,7 @@ } 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 @@ 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) + "..."); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org