Author: jkupec Date: Sun Apr 20 23:09:36 2008 New Revision: 9738 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9738&view=rev Log: - show search result groupped by name-kind - show summary, don't show repo - --details option added to show solvable list, columns rearranged Modified: trunk/zypper/src/zypper-search.h trunk/zypper/src/zypper.cc Modified: trunk/zypper/src/zypper-search.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-search.h?rev=9738&r1=9737&r2=9738&view=diff ============================================================================== --- trunk/zypper/src/zypper-search.h (original) +++ trunk/zypper/src/zypper-search.h Sun Apr 20 23:09:36 2008 @@ -35,25 +35,33 @@ { TableHeader header; - // translators: S for installed Status - header << _("S"); - - if (_gopts.is_rug_compatible) - header << _("Catalog"); - else - header << _("Repository"); - if (_gopts.is_rug_compatible) - // translators: Bundle is a term used in rug. See rug for how to translate it. - header << _("Bundle"); + { + header + // translators: S for 'installed Status' + << _("S") + << _("Catalog") + // translators: Bundle is a term used in rug. See rug for how to translate it. + << _("Bundle") + << _("Name") + << _("Version") + << _("Arch"); + } else - header << _("Type"); - - header << _("Name") << _("Version") << _("Arch"); + { + header + // translators: S for 'installed Status' + << _("S") + << _("Name") + << _("Type") + << _("Version") + << _("Arch") + << _("Repository"); + } *_table << header; } - +/* bool operator()(const zypp::sat::Solvable & solv) const { TableRow row; @@ -64,7 +72,6 @@ row << ( pi.status().isInstalled() ? "i" : " " ) << pi->repository().info().name() - // TODO what about rug's Bundle? << (_gopts.is_rug_compatible ? "" : kind_to_string_localized(pi->kind(), 1)) << pi->name() @@ -73,7 +80,7 @@ *_table << row; return true; } - +*/ bool operator()(const zypp::ui::Selectable::constPtr & s) const { // show installed objects @@ -82,12 +89,26 @@ TableRow row; zypp::PoolItem pi = *it; row << "i"; - row << pi->repository().info().name() + if (_gopts.is_rug_compatible) + { + row + << pi->repository().info().name() // TODO what about rug's Bundle? - << (_gopts.is_rug_compatible ? "" : kind_to_string_localized(pi->kind(), 1)) + << "" << pi->name() << pi->edition().asString() << pi->arch().asString(); + } + else + { + row + << pi->name() + << kind_to_string_localized(pi->kind(), 1) + << pi->edition().asString() + << pi->arch().asString() + << pi->repository().info().name(); + } + *_table << row; } @@ -109,11 +130,24 @@ else row << ""; - row << pi->repository().info().name(); - row << (_gopts.is_rug_compatible ? "" : kind_to_string_localized(pi->kind(), 1)) + if (_gopts.is_rug_compatible) + { + row + << pi->repository().info().name() + << "" << pi->name() << pi->edition().asString() << pi->arch().asString(); + } + else + { + row + << pi->name() + << kind_to_string_localized(pi->kind(), 1) + << pi->edition().asString() + << pi->arch().asString() + << pi->repository().info().name(); + } *_table << row; } Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=9738&r1=9737&r2=9738&view=diff ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Sun Apr 20 23:09:36 2008 @@ -2462,7 +2462,7 @@ try { - if (_copts.count("details")) + if (_gopts.is_rug_compatible || _copts.count("details")) { FillSearchTableSolvable callback(t); invokeOnEach(query.selectableBegin(), query.selectableEnd(), callback); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org