/*
- * Copyright (c) 2009, 2010, 2011 Nicira Networks.
+ * Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
size_t n_rows, allocated_rows;
size_t current_column;
char *caption;
+ bool timestamp;
};
void table_init(struct table *);
void table_destroy(struct table *);
void table_set_caption(struct table *, char *caption);
+void table_set_timestamp(struct table *, bool timestamp);
void table_add_column(struct table *, const char *heading, ...)
PRINTF_FORMAT(2, 3);
enum table_format {
TF_TABLE, /* 2-d table. */
+ TF_LIST, /* One cell per line, one row per paragraph. */
TF_HTML, /* HTML table. */
TF_CSV, /* Comma-separated lines. */
TF_JSON /* JSON. */
enum cell_format {
CF_STRING, /* String format. */
+ CF_BARE, /* String format without most punctuation. */
CF_JSON /* JSON. */
};
#define TABLE_OPTION_ENUMS \
OPT_NO_HEADINGS, \
- OPT_PRETTY
+ OPT_PRETTY, \
+ OPT_BARE
-#define TABLE_LONG_OPTIONS \
- {"format", required_argument, 0, 'f'}, \
- {"data", required_argument, 0, 'd'}, \
- {"no-headings", no_argument, 0, OPT_NO_HEADINGS}, \
- {"pretty", no_argument, 0, OPT_PRETTY},
+#define TABLE_LONG_OPTIONS \
+ {"format", required_argument, NULL, 'f'}, \
+ {"data", required_argument, NULL, 'd'}, \
+ {"no-headings", no_argument, NULL, OPT_NO_HEADINGS}, \
+ {"pretty", no_argument, NULL, OPT_PRETTY}, \
+ {"bare", no_argument, NULL, OPT_BARE}
#define TABLE_OPTION_HANDLERS(STYLE) \
case 'f': \
\
case OPT_PRETTY: \
(STYLE)->json_flags |= JSSF_PRETTY; \
+ break; \
+ \
+ case OPT_BARE: \
+ (STYLE)->format = TF_LIST; \
+ (STYLE)->cell_format = CF_BARE; \
+ (STYLE)->headings = false; \
break;
void table_parse_format(struct table_style *, const char *format);