X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcsv.c;h=ba1481c9a0c44caf9ab2de9873b67aa2f49dd604;hb=c1b1583b96cc05a2bf9f3f6d01bbfa063fafb253;hp=8493df34c613e02b35c519126f73364ce55e0473;hpb=a353919df75c25331144602421353a856f4236d6;p=pspp

diff --git a/src/output/csv.c b/src/output/csv.c
index 8493df34c6..ba1481c9a0 100644
--- a/src/output/csv.c
+++ b/src/output/csv.c
@@ -26,11 +26,11 @@
 #include "libpspp/message.h"
 #include "libpspp/str.h"
 #include "libpspp/string-map.h"
-#include "output/text-item.h"
 #include "output/driver-provider.h"
 #include "output/options.h"
-#include "output/message-item.h"
-#include "output/table-item.h"
+#include "output/output-item.h"
+#include "output/pivot-output.h"
+#include "output/pivot-table.h"
 #include "output/table-provider.h"
 
 #include "gl/minmax.h"
@@ -77,10 +77,9 @@ csv_create (struct file_handle *fh, enum settings_output_devices device_type,
             struct string_map *o)
 {
   struct output_driver *d;
-  struct csv_driver *csv;
   char *quote;
 
-  csv = xzalloc (sizeof *csv);
+  struct csv_driver *csv = XZALLOC (struct csv_driver);
   d = &csv->driver;
   output_driver_init (&csv->driver, &csv_driver_class, fh_get_file_name (fh), device_type);
 
@@ -128,161 +127,161 @@ csv_flush (struct output_driver *driver)
 }
 
 static void
-csv_output_field (struct csv_driver *csv, const char *field)
+csv_output_field__ (struct csv_driver *csv, struct substring field)
 {
-  while (*field == ' ')
-    field++;
+  ss_ltrim (&field, ss_cstr (" "));
 
-  if (csv->quote && field[strcspn (field, csv->quote_set)])
+  if (csv->quote && ss_cspan (field, ss_cstr (csv->quote_set)) < field.length)
     {
-      const char *p;
-
       putc (csv->quote, csv->file);
-      for (p = field; *p != '\0'; p++)
+      for (size_t i = 0; i < field.length; i++)
         {
-          if (*p == csv->quote)
+          if (field.string[i] == csv->quote)
             putc (csv->quote, csv->file);
-          putc (*p, csv->file);
+          putc (field.string[i], csv->file);
         }
       putc (csv->quote, csv->file);
     }
   else
-    fputs (field, csv->file);
+    fwrite (field.string, field.length, 1, csv->file);
 }
 
 static void
-csv_format_footnotes (const struct footnote **f, size_t n, struct string *s)
+csv_output_field (struct csv_driver *csv, const char *field)
 {
-  for (size_t i = 0; i < n; i++)
-    ds_put_format (s, "[%s]", f[i]->marker);
+  csv_output_field__ (csv, ss_cstr (field));
 }
 
 static void
-csv_output_table_item_text (struct csv_driver *csv,
-                            const struct table_item_text *text,
-                            const char *leader)
+csv_put_separator (struct csv_driver *csv)
 {
-  if (!text)
-    return;
+  if (csv->n_items++ > 0)
+    putc ('\n', csv->file);
+}
 
-  struct string s = DS_EMPTY_INITIALIZER;
-  ds_put_format (&s, "%s: %s", leader, text->content);
-  csv_format_footnotes (text->footnotes, text->n_footnotes, &s);
-  csv_output_field (csv, ds_cstr (&s));
-  ds_destroy (&s);
-  putc ('\n', csv->file);
+static void
+csv_output_lines (struct csv_driver *csv, const char *text_)
+{
+  struct substring text = ss_cstr (text_);
+  struct substring line;
+  size_t save_idx = 0;
+  while (ss_separate (text, ss_cstr ("\n"), &save_idx, &line))
+    {
+      csv_output_field__ (csv, line);
+      putc ('\n', csv->file);
+    }
 }
 
 static void
-csv_put_separator (struct csv_driver *csv)
+csv_output_table_cell (struct csv_driver *csv, const struct pivot_table *pt,
+                       const struct table_cell *cell, const char *leader)
 {
-  if (csv->n_items++ > 0)
-    putc ('\n', csv->file);
+  struct string s = DS_EMPTY_INITIALIZER;
+  if (leader)
+    ds_put_format (&s, "%s: ", leader);
+  pivot_value_format (cell->value, pt, &s);
+  csv_output_field (csv, ds_cstr (&s));
+  ds_destroy (&s);
 }
 
 static void
-csv_submit (struct output_driver *driver,
-            const struct output_item *output_item)
+csv_output_table__ (struct csv_driver *csv, const struct pivot_table *pt,
+                    const struct table *t, const char *leader)
 {
-  struct csv_driver *csv = csv_driver_cast (driver);
+  if (!t)
+    return;
 
-  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;
+      for (int x = 0; x < t->n[TABLE_HORZ]; x++)
+        {
+          struct table_cell cell;
 
-      csv_put_separator (csv);
+          table_get_cell (t, x, y, &cell);
 
-      if (csv->titles)
-        csv_output_table_item_text (csv, table_item_get_title (table_item),
-                                    "Table");
+          if (x > 0)
+            fputs (csv->separator, csv->file);
 
-      for (y = 0; y < table_nr (t); y++)
-        {
-          for (x = 0; x < table_nc (t); x++)
-            {
-              struct table_cell cell;
-
-              table_get_cell (t, x, y, &cell);
-
-              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 if (cell.n_contents == 1
-                       && cell.contents[0].text != NULL
-                       && cell.contents[0].n_footnotes == 0)
-                csv_output_field (csv, cell.contents[0].text);
-              else
-                {
-                  struct string s;
-                  size_t i;
-
-                  ds_init_empty (&s);
-                  for (i = 0; i < cell.n_contents; i++)
-                    {
-                      const struct cell_contents *c = &cell.contents[i];
-
-                      if (i > 0)
-                        ds_put_cstr (&s, "\n\n");
-
-                      ds_put_cstr (&s, c->text);
-                      csv_format_footnotes (c->footnotes, c->n_footnotes, &s);
-                    }
-                  csv_output_field (csv, ds_cstr (&s));
-                  ds_destroy (&s);
-                }
-
-              table_cell_free (&cell);
-            }
-          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, pt, &cell, !x ? leader : NULL);
         }
+      putc ('\n', csv->file);
+    }
+}
 
-      if (csv->captions)
-        csv_output_table_item_text (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, true, &title, &layers, &body,
+                &caption, &footnotes, NULL, NULL);
+
+  csv_put_separator (csv);
+  csv_output_table__ (csv, pt, title, "Table");
+  csv_output_table__ (csv, pt, layers, "Layer");
+  csv_output_table__ (csv, pt, body, NULL);
+  csv_output_table__ (csv, pt, caption, "Caption");
+  csv_output_table__ (csv, pt, footnotes, "Footnote");
+
+  table_unref (title);
+  table_unref (layers);
+  table_unref (body);
+  table_unref (caption);
+  table_unref (footnotes);
+}
 
-      const struct footnote **f;
-      size_t n_footnotes = table_collect_footnotes (table_item, &f);
-      if (n_footnotes)
-        {
-          fputs ("\nFootnotes:\n", csv->file);
-
-          for (size_t i = 0; i < n_footnotes; i++)
-            if (f[i])
-              {
-                csv_output_field (csv, f[i]->marker);
-                fputs (csv->separator, csv->file);
-                csv_output_field (csv, f[i]->content);
-                putc ('\n', csv->file);
-              }
-
-          free (f);
-        }
-    }
-  else if (is_text_item (output_item))
+static void
+csv_submit (struct output_driver *driver,
+            const struct output_item *item)
+{
+  struct csv_driver *csv = csv_driver_cast (driver);
+
+  switch (item->type)
     {
-      const struct text_item *text_item = to_text_item (output_item);
-      enum text_item_type type = text_item_get_type (text_item);
-      const char *text = text_item_get_text (text_item);
+    case OUTPUT_ITEM_CHART:
+      break;
 
-      if (type == TEXT_ITEM_SYNTAX || type == TEXT_ITEM_PAGE_TITLE)
-        return;
+    case OUTPUT_ITEM_GROUP:
+      break;
 
+    case OUTPUT_ITEM_IMAGE:
+      break;
+
+    case OUTPUT_ITEM_MESSAGE:
       csv_put_separator (csv);
-      csv_output_field (csv, text);
-      putc ('\n', csv->file);
-    }
-  else if (is_message_item (output_item))
-    {
-      const struct message_item *message_item = to_message_item (output_item);
-      char *s = msg_to_string (message_item_get_msg (message_item));
-      csv_put_separator (csv);
+      char *s = msg_to_string (item->message);
       csv_output_field (csv, s);
       free (s);
       putc ('\n', csv->file);
+      break;
+
+    case OUTPUT_ITEM_PAGE_BREAK:
+      csv_put_separator (csv);
+      csv_output_lines (csv, "");
+      break;
+
+    case OUTPUT_ITEM_TABLE:
+      {
+        size_t *layer_indexes;
+        PIVOT_OUTPUT_FOR_EACH_LAYER (layer_indexes, item->table, true)
+          csv_output_table_layer (csv, item->table, layer_indexes);
+      }
+      break;
+
+    case OUTPUT_ITEM_TEXT:
+      if (item->text.subtype == TEXT_ITEM_SYNTAX
+          || item->text.subtype == TEXT_ITEM_PAGE_TITLE)
+        return;
+
+      csv_put_separator (csv);
+
+      char *text = text_item_get_plain_text (item);
+      csv_output_lines (csv, text);
+      free (text);
+      break;
     }
 }
 
@@ -290,8 +289,8 @@ struct output_driver_factory csv_driver_factory = { "csv", "-", csv_create };
 
 static const struct output_driver_class csv_driver_class =
   {
-    "csv",
-    csv_destroy,
-    csv_submit,
-    csv_flush,
+    .name = "csv",
+    .destroy = csv_destroy,
+    .submit = csv_submit,
+    .flush = csv_flush,
   };