cfa3310ec7d0c3ef45a3f647c7e7164453d9d4e0 kent Tue Mar 5 01:01:42 2013 -0800 A little more progress on multiple extra index change. First time reader and writer have both worked in any small way together. diff --git src/utils/bigBedNamedItems/bigBedNamedItems.c src/utils/bigBedNamedItems/bigBedNamedItems.c index 33e7818..c7c0ebf 100644 --- src/utils/bigBedNamedItems/bigBedNamedItems.c +++ src/utils/bigBedNamedItems/bigBedNamedItems.c @@ -1,62 +1,68 @@ /* bigBedNamedItems - Extract item(s) of given name(s) from bigBed. */ #include "common.h" #include "linefile.h" #include "hash.h" #include "options.h" #include "localmem.h" #include "udc.h" #include "bPlusTree.h" #include "bigBed.h" #include "obscure.h" #include "zlibFace.h" +char *field = "name"; + void usage() /* Explain usage and exit. */ { errAbort( "bigBedNamedItems - Extract item of given name from bigBed\n" "usage:\n" " bigBedNamedItems file.bb name output.bed\n" "options:\n" " -nameFile - if set, treat name parameter as file full of space delimited names\n" + " -field=fieldName - use index on field name, default is \"name\"\n" ); } /* Command line validation table. */ static struct optionSpec options[] = { {"nameFile", OPTION_BOOLEAN}, + {"field", OPTION_STRING}, {NULL, 0}, }; void bigBedNamedItems(char *bigBedFile, char *name, char *outFile) /* bigBedNamedItems - Extract item(s) of given name(s) from bigBed. */ { struct bbiFile *bbi = bigBedFileOpen(bigBedFile); FILE *f = mustOpen(outFile, "w"); struct lm *lm = lmInit(0); struct bigBedInterval *intervalList; +struct bptFile *bpt = bigBedOpenExtraIndex(bbi, field); if (optionExists("nameFile")) { int wordCount = 0; char **words; char *buf; readAllWords(name, &words, &wordCount, &buf); - intervalList = bigBedMultiNameQuery(bbi, words, wordCount, lm); + intervalList = bigBedMultiNameQuery(bbi, bpt, words, wordCount, lm); } else { - intervalList = bigBedNameQuery(bbi, name, lm); + intervalList = bigBedNameQuery(bbi, bpt, name, lm); } bigBedIntervalListToBedFile(bbi, intervalList, f); carefulClose(&f); } int main(int argc, char *argv[]) /* Process command line. */ { optionInit(&argc, argv, options); if (argc != 4) usage(); +field = optionVal("field", field); bigBedNamedItems(argv[1], argv[2], argv[3]); return 0; }