pivot-table: Change the default format to omit empty rows and columns.

[pspp] / src / output / pivot-table.c

diff --git a/src/output/pivot-table.c b/src/output/pivot-table.c
index 272ccc9e34849dca95a9d133712d219b2a3e0b75..45704a7a1ed680afbdb18f40466ba452f2e3a6d4 100644 (file)
--- a/src/output/pivot-table.c
+++ b/src/output/pivot-table.c
@@ -200,7 +200,7 @@ pivot_table_look_init (struct pivot_table_look *look)
 {
   memset (look, 0, sizeof *look);
 
-  look->omit_empty = false;
+  look->omit_empty = true;
   look->row_labels_in_corner = true;
   look->width_ranges[TABLE_HORZ][0] = 36;
   look->width_ranges[TABLE_HORZ][1] = 72;
@@ -1216,6 +1216,14 @@ pivot_table_enumerate_axis (const struct pivot_table *table,
       memcpy (p, axis_indexes, axis->n_dimensions * sizeof *p);
       p += axis->n_dimensions;
     }
+  if (omit_empty && p == enumeration)
+    {
+      PIVOT_AXIS_FOR_EACH (axis_indexes, axis)
+        {
+          memcpy (p, axis_indexes, axis->n_dimensions * sizeof *p);
+          p += axis->n_dimensions;
+        }
+    }
   *p = SIZE_MAX;
   if (n)
     *n = (p - enumeration) / axis->n_dimensions;