- defaulting to package in rug compatibility for search command

- Bundle column replaced by Type in non-compatible mode

diff --git a/doc/zypper.8 b/doc/zypper.8
index 0c8a21a..79bd011 100644 (file)
--- a/doc/zypper.8
+++ b/doc/zypper.8
@@ -102,6 +102,13 @@ package\fR which is also the default in rug compatibility mode.
 .TP
 \fBsearch\fR (\fBse\fR) [\fIoptions\fR] [\fBquerystring\fR] ...
 Search for resolvables matching given strings. * (any substring) and ? (any character) wildcards can also be used within search strings.
+.IP
+Results of search are printed in a table with following columns: S (status), Catalog, Type (type of resolvable), Name, Version, Arch (architecture). Status column can contain following values: i - installed, v - another version installed, or an empty space for neither of the former cases.
+.IP
+In \fBrug compatibility mode\fR the --type option defaults to \fBpackage\fR. Furthermore, Instead of the Type column, rug's Bundle column is printed, however, with no contents.
+.IP
+This command accepts the following options:
+
 .TP
 \fI    \-\-match\-all\fR
 Search for a match to all search strings (default).

diff --git a/src/zypper-search.h b/src/zypper-search.h
index cec9d36..2788627 100644 (file)
--- a/src/zypper-search.h
+++ b/src/zypper-search.h
@@ -17,8 +17,11 @@
 #include <boost/function.hpp>
 #include <zypp/ZYpp.h>
 
+#include "zmart.h"
 #include "zypper-tabulator.h"
 
+extern Settings gSettings;
+
 /**
  * Represents zypper search options.
  */
@@ -192,7 +195,16 @@ struct FillTable
   FillTable(Table & table, InstalledCache & icache) :
     _table(&table), _icache(&icache) {
     TableHeader header;
-    header << "S" << "Catalog" << "Bundle" << "Name" << "Version" << "Arch";
+
+    header << "S" << "Catalog";
+
+    if (gSettings.is_rug_compatible)
+      header << "Bundle";
+    else
+      header << "Type";
+
+    header << "Name" << "Version" << "Arch";
+
     *_table << header;
   }
 
@@ -217,7 +229,8 @@ struct FillTable
 
     // add other fields to the result table
     row << pool_item.resolvable()->source().alias()
-        << "" // TODO what about rug's Bundle?
+        // TODO what about rug's Bundle?
+        << (gSettings.is_rug_compatible ? "" : pool_item.resolvable()->kind().asString()) 
         << pool_item.resolvable()->name()
         << pool_item.resolvable()->edition().asString()
         << pool_item.resolvable()->arch().asString();

diff --git a/src/zypper.cc b/src/zypper.cc
index 7dc9455..792d96e 100644 (file)
--- a/src/zypper.cc
+++ b/src/zypper.cc
@@ -710,6 +710,10 @@ int one_command(const string& command, int argc, char **argv)
       }
       options.setKind(kind);
     }
+    else if (gSettings.is_rug_compatible) {
+      kind = ResTraits<Package>::kind;
+      options.setKind(kind);
+    }
 
     options.resolveConflicts();