X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcsv.c;h=a34282e012ce57da598c962ba59cf11bdd78b33b;hb=29917c4f5908454803e663d2ad78bca4bc35e805;hp=004558f1b1dee53974680f26e60a3817d93ebd05;hpb=ddb7b52128d8f1f54d9632dc3a15c7869e0fbcce;p=pspp

diff --git a/src/output/csv.c b/src/output/csv.c
index 004558f1b1..a34282e012 100644
--- a/src/output/csv.c
+++ b/src/output/csv.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010, 2012, 2013, 2014 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,18 +20,20 @@
 #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"
+#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/error.h"
+#include "gl/minmax.h"
 #include "gl/xalloc.h"
 #include "gl/xvasprintf.h"
 
@@ -43,9 +45,13 @@ struct csv_driver
   {
     struct output_driver driver;
 
-    char *separator;            /* Comma or tab. */
-    char *file_name;            /* Output file name. */
-    char *command_name;         /* Current command. */
+    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? */
+
+    struct file_handle *handle;
     FILE *file;                 /* Output file. */
     int n_items;                /* Number of items output so far. */
   };
@@ -67,24 +73,31 @@ 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;
   struct csv_driver *csv;
+  char *quote;
 
   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", ","));
-  csv->file_name = parse_string (opt (d, o, "output-file", "pspp.csv"));
-  csv->file = fn_open (csv->file_name, "w");
+  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->handle = fh;
+  csv->file = fn_open (fh, "w");
   csv->n_items = 0;
 
   if (csv->file == NULL)
     {
-      error (0, errno, _("csv: 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;
     }
@@ -98,10 +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->file_name);
+  free (csv->quote_set);
+  fh_unref (csv->handle);
   free (csv);
 }
 
@@ -114,44 +128,29 @@ csv_flush (struct output_driver *driver)
 }
 
 static void
-csv_output_field (FILE *file, const char *field)
+csv_output_field__ (struct csv_driver *csv, struct substring field)
 {
-  while (*field == ' ')
-    field++;
+  ss_ltrim (&field, ss_cstr (" "));
 
-  if (field[strcspn (field, "\"\n\r,\t")])
+  if (csv->quote && ss_cspan (field, ss_cstr (csv->quote_set)) < field.length)
     {
-      const char *p;
-
-      putc ('"', file);
-      for (p = field; *p != '\0'; p++)
+      putc (csv->quote, csv->file);
+      for (size_t i = 0; i < field.length; i++)
         {
-          if (*p == '"')
-            putc ('"', file);
-          putc (*p, file);
+          if (field.string[i] == csv->quote)
+            putc (csv->quote, csv->file);
+          putc (field.string[i], csv->file);
         }
-      putc ('"', file);
+      putc (csv->quote, csv->file);
     }
   else
-    fputs (field, file);
+    fwrite (field.string, field.length, 1, csv->file);
 }
 
 static void
-csv_output_field_format (FILE *file, const char *format, ...)
-  PRINTF_FORMAT (2, 3);
-
-static void
-csv_output_field_format (FILE *file, const char *format, ...)
+csv_output_field (struct csv_driver *csv, const char *field)
 {
-  va_list args;
-  char *s;
-
-  va_start (args, format);
-  s = xvasprintf (format, args);
-  va_end (args);
-
-  csv_output_field (file, s);
-  free (s);
+  csv_output_field__ (csv, ss_cstr (field));
 }
 
 static void
@@ -162,89 +161,138 @@ csv_put_separator (struct csv_driver *csv)
 }
 
 static void
-csv_submit (struct output_driver *driver,
-            const struct output_item *output_item)
+csv_output_lines (struct csv_driver *csv, const char *text_)
 {
-  struct csv_driver *csv = csv_driver_cast (driver);
-
-  output_driver_track_current_command (output_item, &csv->command_name);
-
-  if (is_table_item (output_item))
+  struct substring text = ss_cstr (text_);
+  struct substring line;
+  size_t save_idx = 0;
+  while (ss_separate (text, ss_cstr ("\n"), &save_idx, &line))
     {
-      struct table_item *table_item = to_table_item (output_item);
-      const char *caption = table_item_get_caption (table_item);
-      const struct table *t = table_item_get_table (table_item);
-      int x, y;
+      csv_output_field__ (csv, line);
+      putc ('\n', csv->file);
+    }
+}
 
-      csv_put_separator (csv);
+static void
+csv_output_table_cell (struct csv_driver *csv, const struct pivot_table *pt,
+                       const struct table_cell *cell, const char *leader)
+{
+  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);
+}
 
-      if (caption != NULL)
-        {
-          csv_output_field_format (csv->file, "Table: %s", caption);
-          putc ('\n', csv->file);
-        }
+static void
+csv_output_table__ (struct csv_driver *csv, const struct pivot_table *pt,
+                    const struct table *t, const char *leader)
+{
+  if (!t)
+    return;
 
-      for (y = 0; y < table_nr (t); y++)
+  for (int y = 0; y < t->n[TABLE_VERT]; y++)
+    {
+      for (int x = 0; x < t->n[TABLE_HORZ]; x++)
         {
-          for (x = 0; x < table_nc (t); x++)
-            {
-              struct table_cell cell;
-
-              table_get_cell (t, x, y, &cell);
+          struct table_cell cell;
 
-              if (x > 0)
-                fputs (csv->separator, csv->file);
+          table_get_cell (t, x, y, &cell);
 
-              if (x != cell.d[TABLE_HORZ][0] || y != cell.d[TABLE_VERT][0])
-                csv_output_field (csv->file, "");
-              else
-                csv_output_field (csv->file, cell.contents);
+          if (x > 0)
+            fputs (csv->separator, csv->file);
 
-              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);
     }
-  else if (is_text_item (output_item))
+}
+
+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);
+}
+
+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_COMMAND_OPEN || type == TEXT_ITEM_COMMAND_CLOSE
-          || type == TEXT_ITEM_SYNTAX)
-        return;
+    case OUTPUT_ITEM_GROUP_OPEN:
+      break;
 
-      csv_put_separator (csv);
-      switch (type)
-        {
-        case TEXT_ITEM_TITLE:
-          csv_output_field_format (csv->file, "Title: %s", text);
-          break;
+    case OUTPUT_ITEM_GROUP_CLOSE:
+      break;
 
-        case TEXT_ITEM_SUBTITLE:
-          csv_output_field_format (csv->file, "Subtitle: %s", text);
-          break;
+    case OUTPUT_ITEM_IMAGE:
+      break;
 
-        default:
-          csv_output_field (csv->file, text);
-          break;
-        }
-      putc ('\n', csv->file);
-    }
-  else if (is_message_item (output_item))
-    {
-      const struct message_item *message_item = to_message_item (output_item);
-      const struct msg *msg = message_item_get_msg (message_item);
-      char *s = msg_to_string (msg, csv->command_name);
+    case OUTPUT_ITEM_MESSAGE:
       csv_put_separator (csv);
-      csv_output_field (csv->file, s);
+      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_PAGE_SETUP:
+      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;
     }
 }
 
-struct output_driver_factory csv_driver_factory = { "csv", csv_create };
+struct output_driver_factory csv_driver_factory = { "csv", "-", csv_create };
 
 static const struct output_driver_class csv_driver_class =
   {