X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcsv.c;h=b29a6750538ac87fab0ccec4db1467ed714fbdad;hb=d950831f83004457e69c3e6e44131aef3e57efd3;hp=c5d418293efcaa00a340efa8900701172037cae8;hpb=b561da06cecf48556e94b4e033bd749eeba3bef7;p=pspp diff --git a/src/output/csv.c b/src/output/csv.c index c5d418293e..b29a675053 100644 --- a/src/output/csv.c +++ b/src/output/csv.c @@ -30,6 +30,7 @@ #include "output/driver-provider.h" #include "output/options.h" #include "output/message-item.h" +#include "output/page-eject-item.h" #include "output/table-item.h" #include "output/table-provider.h" @@ -128,30 +129,53 @@ 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_format_footnotes (const struct footnote **f, size_t n, struct string *s) +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_format_footnotes (struct footnote **f, size_t n, struct string *s) { for (size_t i = 0; i < n; i++) ds_put_format (s, "[%s]", f[i]->marker); @@ -174,10 +198,43 @@ csv_output_table_item_text (struct csv_driver *csv, } static void -csv_put_separator (struct csv_driver *csv) +csv_output_table_cell (struct csv_driver *csv, + const struct table_cell *cell, + const char *leader) { - if (csv->n_items++ > 0) - putc ('\n', csv->file); + if (!cell) + return; + + if (!(cell->options & TAB_MARKUP) && !cell->n_footnotes + && !cell->n_subscripts && !leader) + csv_output_field (csv, cell->text); + else + { + struct string s = DS_EMPTY_INITIALIZER; + + if (leader) + ds_put_format (&s, "%s: ", leader); + + if (cell->options & TAB_MARKUP) + { + char *t = output_get_text_from_markup (cell->text); + ds_put_cstr (&s, t); + free (t); + } + else + ds_put_cstr (&s, cell->text); + + if (cell->n_subscripts) + for (size_t i = 0; i < cell->n_subscripts; i++) + ds_put_format (&s, "%c%s", + i ? ',' : '_', cell->subscripts[i]); + csv_format_footnotes (cell->footnotes, cell->n_footnotes, &s); + csv_output_field (csv, ds_cstr (&s)); + ds_destroy (&s); + + if (leader) + putc ('\n', csv->file); + } } static void @@ -195,12 +252,11 @@ csv_submit (struct output_driver *driver, csv_put_separator (csv); if (csv->titles) - csv_output_table_item_text (csv, table_item_get_title (table_item), - "Table"); + csv_output_table_cell (csv, table_item_get_title (table_item), "Table"); - for (y = 0; y < table_nr (t); y++) + for (y = 0; y < t->n[TABLE_VERT]; y++) { - for (x = 0; x < table_nc (t); x++) + for (x = 0; x < t->n[TABLE_HORZ]; x++) { struct table_cell cell; @@ -211,31 +267,8 @@ 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 - && 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); + csv_output_table_cell (csv, &cell, NULL); } putc ('\n', csv->file); } @@ -244,20 +277,19 @@ csv_submit (struct output_driver *driver, csv_output_table_item_text (csv, table_item_get_caption (table_item), "Caption"); - const struct footnote **f; + 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); - } + { + 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); } @@ -268,19 +300,29 @@ csv_submit (struct output_driver *driver, enum text_item_type type = text_item_get_type (text_item); const char *text = text_item_get_text (text_item); - if (type == TEXT_ITEM_COMMAND_OPEN || type == TEXT_ITEM_COMMAND_CLOSE - || type == TEXT_ITEM_SYNTAX || type == TEXT_ITEM_PAGE_TITLE) + if (type == TEXT_ITEM_SYNTAX || type == TEXT_ITEM_PAGE_TITLE) return; csv_put_separator (csv); - csv_output_field (csv, text); - putc ('\n', csv->file); + + if (text_item->markup) + { + char *plain_text = output_get_text_from_markup (text); + csv_output_lines (csv, plain_text); + free (plain_text); + } + else + csv_output_lines (csv, text); + } + else if (is_page_eject_item (output_item)) + { + csv_put_separator (csv); + csv_output_lines (csv, ""); } 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, message_item->command_name); + char *s = msg_to_string (message_item_get_msg (message_item)); csv_put_separator (csv); csv_output_field (csv, s); free (s);