[zypp-commit] r9735 - in /trunk/zypper/src: zypper-search.h zypper.cc

Author: jkupec Date: Sun Apr 20 14:25:26 2008 New Revision: 9735 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9735&view=rev Log: - group search result by name-kind by default 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=9735&r1=9734&r2=9735&view=diff ============================================================================== --- trunk/zypper/src/zypper-search.h (original) +++ trunk/zypper/src/zypper-search.h Sun Apr 20 14:25:26 2008 @@ -137,7 +137,6 @@ header << _("Name"); header << _("Summary"); header << _("Type"); - header << _("Repository"); *_table << header; } @@ -147,11 +146,8 @@ 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) + "..."); + row << s->theObj()->summary(); row << kind_to_string_localized(s->kind(), 1); - row << selectable_search_repo_str(*s); *_table << row; return true; } Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=9735&r1=9734&r2=9735&view=diff ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Sun Apr 20 14:25:26 2008 @@ -1258,6 +1258,7 @@ // rug compatibility option, we have --repo {"catalog", required_argument, 0, 'c'}, {"repo", required_argument, 0, 'r'}, + {"details", no_argument, 0, 's'}, {"help", no_argument, 0, 'h'}, {0, 0, 0, 0} }; @@ -1283,6 +1284,8 @@ "-r, --repo Search only in the specified repository.\n" " --sort-by-name Sort packages by name (default).\n" " --sort-by-repo Sort packages by repository.\n" + " --details Show each available version in each repository\n" + " on a separate line.\n" "\n" "* and ? wildcards can also be used within search strings.\n" ); @@ -2459,8 +2462,16 @@ try { - FillSearchTableSolvable callback(t); - invokeOnEach(query.selectableBegin(), query.selectableEnd(), callback); + if (_copts.count("details")) + { + FillSearchTableSolvable callback(t); + invokeOnEach(query.selectableBegin(), query.selectableEnd(), callback); + } + else + { + FillSearchTableSelectable callback(t); + invokeOnEach(query.selectableBegin(), query.selectableEnd(), callback); + } if (t.empty()) out().info(_("No resolvables found."), Out::QUIET); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org