12d0bf30d4a9fbe7aee60fdf9e7f8827116ba400 markd Wed Jan 27 17:49:12 2021 -0800 allow overlap select to ignore non-standard columns in BED as well as genePred and PSL, as often come with bigBed diff --git src/hg/utils/overlapSelect/rowReader.c src/hg/utils/overlapSelect/rowReader.c index 4de7ce5..573e5f5 100644 --- src/hg/utils/overlapSelect/rowReader.c +++ src/hg/utils/overlapSelect/rowReader.c @@ -1,34 +1,35 @@ /* rowReader - read rows from tab files or databases without length restrictions */ /* Copyright (C) 2011 The Regents of the University of California * See README in this or parent directory for licensing information. */ #include "common.h" #include "rowReader.h" #include "linefile.h" #include "psl.h" -struct rowReader *rowReaderOpen(char *fileName, boolean isPslFile) +struct rowReader *rowReaderOpen(char *fileName, int maxParsedCols, boolean isPslFile) /* create a row reader for a file */ { struct rowReader *rr; AllocVar(rr); if (isPslFile) rr->lf = pslFileOpen(fileName); // handles psl headers else rr->lf = lineFileOpen(fileName, TRUE); +rr->maxParsedCols = maxParsedCols; rr->colSpace = 32; AllocArray(rr->row, rr->colSpace); return rr; } void rowReaderFree(struct rowReader **rrPtr) /* free a row reader */ { struct rowReader *rr = *rrPtr; if (rr != NULL) { lineFileClose(&rr->lf); freeMem(rr->row); freeMem(rr); *rrPtr = NULL;