From fd2812205190eafb8fdc211ce156bdb20853cb5e Mon Sep 17 00:00:00 2001 From: John Kerl Date: Mon, 14 Sep 2020 23:20:53 -0400 Subject: [PATCH] --c2j etc --- go/src/miller/cli/mlrcli_parse.go | 300 +++++++++++++++--------------- go/todo.txt | 4 +- go/u/try-io | 1 + 3 files changed, 153 insertions(+), 152 deletions(-) diff --git a/go/src/miller/cli/mlrcli_parse.go b/go/src/miller/cli/mlrcli_parse.go index 017ee7389..d1a748fd2 100644 --- a/go/src/miller/cli/mlrcli_parse.go +++ b/go/src/miller/cli/mlrcli_parse.go @@ -820,81 +820,81 @@ func parseReaderWriterOptions( // writerOptions.OutputFileFormat = "pprint"; // argi += 1; // - // } else if args[argi] == "--c2t" { - // readerOptions.InputFileFormat = "csv"; - // readerOptions.IRS = "auto"; - // writerOptions.OutputFileFormat = "csv"; - // writerOptions.ORS = "auto"; - // writerOptions.OFS = "\t"; - // argi += 1; - // } else if args[argi] == "--c2d" { - // readerOptions.InputFileFormat = "csv"; - // readerOptions.IRS = "auto"; - // writerOptions.OutputFileFormat = "dkvp"; - // argi += 1; - // } else if args[argi] == "--c2n" { - // readerOptions.InputFileFormat = "csv"; - // readerOptions.IRS = "auto"; - // writerOptions.OutputFileFormat = "nidx"; - // argi += 1; - // } else if args[argi] == "--c2j" { - // readerOptions.InputFileFormat = "csv"; - // readerOptions.IRS = "auto"; - // writerOptions.OutputFileFormat = "json"; - // argi += 1; - // } else if args[argi] == "--c2p" { - // readerOptions.InputFileFormat = "csv"; - // readerOptions.IRS = "auto"; - // writerOptions.OutputFileFormat = "pprint"; - // argi += 1; - // } else if args[argi] == "--c2x" { - // readerOptions.InputFileFormat = "csv"; - // readerOptions.IRS = "auto"; - // writerOptions.OutputFileFormat = "xtab"; - // argi += 1; + } else if args[argi] == "--c2t" { + readerOptions.InputFileFormat = "csv"; + readerOptions.IRS = "auto"; + writerOptions.OutputFileFormat = "csv"; + writerOptions.ORS = "auto"; + writerOptions.OFS = "\t"; + argi += 1; + } else if args[argi] == "--c2d" { + readerOptions.InputFileFormat = "csv"; + readerOptions.IRS = "auto"; + writerOptions.OutputFileFormat = "dkvp"; + argi += 1; + } else if args[argi] == "--c2n" { + readerOptions.InputFileFormat = "csv"; + readerOptions.IRS = "auto"; + writerOptions.OutputFileFormat = "nidx"; + argi += 1; + } else if args[argi] == "--c2j" { + readerOptions.InputFileFormat = "csv"; + readerOptions.IRS = "auto"; + writerOptions.OutputFileFormat = "json"; + argi += 1; + } else if args[argi] == "--c2p" { + readerOptions.InputFileFormat = "csv"; + readerOptions.IRS = "auto"; + writerOptions.OutputFileFormat = "pprint"; + argi += 1; + } else if args[argi] == "--c2x" { + readerOptions.InputFileFormat = "csv"; + readerOptions.IRS = "auto"; + writerOptions.OutputFileFormat = "xtab"; + argi += 1; // } else if args[argi] == "--c2m" { // readerOptions.InputFileFormat = "csv"; // readerOptions.IRS = "auto"; // writerOptions.OutputFileFormat = "markdown"; // argi += 1; // - // } else if args[argi] == "--t2c" { - // readerOptions.InputFileFormat = "csv"; - // readerOptions.IFS = "\t"; - // readerOptions.IRS = "auto"; - // writerOptions.OutputFileFormat = "csv"; - // writerOptions.ORS = "auto"; - // argi += 1; - // } else if args[argi] == "--t2d" { - // readerOptions.InputFileFormat = "csv"; - // readerOptions.IFS = "\t"; - // readerOptions.IRS = "auto"; - // writerOptions.OutputFileFormat = "dkvp"; - // argi += 1; - // } else if args[argi] == "--t2n" { - // readerOptions.InputFileFormat = "csv"; - // readerOptions.IFS = "\t"; - // readerOptions.IRS = "auto"; - // writerOptions.OutputFileFormat = "nidx"; - // argi += 1; - // } else if args[argi] == "--t2j" { - // readerOptions.InputFileFormat = "csv"; - // readerOptions.IFS = "\t"; - // readerOptions.IRS = "auto"; - // writerOptions.OutputFileFormat = "json"; - // argi += 1; - // } else if args[argi] == "--t2p" { - // readerOptions.InputFileFormat = "csv"; - // readerOptions.IFS = "\t"; - // readerOptions.IRS = "auto"; - // writerOptions.OutputFileFormat = "pprint"; - // argi += 1; - // } else if args[argi] == "--t2x" { - // readerOptions.InputFileFormat = "csv"; - // readerOptions.IFS = "\t"; - // readerOptions.IRS = "auto"; - // writerOptions.OutputFileFormat = "xtab"; - // argi += 1; + } else if args[argi] == "--t2c" { + readerOptions.InputFileFormat = "csv"; + readerOptions.IFS = "\t"; + readerOptions.IRS = "auto"; + writerOptions.OutputFileFormat = "csv"; + writerOptions.ORS = "auto"; + argi += 1; + } else if args[argi] == "--t2d" { + readerOptions.InputFileFormat = "csv"; + readerOptions.IFS = "\t"; + readerOptions.IRS = "auto"; + writerOptions.OutputFileFormat = "dkvp"; + argi += 1; + } else if args[argi] == "--t2n" { + readerOptions.InputFileFormat = "csv"; + readerOptions.IFS = "\t"; + readerOptions.IRS = "auto"; + writerOptions.OutputFileFormat = "nidx"; + argi += 1; + } else if args[argi] == "--t2j" { + readerOptions.InputFileFormat = "csv"; + readerOptions.IFS = "\t"; + readerOptions.IRS = "auto"; + writerOptions.OutputFileFormat = "json"; + argi += 1; + } else if args[argi] == "--t2p" { + readerOptions.InputFileFormat = "csv"; + readerOptions.IFS = "\t"; + readerOptions.IRS = "auto"; + writerOptions.OutputFileFormat = "pprint"; + argi += 1; + } else if args[argi] == "--t2x" { + readerOptions.InputFileFormat = "csv"; + readerOptions.IFS = "\t"; + readerOptions.IRS = "auto"; + writerOptions.OutputFileFormat = "xtab"; + argi += 1; // } else if args[argi] == "--t2m" { // readerOptions.InputFileFormat = "csv"; // readerOptions.IFS = "\t"; @@ -902,97 +902,97 @@ func parseReaderWriterOptions( // writerOptions.OutputFileFormat = "markdown"; // argi += 1; // - // } else if args[argi] == "--d2c" { - // readerOptions.InputFileFormat = "dkvp"; - // writerOptions.OutputFileFormat = "csv"; - // writerOptions.ORS = "auto"; - // argi += 1; - // } else if args[argi] == "--d2t" { - // readerOptions.InputFileFormat = "dkvp"; - // writerOptions.OutputFileFormat = "csv"; - // writerOptions.ORS = "auto"; - // writerOptions.OFS = "\t"; - // argi += 1; - // } else if args[argi] == "--d2n" { - // readerOptions.InputFileFormat = "dkvp"; - // writerOptions.OutputFileFormat = "nidx"; - // argi += 1; - // } else if args[argi] == "--d2j" { - // readerOptions.InputFileFormat = "dkvp"; - // writerOptions.OutputFileFormat = "json"; - // argi += 1; - // } else if args[argi] == "--d2p" { - // readerOptions.InputFileFormat = "dkvp"; - // writerOptions.OutputFileFormat = "pprint"; - // argi += 1; - // } else if args[argi] == "--d2x" { - // readerOptions.InputFileFormat = "dkvp"; - // writerOptions.OutputFileFormat = "xtab"; - // argi += 1; + } else if args[argi] == "--d2c" { + readerOptions.InputFileFormat = "dkvp"; + writerOptions.OutputFileFormat = "csv"; + writerOptions.ORS = "auto"; + argi += 1; + } else if args[argi] == "--d2t" { + readerOptions.InputFileFormat = "dkvp"; + writerOptions.OutputFileFormat = "csv"; + writerOptions.ORS = "auto"; + writerOptions.OFS = "\t"; + argi += 1; + } else if args[argi] == "--d2n" { + readerOptions.InputFileFormat = "dkvp"; + writerOptions.OutputFileFormat = "nidx"; + argi += 1; + } else if args[argi] == "--d2j" { + readerOptions.InputFileFormat = "dkvp"; + writerOptions.OutputFileFormat = "json"; + argi += 1; + } else if args[argi] == "--d2p" { + readerOptions.InputFileFormat = "dkvp"; + writerOptions.OutputFileFormat = "pprint"; + argi += 1; + } else if args[argi] == "--d2x" { + readerOptions.InputFileFormat = "dkvp"; + writerOptions.OutputFileFormat = "xtab"; + argi += 1; // } else if args[argi] == "--d2m" { // readerOptions.InputFileFormat = "dkvp"; // writerOptions.OutputFileFormat = "markdown"; // argi += 1; // - // } else if args[argi] == "--n2c" { - // readerOptions.InputFileFormat = "nidx"; - // writerOptions.OutputFileFormat = "csv"; - // writerOptions.ORS = "auto"; - // argi += 1; - // } else if args[argi] == "--n2t" { - // readerOptions.InputFileFormat = "nidx"; - // writerOptions.OutputFileFormat = "csv"; - // writerOptions.ORS = "auto"; - // writerOptions.OFS = "\t"; - // argi += 1; - // } else if args[argi] == "--n2d" { - // readerOptions.InputFileFormat = "nidx"; - // writerOptions.OutputFileFormat = "dkvp"; - // argi += 1; - // } else if args[argi] == "--n2j" { - // readerOptions.InputFileFormat = "nidx"; - // writerOptions.OutputFileFormat = "json"; - // argi += 1; - // } else if args[argi] == "--n2p" { - // readerOptions.InputFileFormat = "nidx"; - // writerOptions.OutputFileFormat = "pprint"; - // argi += 1; - // } else if args[argi] == "--n2x" { - // readerOptions.InputFileFormat = "nidx"; - // writerOptions.OutputFileFormat = "xtab"; - // argi += 1; + } else if args[argi] == "--n2c" { + readerOptions.InputFileFormat = "nidx"; + writerOptions.OutputFileFormat = "csv"; + writerOptions.ORS = "auto"; + argi += 1; + } else if args[argi] == "--n2t" { + readerOptions.InputFileFormat = "nidx"; + writerOptions.OutputFileFormat = "csv"; + writerOptions.ORS = "auto"; + writerOptions.OFS = "\t"; + argi += 1; + } else if args[argi] == "--n2d" { + readerOptions.InputFileFormat = "nidx"; + writerOptions.OutputFileFormat = "dkvp"; + argi += 1; + } else if args[argi] == "--n2j" { + readerOptions.InputFileFormat = "nidx"; + writerOptions.OutputFileFormat = "json"; + argi += 1; + } else if args[argi] == "--n2p" { + readerOptions.InputFileFormat = "nidx"; + writerOptions.OutputFileFormat = "pprint"; + argi += 1; + } else if args[argi] == "--n2x" { + readerOptions.InputFileFormat = "nidx"; + writerOptions.OutputFileFormat = "xtab"; + argi += 1; // } else if args[argi] == "--n2m" { // readerOptions.InputFileFormat = "nidx"; // writerOptions.OutputFileFormat = "markdown"; // argi += 1; // - // } else if args[argi] == "--j2c" { - // readerOptions.InputFileFormat = "json"; - // writerOptions.OutputFileFormat = "csv"; - // writerOptions.ORS = "auto"; - // argi += 1; - // } else if args[argi] == "--j2t" { - // readerOptions.InputFileFormat = "json"; - // writerOptions.OutputFileFormat = "csv"; - // writerOptions.ORS = "auto"; - // writerOptions.OFS = "\t"; - // argi += 1; - // } else if args[argi] == "--j2d" { - // readerOptions.InputFileFormat = "json"; - // writerOptions.OutputFileFormat = "dkvp"; - // argi += 1; - // } else if args[argi] == "--j2n" { - // readerOptions.InputFileFormat = "json"; - // writerOptions.OutputFileFormat = "nidx"; - // argi += 1; - // } else if args[argi] == "--j2p" { - // readerOptions.InputFileFormat = "json"; - // writerOptions.OutputFileFormat = "pprint"; - // argi += 1; - // } else if args[argi] == "--j2x" { - // readerOptions.InputFileFormat = "json"; - // writerOptions.OutputFileFormat = "xtab"; - // argi += 1; + } else if args[argi] == "--j2c" { + readerOptions.InputFileFormat = "json"; + writerOptions.OutputFileFormat = "csv"; + writerOptions.ORS = "auto"; + argi += 1; + } else if args[argi] == "--j2t" { + readerOptions.InputFileFormat = "json"; + writerOptions.OutputFileFormat = "csv"; + writerOptions.ORS = "auto"; + writerOptions.OFS = "\t"; + argi += 1; + } else if args[argi] == "--j2d" { + readerOptions.InputFileFormat = "json"; + writerOptions.OutputFileFormat = "dkvp"; + argi += 1; + } else if args[argi] == "--j2n" { + readerOptions.InputFileFormat = "json"; + writerOptions.OutputFileFormat = "nidx"; + argi += 1; + } else if args[argi] == "--j2p" { + readerOptions.InputFileFormat = "json"; + writerOptions.OutputFileFormat = "pprint"; + argi += 1; + } else if args[argi] == "--j2x" { + readerOptions.InputFileFormat = "json"; + writerOptions.OutputFileFormat = "xtab"; + argi += 1; // } else if args[argi] == "--j2m" { // readerOptions.InputFileFormat = "json"; // writerOptions.OutputFileFormat = "markdown"; diff --git a/go/todo.txt b/go/todo.txt index a84a5b1e4..c4b1c53f0 100644 --- a/go/todo.txt +++ b/go/todo.txt @@ -2,9 +2,9 @@ TOP OF LIST: * go-try: + ! quoted DKVP o clean up mlr --help to not advertise things it doesn't do yet - ! TSV/ASV - o quoted DKVP + o ASV o --x2y o 10-min mappers - cat -n -g diff --git a/go/u/try-io b/go/u/try-io index 2d7c72cd4..8fc4ad816 100755 --- a/go/u/try-io +++ b/go/u/try-io @@ -73,3 +73,4 @@ EOF run_mlr --itsv --ocsv cat u/s.tsv run_mlr --icsv --otsv cat u/s.tsv run_mlr --icsv --otsv cat u/s.csv +run_mlr --c2j cat u/s.csv