output: Move text_item and group_item usage closer to the SPV model.

[pspp] / src / output / csv.c

diff --git a/src/output/csv.c b/src/output/csv.c
index 0067c61202e306c41fd36e0d991ae94f919536cd..65566c4e3a624a2ba5b02589438b019e52624e0c 100644 (file)
--- a/src/output/csv.c
+++ b/src/output/csv.c
@@ -128,26 +128,49 @@ 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_output_field (struct csv_driver *csv, const char *field)
+{
+  csv_output_field__ (csv, ss_cstr (field));
+}
+
+static void
+csv_put_separator (struct csv_driver *csv)
+{
+  if (csv->n_items++ > 0)
+    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
@@ -173,13 +196,6 @@ csv_output_table_item_text (struct csv_driver *csv,
   putc ('\n', csv->file);
 }
 
-static void
-csv_put_separator (struct csv_driver *csv)
-{
-  if (csv->n_items++ > 0)
-    putc ('\n', csv->file);
-}
-
 static void
 csv_submit (struct output_driver *driver,
             const struct output_item *output_item)
@@ -268,15 +284,15 @@ csv_submit (struct output_driver *driver,
         return;
 
       csv_put_separator (csv);
+
       if (text_item->markup)
         {
           char *plain_text = output_get_text_from_markup (text);
-          csv_output_field (csv, plain_text);
+          csv_output_lines (csv, plain_text);
           free (plain_text);
         }
       else
-        csv_output_field (csv, text);
-      putc ('\n', csv->file);
+        csv_output_lines (csv, text);
     }
   else if (is_message_item (output_item))
     {