more work toward making table_item just a pivot_Table

[pspp] / src / output / csv.c

diff --git a/src/output/csv.c b/src/output/csv.c
index bde8711314f7384c44906c7cc4f05cb0fa4ea218..ab79e32a76c19bcdaa50c86ca5b379cf7d1711de 100644 (file)
--- a/src/output/csv.c
+++ b/src/output/csv.c
@@ -31,6 +31,7 @@
 #include "output/options.h"
 #include "output/message-item.h"
 #include "output/page-eject-item.h"
+#include "output/pivot-output.h"
 #include "output/table-item.h"
 #include "output/table-provider.h"
 
@@ -221,61 +222,64 @@ csv_output_table_cell (struct csv_driver *csv, const struct table_cell *cell,
 }
 
 static void
-csv_submit (struct output_driver *driver,
-            const struct output_item *output_item)
+csv_output_table__ (struct csv_driver *csv, const struct table *t,
+                    const char *leader)
 {
-  struct csv_driver *csv = csv_driver_cast (driver);
-
-  if (is_table_item (output_item))
+  for (int y = 0; y < t->n[TABLE_VERT]; y++)
     {
-      struct table_item *table_item = to_table_item (output_item);
-      const struct table *t = table_item_get_table (table_item);
-      int x, y;
-
-      csv_put_separator (csv);
-
-      if (csv->titles)
-        csv_output_table_cell (csv, table_item_get_title (table_item), "Table");
-
-      for (y = 0; y < t->n[TABLE_VERT]; y++)
+      for (int x = 0; x < t->n[TABLE_HORZ]; x++)
         {
-          for (x = 0; x < t->n[TABLE_HORZ]; x++)
-            {
-              struct table_cell cell;
+          struct table_cell cell;
 
-              table_get_cell (t, x, y, &cell);
+          table_get_cell (t, x, y, &cell);
 
-              if (x > 0)
-                fputs (csv->separator, csv->file);
+          if (x > 0)
+            fputs (csv->separator, csv->file);
 
-              if (x != cell.d[TABLE_HORZ][0] || y != cell.d[TABLE_VERT][0])
-                csv_output_field (csv, "");
-              else
-                csv_output_table_cell (csv, &cell, NULL);
-            }
-          putc ('\n', csv->file);
+          if (x != cell.d[TABLE_HORZ][0] || y != cell.d[TABLE_VERT][0])
+            csv_output_field (csv, "");
+          else
+            csv_output_table_cell (csv, &cell, !x ? leader : NULL);
         }
+      putc ('\n', csv->file);
+    }
+}
 
-      if (csv->captions)
-        csv_output_table_cell (csv, table_item_get_caption (table_item),
-                               "Caption");
+static void
+csv_output_table_layer (struct csv_driver *csv, const struct pivot_table *pt,
+                        const size_t *layer_indexes)
+{
+  struct table *title, *layers, *body, *caption, *footnotes;
+  pivot_output (pt, layer_indexes, &title, &layers, &body,
+                &caption, &footnotes, NULL, NULL);
+
+  csv_put_separator (csv);
+  csv_output_table__ (csv, title, "Table");
+  csv_output_table__ (csv, layers, "Layer");
+  csv_output_table__ (csv, body, NULL);
+  csv_output_table__ (csv, caption, "Caption");
+  csv_output_table__ (csv, footnotes, "Footnote");
+
+  table_unref (title);
+  table_unref (layers);
+  table_unref (body);
+  table_unref (caption);
+  table_unref (footnotes);
+}
 
-      struct footnote **f;
-      size_t n_footnotes = table_collect_footnotes (table_item, &f);
-      if (n_footnotes)
-        {
-          fputs ("\nFootnotes:\n", csv->file);
+static void
+csv_submit (struct output_driver *driver,
+            const struct output_item *output_item)
+{
+  struct csv_driver *csv = csv_driver_cast (driver);
 
-          for (size_t i = 0; i < n_footnotes; i++)
-            {
-              csv_output_field (csv, f[i]->marker);
-              fputs (csv->separator, csv->file);
-              csv_output_field (csv, f[i]->content);
-              putc ('\n', csv->file);
-            }
+  if (is_table_item (output_item))
+    {
+      const struct pivot_table *pt = to_table_item (output_item)->pt;
 
-          free (f);
-        }
+      size_t *layer_indexes;
+      PIVOT_OUTPUT_FOR_EACH_LAYER (layer_indexes, pt, true)
+        csv_output_table_layer (csv, pt, layer_indexes);
     }
   else if (is_text_item (output_item))
     {