Skip to content

Commit

Permalink
VSEARCH 2.13.3: Fix bug in FASTQ parsing
Browse files Browse the repository at this point in the history
  • Loading branch information
torognes committed Apr 30, 2019
1 parent bf3ae02 commit d1853a1
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 20 deletions.
32 changes: 16 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Most of the nucleotide based commands and options in USEARCH version 7 are suppo

## Getting Help

If you can't find an answer in the [VSEARCH documentation](https://github.com/torognes/vsearch/releases/download/v2.13.2/vsearch_manual.pdf), please visit the [VSEARCH Web Forum](https://groups.google.com/forum/#!forum/vsearch-forum) to post a question or start a discussion.
If you can't find an answer in the [VSEARCH documentation](https://github.com/torognes/vsearch/releases/download/v2.13.3/vsearch_manual.pdf), please visit the [VSEARCH Web Forum](https://groups.google.com/forum/#!forum/vsearch-forum) to post a question or start a discussion.

## Example

Expand All @@ -37,9 +37,9 @@ In the example below, VSEARCH will identify sequences in the file database.fsa t
**Source distribution** To download the source distribution from a [release](https://github.com/torognes/vsearch/releases) and build the executable and the documentation, use the following commands:

```
wget https://github.com/torognes/vsearch/archive/v2.13.2.tar.gz
tar xzf v2.13.2.tar.gz
cd vsearch-2.13.2
wget https://github.com/torognes/vsearch/archive/v2.13.3.tar.gz
tar xzf v2.13.3.tar.gz
cd vsearch-2.13.3
./autogen.sh
./configure
make
Expand Down Expand Up @@ -68,43 +68,43 @@ Binary distributions are provided for x86-64 systems running GNU/Linux, macOS (v
Download the appropriate executable for your system using the following commands if you are using a Linux x86_64 system:

```sh
wget https://github.com/torognes/vsearch/releases/download/v2.13.2/vsearch-2.13.2-linux-x86_64.tar.gz
tar xzf vsearch-2.13.2-linux-x86_64.tar.gz
wget https://github.com/torognes/vsearch/releases/download/v2.13.3/vsearch-2.13.3-linux-x86_64.tar.gz
tar xzf vsearch-2.13.3-linux-x86_64.tar.gz
```

Or these commands if you are using a Linux ppc64le system:

```sh
wget https://github.com/torognes/vsearch/releases/download/v2.13.2/vsearch-2.13.2-linux-ppc64le.tar.gz
tar xzf vsearch-2.13.2-linux-ppc64le.tar.gz
wget https://github.com/torognes/vsearch/releases/download/v2.13.3/vsearch-2.13.3-linux-ppc64le.tar.gz
tar xzf vsearch-2.13.3-linux-ppc64le.tar.gz
```

Or these commands if you are using a Linux aarch64 system:

```sh
wget https://github.com/torognes/vsearch/releases/download/v2.13.2/vsearch-2.13.2-linux-aarch64.tar.gz
tar xzf vsearch-2.13.2-linux-aarch64.tar.gz
wget https://github.com/torognes/vsearch/releases/download/v2.13.3/vsearch-2.13.3-linux-aarch64.tar.gz
tar xzf vsearch-2.13.3-linux-aarch64.tar.gz
```

Or these commands if you are using a Mac:

```sh
wget https://github.com/torognes/vsearch/releases/download/v2.13.2/vsearch-2.13.2-macos-x86_64.tar.gz
tar xzf vsearch-2.13.2-macos-x86_64.tar.gz
wget https://github.com/torognes/vsearch/releases/download/v2.13.3/vsearch-2.13.3-macos-x86_64.tar.gz
tar xzf vsearch-2.13.3-macos-x86_64.tar.gz
```

Or if you are using Windows, download and extract (unzip) the contents of this file:

```
https://github.com/torognes/vsearch/releases/download/v2.13.2/vsearch-2.13.2-win-x86_64.zip
https://github.com/torognes/vsearch/releases/download/v2.13.3/vsearch-2.13.3-win-x86_64.zip
```

Linux and Mac: You will now have the binary distribution in a folder called `vsearch-2.13.2-linux-x86_64` or `vsearch-2.13.2-macos-x86_64` in which you will find three subfolders `bin`, `man` and `doc`. We recommend making a copy or a symbolic link to the vsearch binary `bin/vsearch` in a folder included in your `$PATH`, and a copy or a symbolic link to the vsearch man page `man/vsearch.1` in a folder included in your `$MANPATH`. The PDF version of the manual is available in `doc/vsearch_manual.pdf`.
Linux and Mac: You will now have the binary distribution in a folder called `vsearch-2.13.3-linux-x86_64` or `vsearch-2.13.3-macos-x86_64` in which you will find three subfolders `bin`, `man` and `doc`. We recommend making a copy or a symbolic link to the vsearch binary `bin/vsearch` in a folder included in your `$PATH`, and a copy or a symbolic link to the vsearch man page `man/vsearch.1` in a folder included in your `$MANPATH`. The PDF version of the manual is available in `doc/vsearch_manual.pdf`.

Windows: You will now have the binary distribution in a folder called `vsearch-2.13.2-win-x86_64`. The vsearch executable is called `vsearch.exe`. The manual in PDF format is called `vsearch_manual.pdf`.
Windows: You will now have the binary distribution in a folder called `vsearch-2.13.3-win-x86_64`. The vsearch executable is called `vsearch.exe`. The manual in PDF format is called `vsearch_manual.pdf`.


**Documentation** The VSEARCH user's manual is available in the `man` folder in the form of a [man page](https://github.com/torognes/vsearch/blob/master/man/vsearch.1). A pdf version ([vsearch_manual.pdf](https://github.com/torognes/vsearch/releases/download/v2.13.2/vsearch_manual.pdf)) will be generated by `make`. To install the manpage manually, copy the `vsearch.1` file or a create a symbolic link to `vsearch.1` in a folder included in your `$MANPATH`. The manual in both formats is also available with the binary distribution. The manual in PDF form ([vsearch_manual.pdf](https://github.com/torognes/vsearch/releases/download/v2.13.2/vsearch_manual.pdf)) is also attached to the latest [release](https://github.com/torognes/vsearch/releases).
**Documentation** The VSEARCH user's manual is available in the `man` folder in the form of a [man page](https://github.com/torognes/vsearch/blob/master/man/vsearch.1). A pdf version ([vsearch_manual.pdf](https://github.com/torognes/vsearch/releases/download/v2.13.3/vsearch_manual.pdf)) will be generated by `make`. To install the manpage manually, copy the `vsearch.1` file or a create a symbolic link to `vsearch.1` in a folder included in your `$MANPATH`. The manual in both formats is also available with the binary distribution. The manual in PDF form ([vsearch_manual.pdf](https://github.com/torognes/vsearch/releases/download/v2.13.3/vsearch_manual.pdf)) is also attached to the latest [release](https://github.com/torognes/vsearch/releases).


## Plugins, packages, and wrappers
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.

AC_PREREQ([2.63])
AC_INIT([vsearch], [2.13.2], [torognes@ifi.uio.no])
AC_INIT([vsearch], [2.13.3], [torognes@ifi.uio.no])
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE([subdir-objects])
AC_LANG([C++])
Expand Down
5 changes: 4 additions & 1 deletion man/vsearch.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.\" ============================================================================
.TH vsearch 1 "April 30, 2019" "version 2.13.2" "USER COMMANDS"
.TH vsearch 1 "April 30, 2019" "version 2.13.3" "USER COMMANDS"
.\" ============================================================================
.SH NAME
vsearch \(em chimera detection, clustering, dereplication and
Expand Down Expand Up @@ -3768,6 +3768,9 @@ issued. Minor changes to the manual.
.BR v2.13.2\~ "released April 30th, 2019"
Fixed bug related to improper handling of newlines on Windows.
Allowed option strand plus to uchime_ref for compatibility.
.TP
.BR v2.13.3\~ "released April 30th, 2019"
Fixed bug in FASTQ parsing introduced in version 2.13.2.
.RE
.LP
.\" ============================================================================
Expand Down
4 changes: 2 additions & 2 deletions src/fastq.cc
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,6 @@ bool fastq_next(fastx_handle h,
rest -= len;
}

fastx_filter_header(h, truncateatspace);

uint64_t lineno_seq = h->lineno;

/* read sequence line(s) */
Expand Down Expand Up @@ -374,6 +372,8 @@ bool fastq_next(fastx_handle h,
fastq_fatal(lineno_qual,
"Sequence and quality lines must be equally long");

fastx_filter_header(h, truncateatspace);

h->seqno++;

return 1;
Expand Down

1 comment on commit d1853a1

@torognes
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Version 2.13.2 introduced a bug in FASTQ parsing. Fixed here.

Please sign in to comment.