From e6ba78ac1e0c41c4256dd385895352236d80426a Mon Sep 17 00:00:00 2001 From: Charles Plessy Date: Thu, 19 Aug 2010 15:49:17 +0900 Subject: [PATCH] Imported Upstream version 0.1.1 --- index.c | 4 ++-- main.c | 3 ++- tabix.1 | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/index.c b/index.c index cc56498..80b863d 100644 --- a/index.c +++ b/index.c @@ -159,8 +159,8 @@ static int get_intv(ti_index_t *idx, kstring_t *str, ti_intv_t *intv) if (i != str->l) str->s[i] = '\t'; } else if (id == idx->conf.bc) { // here ->beg is 1-based. it will be changed to 0-based at the end of this routine. - intv->beg = strtol(str->s + b, &s, 0); - if (idx->conf.preset&TI_FLAG_UCSC) ++intv->beg; + intv->beg = intv->end = strtol(str->s + b, &s, 0); + if (!(idx->conf.preset&TI_FLAG_UCSC)) --intv->beg; } else { if ((idx->conf.preset&0xffff) == TI_PRESET_GENERIC) { if (id == idx->conf.ec) intv->end = strtol(str->s + b, &s, 0); diff --git a/main.c b/main.c index faef7fb..02daedf 100644 --- a/main.c +++ b/main.c @@ -5,7 +5,7 @@ #include "bgzf.h" #include "tabix.h" -#define PACKAGE_VERSION "0.1.0 (r506)" +#define PACKAGE_VERSION "0.1.1 (r542)" static int fetch_func(int l, const char *s, void *data) { @@ -82,6 +82,7 @@ int main(int argc, char *argv[]) for (i = optind + 1; i < argc; ++i) { int tid, beg, end; if (ti_parse_region(idx, argv[i], &tid, &beg, &end) == 0) { + fprintf(stderr, "%d,%d\n", beg, end); ti_fetch(fp, idx, tid, beg, end, 0, fetch_func); } else fprintf(stderr, "[main] invalid region: unknown target name or minus interval.\n"); } diff --git a/tabix.1 b/tabix.1 index 6b6e2d6..4b5eea2 100644 --- a/tabix.1 +++ b/tabix.1 @@ -1,4 +1,4 @@ -.TH tabix 1 "2 November 2009" "tabix-0.1.0" "Bioinformatics tools" +.TH tabix 1 "16 March 2009" "tabix-0.1.1" "Bioinformatics tools" .SH NAME .PP bgzip - Block compression/decompression utility @@ -69,7 +69,8 @@ are all stored in the index file and thus not used in data retrieval. [1] Column of start chromosomal position. [4] .TP .BI "-e " INT -Column of end chromosomal position. [5] +Column of end chromosomal position. The end column can be the same as +start column, [5] .TP .BI "-S " INT Skip first INT lines in the data file. [0] -- 2.30.2