diff --git a/pkg/obioptions/version.go b/pkg/obioptions/version.go index cf9aaab..02e39bb 100644 --- a/pkg/obioptions/version.go +++ b/pkg/obioptions/version.go @@ -8,7 +8,7 @@ import ( // corresponds to the last commit, and not the one when the file will be // commited -var _Commit = "b5cf586" +var _Commit = "fbe7d15" var _Version = "Release 4.4.0" // Version returns the version of the obitools package. diff --git a/pkg/obitools/obiconvert/options.go b/pkg/obitools/obiconvert/options.go index f3a9cea..0d9efed 100644 --- a/pkg/obitools/obiconvert/options.go +++ b/pkg/obitools/obiconvert/options.go @@ -23,6 +23,7 @@ var __input_embl_format__ = false var __input_genbank_format__ = false var __input_fastq_format__ = false var __input_fasta_format__ = false +var __input_csv_format__ = false var __output_in_fasta__ = false var __output_in_fastq__ = false @@ -65,6 +66,9 @@ func InputOptionSet(options *getoptions.GetOpt) { options.BoolVar(&__input_fasta_format__, "fasta", __input_fasta_format__, options.Description("Read data following the fasta format.")) + options.BoolVar(&__input_csv_format__, "csv", __input_csv_format__, + options.Description("Read data following the CSV format.")) + options.BoolVar(&__no_ordered_input__, "no-order", __no_ordered_input__, options.Description("When several input files are provided, "+ "indicates that there is no order among them.")) @@ -139,6 +143,8 @@ func CLIInputFormat() string { return "embl" case __input_genbank_format__: return "genbank" + case __input_csv_format__: + return "csv" default: return "guessed" } diff --git a/pkg/obitools/obiconvert/sequence_reader.go b/pkg/obitools/obiconvert/sequence_reader.go index d3b8430..2d4c690 100644 --- a/pkg/obitools/obiconvert/sequence_reader.go +++ b/pkg/obitools/obiconvert/sequence_reader.go @@ -126,6 +126,12 @@ func CLIReadBioSequences(filenames ...string) (obiiter.IBioSequence, error) { iterator, err = obiformats.ReadEMBL(os.Stdin, opts...) case "genbank": iterator, err = obiformats.ReadGenbank(os.Stdin, opts...) + case "fasta": + iterator, err = obiformats.ReadFasta(os.Stdin, opts...) + case "fastq": + iterator, err = obiformats.ReadFastq(os.Stdin, opts...) + case "csv": + iterator, err = obiformats.ReadCSV(os.Stdin, opts...) default: iterator = obiformats.ReadFastSeqFromStdin(opts...) } @@ -146,6 +152,8 @@ func CLIReadBioSequences(filenames ...string) (obiiter.IBioSequence, error) { reader = obiformats.ReadFastqFromFile case "fasta": reader = obiformats.ReadFastaFromFile + case "csv": + reader = obiformats.ReadCSVFromFile case "ecopcr": reader = obiformats.ReadEcoPCRFromFile case "embl":