fdb4b5d215ff23b0f066a9b7d7a96ae31045a347 braney Fri Jan 15 12:27:29 2016 -0800 yet more work on support CRAM under htslib diff --git src/hg/inc/hgBam.h src/hg/inc/hgBam.h index d907ba8..ec530e1 100644 --- src/hg/inc/hgBam.h +++ src/hg/inc/hgBam.h @@ -19,32 +19,34 @@ #include "jksql.h" #endif #include "trackDb.h" char *bamFileNameFromTable(struct sqlConnection *conn, char *table, char *bamSeqName); /* Return file name from table. If table has a seqName column, then grab the * row associated with bamSeqName (which can be e.g. '1' not 'chr1' if that is the * case in the bam file). */ struct samAlignment *bamFetchSamAlignment(char *fileOrUrl, char *chrom, int start, int end, struct lm *lm); /* Fetch region as a list of samAlignments - which is more or less an unpacked * bam record. Results is allocated out of lm, since it tends to be large... */ +struct samAlignment *bamFetchSamAlignmentPlus(char *fileOrUrl, char *chrom, int start, int end, + struct lm *lm, char *refUrl, char *cacheDir ); +/* Fetch region as a list of samAlignments - which is more or less an unpacked + * bam record. Results is allocated out of lm, since it tends to be large... */ + #ifdef USE_HTS struct samAlignment *bamReadNextSamAlignments(samfile_t *fh, bam_hdr_t *header, int count, struct lm *lm); #else struct samAlignment *bamReadNextSamAlignments(samfile_t *fh, int count, struct lm *lm); #endif /* Read next count alignments in SAM format, allocated in lm. May return less than * count at end of file. */ struct ffAli *bamToFfAli(const bam1_t *bam, struct dnaSeq *target, int targetOffset, boolean useStrand, char **retQSeq); /* Convert from bam to ffAli format. If retQSeq is non-null, set it to the * query sequence into which ffAli needle pointers point. */ -void cramInit(struct trackDb *tdb); -/* Initialize variables needed for CRAM parsing. */ - #endif//ndef HGBAM_H