format-table: optionally allow reversing the sort order for a column

(cherry picked from commit a2c73e2d3823e878de7a7ee193631108c5fc5be0)

Related: #1689832

diff --git a/src/basic/format-table.c b/src/basic/format-table.c
index 64b9eb410812934e8568f25a1479494d74157887..a3ff527e91efb603d80072b5ded6cb61e406ed87 100644 (file)
--- a/src/basic/format-table.c
+++ b/src/basic/format-table.c
@@ -107,6 +107,8 @@ struct Table {
 
         size_t *sort_map;     /* The columns to order rows by, in order of preference. */
         size_t n_sort_map;
+
+        bool *reverse_map;
 };
 
 Table *table_new_raw(size_t n_columns) {
@@ -215,6 +217,7 @@ Table *table_unref(Table *t) {
         free(t->data);
         free(t->display_map);
         free(t->sort_map);
+        free(t->reverse_map);
 
         return mfree(t);
 }
@@ -836,7 +839,7 @@ static int table_data_compare(const void *x, const void *y, void *userdata) {
 
                 r = cell_data_compare(d, *a, dd, *b);
                 if (r != 0)
-                        return r;
+                        return t->reverse_map && t->reverse_map[t->sort_map[i]] ? -r : r;
         }
 
         /* Order identical lines by the order there were originally added in */
@@ -1356,3 +1359,20 @@ size_t table_get_columns(Table *t) {
         assert(t->n_columns > 0);
         return t->n_columns;
 }
+
+int table_set_reverse(Table *t, size_t column, bool b) {
+        assert(t);
+        assert(column < t->n_columns);
+
+        if (!t->reverse_map) {
+                if (!b)
+                        return 0;
+
+                t->reverse_map = new0(bool, t->n_columns);
+                if (!t->reverse_map)
+                        return -ENOMEM;
+        }
+
+        t->reverse_map[column] = b;
+        return 0;
+}

diff --git a/src/basic/format-table.h b/src/basic/format-table.h
index 2db20840625f0ad71ecec9fbd5b3295adfcc61a9..07cb2351cbd2f751b37b970ddaa4e1f8ad1acfc3 100644 (file)
--- a/src/basic/format-table.h
+++ b/src/basic/format-table.h
@@ -53,6 +53,7 @@ void table_set_header(Table *table, bool b);
 void table_set_width(Table *t, size_t width);
 int table_set_display(Table *t, size_t first_column, ...);
 int table_set_sort(Table *t, size_t first_column, ...);
+int table_set_reverse(Table *t, size_t column, bool b);
 
 int table_print(Table *t, FILE *f);
 int table_format(Table *t, char **ret);