X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcsv.c;h=9be53c8b0f0c92716fc0fe397e23289f7c0a0847;hb=a0a7eb746b634d7d6c0ac3a8827e960a45c26179;hp=d168fd9534140230f2e4fb9c15646aa779c0a7e2;hpb=5deb8ead72bb5b6058594894bec297768692d780;p=pspp diff --git a/src/output/csv.c b/src/output/csv.c index d168fd9534..9be53c8b0f 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 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 @@ -23,6 +23,7 @@ #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" @@ -31,7 +32,6 @@ #include "output/table-item.h" #include "output/table-provider.h" -#include "gl/error.h" #include "gl/xalloc.h" #include "gl/xvasprintf.h" @@ -44,6 +44,7 @@ struct csv_driver struct output_driver 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 captions; /* Print table captions? */ @@ -75,13 +76,17 @@ csv_create (const char *file_name, enum settings_output_devices device_type, { 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); csv->separator = parse_string (opt (d, o, "separator", ",")); - csv->quote_set = xasprintf ("\"\n\r\t%s", csv->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->captions = parse_boolean (opt (d, o, "captions", "true")); csv->file_name = xstrdup (file_name); csv->file = fn_open (csv->file_name, "w"); @@ -89,7 +94,7 @@ csv_create (const char *file_name, enum settings_output_devices device_type, if (csv->file == NULL) { - error (0, errno, _("error opening output file `%s'"), csv->file_name); + msg_error (errno, _("error opening output file `%s'"), csv->file_name); output_driver_destroy (d); return NULL; } @@ -125,23 +130,95 @@ csv_output_field (struct csv_driver *csv, const char *field) while (*field == ' ') field++; - if (field[strcspn (field, csv->quote_set)]) + if (csv->quote && field[strcspn (field, csv->quote_set)]) { const char *p; - putc ('"', csv->file); + putc (csv->quote, csv->file); for (p = field; *p != '\0'; p++) { - if (*p == '"') - putc ('"', csv->file); + if (*p == csv->quote) + putc (csv->quote, csv->file); putc (*p, csv->file); } - putc ('"', csv->file); + putc (csv->quote, csv->file); } else fputs (field, csv->file); } +static void +csv_put_field (struct csv_driver *csv, struct string *s, const char *field) +{ + while (*field == ' ') + field++; + + if (csv->quote && field[strcspn (field, csv->quote_set)]) + { + const char *p; + + ds_put_byte (s, csv->quote); + for (p = field; *p != '\0'; p++) + { + if (*p == csv->quote) + ds_put_byte (s, csv->quote); + ds_put_byte (s, *p); + } + ds_put_byte (s, csv->quote); + } + else + ds_put_cstr (s, field); +} + +static void +csv_output_subtable (struct csv_driver *csv, struct string *s, + const struct table *t) +{ + int y, x; + + for (y = 0; y < table_nr (t); y++) + { + if (y > 0) + ds_put_byte (s, '\n'); + + for (x = 0; x < table_nc (t); x++) + { + struct table_cell cell; + + table_get_cell (t, x, y, &cell); + + if (x > 0) + ds_put_cstr (s, csv->separator); + + if (x != cell.d[TABLE_HORZ][0] || y != cell.d[TABLE_VERT][0]) + csv_put_field (csv, s, ""); + else if (cell.n_contents == 1 && cell.contents[0].text != NULL) + csv_put_field (csv, s, cell.contents[0].text); + else + { + struct string s2; + size_t i; + + ds_init_empty (&s2); + for (i = 0; i < cell.n_contents; i++) + { + if (i > 0) + ds_put_cstr (&s2, "\n\n"); + + if (cell.contents[i].text != NULL) + ds_put_cstr (&s2, cell.contents[i].text); + else + csv_output_subtable (csv, &s2, cell.contents[i].table); + } + csv_put_field (csv, s, ds_cstr (&s2)); + ds_destroy (&s2); + } + + table_cell_free (&cell); + } + } +} + static void csv_output_field_format (struct csv_driver *csv, const char *format, ...) PRINTF_FORMAT (2, 3); @@ -203,8 +280,27 @@ csv_submit (struct output_driver *driver, 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) + csv_output_field (csv, cell.contents[0].text); else - csv_output_field (csv, cell.contents); + { + struct string s; + size_t i; + + ds_init_empty (&s); + for (i = 0; i < cell.n_contents; i++) + { + if (i > 0) + ds_put_cstr (&s, "\n\n"); + + if (cell.contents[i].text != NULL) + ds_put_cstr (&s, cell.contents[i].text); + else + csv_output_subtable (csv, &s, cell.contents[i].table); + } + csv_output_field (csv, ds_cstr (&s)); + ds_destroy (&s); + } table_cell_free (&cell); } @@ -250,7 +346,7 @@ csv_submit (struct output_driver *driver, } } -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 = {