projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
csv: Add ability to suppress table captions.
[pspp-builds.git]
/
src
/
output
/
csv.c
diff --git
a/src/output/csv.c
b/src/output/csv.c
index 3fbf53d963448b041d403c81f2e4cd13fe6ad227..d168fd9534140230f2e4fb9c15646aa779c0a7e2 100644
(file)
--- a/
src/output/csv.c
+++ b/
src/output/csv.c
@@
-45,6
+45,8
@@
struct csv_driver
char *separator; /* Field separator (usually comma or tab). */
char *quote_set; /* Characters that force quoting. */
char *separator; /* Field separator (usually comma or tab). */
char *quote_set; /* Characters that force quoting. */
+ bool captions; /* Print table captions? */
+
char *file_name; /* Output file name. */
char *command_name; /* Current command. */
FILE *file; /* Output file. */
char *file_name; /* Output file name. */
char *command_name; /* Current command. */
FILE *file; /* Output file. */
@@
-80,6
+82,7
@@
csv_create (const char *file_name, enum settings_output_devices device_type,
csv->separator = parse_string (opt (d, o, "separator", ","));
csv->quote_set = xasprintf ("\"\n\r\t%s", csv->separator);
csv->separator = parse_string (opt (d, o, "separator", ","));
csv->quote_set = xasprintf ("\"\n\r\t%s", csv->separator);
+ csv->captions = parse_boolean (opt (d, o, "captions", "true"));
csv->file_name = xstrdup (file_name);
csv->file = fn_open (csv->file_name, "w");
csv->n_items = 0;
csv->file_name = xstrdup (file_name);
csv->file = fn_open (csv->file_name, "w");
csv->n_items = 0;
@@
-181,7
+184,7
@@
csv_submit (struct output_driver *driver,
csv_put_separator (csv);
csv_put_separator (csv);
- if (caption != NULL)
+ if (c
sv->captions && c
aption != NULL)
{
csv_output_field_format (csv, "Table: %s", caption);
putc ('\n', csv->file);
{
csv_output_field_format (csv, "Table: %s", caption);
putc ('\n', csv->file);