Mirrors/miller
1
0
Fork 0
mirror of https://github.com/johnkerl/miller.git synced 2026-07-22 23:48:30 +00:00
Code Issues Projects Releases Wiki Activity

oosvar flatten separator iterate

Browse source
This commit is contained in:
John Kerl 2016-03-30 07:45:34 -04:00
parent 72805b5dd0
commit eb56bafc08
3 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
c/cli/mlrcli.c
View file

@ -202,6 +202,8 @@ static char* rebackslash(char* sep) {
#define DEFAULT_JSON_FLATTEN_SEPARATOR ":"
#define DEFAULT_OOSVAR_FLATTEN_SEPARATOR ":"
// ----------------------------------------------------------------
// The main_usage() function is split out into subroutines in support of the
// manpage autogenerator.
@ -594,6 +596,8 @@ cli_opts_t* parse_command_line(int argc, char** argv) {
popts->quote_json_values_always = FALSE;
popts->json_flatten_separator = DEFAULT_JSON_FLATTEN_SEPARATOR;
popts->oosvar_flatten_separator = DEFAULT_OOSVAR_FLATTEN_SEPARATOR;
popts->ofmt = DEFAULT_OFMT;
popts->oquoting = DEFAULT_OQUOTING;
@ -769,6 +773,11 @@ cli_opts_t* parse_command_line(int argc, char** argv) {
popts->json_flatten_separator = cli_sep_from_arg(argv[argi+1], argv[0]);
argi++;
} else if (streq(argv[argi], "--vflatsep")) {
check_arg_count(argv, argi, argc, 2);
popts->oosvar_flatten_separator = cli_sep_from_arg(argv[argi+1], argv[0]);
argi++;
} else if (streq(argv[argi], "--csv")) { popts->ifile_fmt = popts->ofile_fmt = "csv";
} else if (streq(argv[argi], "--icsv")) { popts->ifile_fmt = "csv";
} else if (streq(argv[argi], "--ocsv")) { popts->ofile_fmt = "csv";

2
c/cli/mlrcli.h
View file

@ -36,6 +36,8 @@ typedef struct _cli_opts_t {
int quote_json_values_always;
char* json_flatten_separator;
char* oosvar_flatten_separator;
char* ofmt;
quoting_t oquoting;

2
c/todo.txt
View file

@ -59,6 +59,8 @@ TOP-OF-LIST SUMMARY
----------------------------------------------------------------
IMPLEMENT:
? people may ask for ingest version of emit ...
? try to merge emitf and emit
* cli-parameterize the joinchar (:)