X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcsv.c;h=455584914e7c4a470e8c506640880d6b94bad1f7;hb=621b1074dec940ae9ebfb1732f1ffa44d5d493b8;hp=d2f2ac3b634349f3dbf6b8c255807a8b03a76838;hpb=d3fef25674baf4f4e25502f257c680b5090535c6;p=pspp

diff --git a/src/output/csv.c b/src/output/csv.c
index d2f2ac3b63..455584914e 100644
--- a/src/output/csv.c
+++ b/src/output/csv.c
@@ -20,6 +20,7 @@
 #include <stdlib.h>
 
 #include "data/file-name.h"
+#include "data/file-handle-def.h"
 #include "libpspp/assertion.h"
 #include "libpspp/compiler.h"
 #include "libpspp/message.h"
@@ -46,9 +47,10 @@ struct csv_driver
     char *separator;            /* Field separator (usually comma or tab). */
     int quote;                  /* Quote character (usually ' or ") or 0. */
     char *quote_set;            /* Characters that force quoting. */
+    bool titles;                /* Print table titles? */
     bool captions;              /* Print table captions? */
 
-    char *file_name;            /* Output file name. */
+    struct file_handle *handle;
     char *command_name;         /* Current command. */
     FILE *file;                 /* Output file. */
     int n_items;                /* Number of items output so far. */
@@ -71,7 +73,7 @@ opt (struct output_driver *d, struct string_map *options, const char *key,
 }
 
 static struct output_driver *
-csv_create (const char *file_name, enum settings_output_devices device_type,
+csv_create (struct file_handle *fh, enum settings_output_devices device_type,
             struct string_map *o)
 {
   struct output_driver *d;
@@ -80,21 +82,22 @@ csv_create (const char *file_name, enum settings_output_devices device_type,
 
   csv = xzalloc (sizeof *csv);
   d = &csv->driver;
-  output_driver_init (&csv->driver, &csv_driver_class, file_name, device_type);
+  output_driver_init (&csv->driver, &csv_driver_class, fh_get_file_name (fh), device_type);
 
   csv->separator = parse_string (opt (d, o, "separator", ","));
   quote = parse_string (opt (d, o, "quote", "\""));
   csv->quote = quote[0];
   free (quote);
   csv->quote_set = xasprintf ("\n\r\t%s%c", csv->separator, csv->quote);
+  csv->titles = parse_boolean (opt (d, o, "titles", "true"));
   csv->captions = parse_boolean (opt (d, o, "captions", "true"));
-  csv->file_name = xstrdup (file_name);
-  csv->file = fn_open (csv->file_name, "w");
+  csv->handle = fh;
+  csv->file = fn_open (fh, "w");
   csv->n_items = 0;
 
   if (csv->file == NULL)
     {
-      msg_error (errno, _("error opening output file `%s'"), csv->file_name);
+      msg_error (errno, _("error opening output file `%s'"), fh_get_file_name (fh));
       output_driver_destroy (d);
       return NULL;
     }
@@ -108,11 +111,11 @@ csv_destroy (struct output_driver *driver)
   struct csv_driver *csv = csv_driver_cast (driver);
 
   if (csv->file != NULL)
-    fn_close (csv->file_name, csv->file);
+    fn_close (csv->handle, csv->file);
 
   free (csv->separator);
   free (csv->quote_set);
-  free (csv->file_name);
+  fh_unref (csv->handle);
   free (csv);
 }
 
@@ -189,12 +192,13 @@ csv_output_subtable (struct csv_driver *csv, struct string *s,
                      const struct table_item *item)
 {
   const struct table *t = table_item_get_table (item);
+  const char *title = table_item_get_title (item);
   const char *caption = table_item_get_caption (item);
   int y, x;
 
-  if (csv->captions && caption != NULL)
+  if (csv->titles && title != NULL)
     {
-      csv_output_field_format (csv, "Table: %s", caption);
+      csv_output_field_format (csv, "Table: %s", title);
       putc ('\n', csv->file);
     }
 
@@ -239,6 +243,12 @@ csv_output_subtable (struct csv_driver *csv, struct string *s,
           table_cell_free (&cell);
         }
     }
+
+  if (csv->captions && caption != NULL)
+    {
+      csv_output_field_format (csv, "Caption: %s", caption);
+      putc ('\n', csv->file);
+    }
 }
 
 static void
@@ -259,6 +269,7 @@ csv_submit (struct output_driver *driver,
   if (is_table_item (output_item))
     {
       struct table_item *table_item = to_table_item (output_item);
+      const char *title = table_item_get_title (table_item);
       const char *caption = table_item_get_caption (table_item);
       const struct table *t = table_item_get_table (table_item);
       int footnote_idx;
@@ -266,9 +277,9 @@ csv_submit (struct output_driver *driver,
 
       csv_put_separator (csv);
 
-      if (csv->captions && caption != NULL)
+      if (csv->titles && title != NULL)
         {
-          csv_output_field_format (csv, "Table: %s", caption);
+          csv_output_field_format (csv, "Table: %s", title);
           putc ('\n', csv->file);
         }
 
@@ -327,6 +338,12 @@ csv_submit (struct output_driver *driver,
           putc ('\n', csv->file);
         }
 
+      if (csv->captions && caption != NULL)
+        {
+          csv_output_field_format (csv, "Caption: %s", caption);
+          putc ('\n', csv->file);
+        }
+
       if (footnote_idx)
         {
           size_t i;