e947f44bed3e61a500f59423d3c560eff9bcf270 galt Fri Dec 13 15:03:41 2013 -0800 Merging in bigWigCat shared branch with --squash. This is Daniel Zerbino's work. diff --git src/inc/cirTree.h src/inc/cirTree.h index 088d70e..f30fcd2 100644 --- src/inc/cirTree.h +++ src/inc/cirTree.h @@ -36,30 +36,33 @@ /* Close and free up cirTree file opened with cirTreeFileAttach. */ struct cirTreeFile *cirTreeFileAttach(char *fileName, struct udcFile *udc); /* Open up r-tree index file on previously open file, with cirTree * header at current file position. */ void cirTreeFileDetach(struct cirTreeFile **pCrt); /* Detach and free up cirTree file opened with cirTreeFileAttach. */ struct fileOffsetSize *cirTreeFindOverlappingBlocks(struct cirTreeFile *crf, bits32 chromIx, bits32 start, bits32 end); /* Return list of file blocks that between them contain all items that overlap * start/end on chromIx. Also there will be likely some non-overlapping items * in these blocks too. When done, use slListFree to dispose of the result. */ +struct fileOffsetSize *cirTreeEnumerateBlocks(struct cirTreeFile *crf); +/* Return list of file blocks. When done, use slListFree to dispose of the result. */ + struct cirTreeRange /* A chromosome id and an interval inside it. */ { bits32 chromIx; /* Chromosome id. */ bits32 start; /* Start position in chromosome. */ bits32 end; /* One past last base in interval in chromosome. */ }; void cirTreeFileBulkIndexToOpenFile( void *itemArray, int itemSize, bits64 itemCount, bits32 blockSize, bits32 itemsPerSlot, void *context, struct cirTreeRange (*fetchKey)(const void *va, void *context), bits64 (*fetchOffset)(const void *va, void *context), bits64 endFileOffset, FILE *f);