19eaeb4d65c6962e516fb23474643ba754c32ea1 angie Fri Feb 11 10:52:15 2011 -0800 Feature #2821 (VCF parser): works on a 1000 Genomes pilot release VCF+tabix file with genotypes.[Note: this is a squash of 6 commits, developed off in my vcf branch.] diff --git src/inc/linefile.h src/inc/linefile.h index b84127a..62ccc3a 100644 --- src/inc/linefile.h +++ src/inc/linefile.h @@ -210,29 +210,29 @@ void lineFileSetUniqueMetaData(struct lineFile *lf); /* suppress duplicate lines in metadata */ void lineFileRemoveInitialCustomTrackLines(struct lineFile *lf); /* remove initial browser and track lines */ /*----- Optionally-compiled wrapper on tabix (compression + indexing): -----*/ #define COMPILE_WITH_TABIX "%s: Sorry, this functionality is available only when\n" \ "you have installed the tabix library from\n" \ "http://samtools.sourceforge.net/ and rebuilt kent/src with USE_TABIX=1\n" \ "(see http://genomewiki.ucsc.edu/index.php/Build_Environment_Variables)." -struct lineFile *lineFileOnTabix(char *fileName, bool zTerm); +struct lineFile *lineFileOnTabix(char *fileOrUrl, bool zTerm); /* Wrap a line file around a data file that has been compressed and indexed * by the tabix command line program. The index file <fileName>.tbi must be * readable in addition to fileName. If there's a problem, warn & return NULL. * This works only if kent/src has been compiled with USE_TABIX=1 and linked * with the tabix C library. */ boolean lineFileSetTabixRegion(struct lineFile *lf, char *seqName, int start, int end); /* Assuming lf was created by lineFileOnTabix, tell tabix to seek to the specified region - * and return TRUE (or if unable, return FALSE). */ + * and return TRUE (or if there are no items in region, return FALSE). */ #endif /* LINEFILE_H */