41bbd268df98df338d98b6b98c62ab595d85aff1 braney Mon May 4 14:19:12 2020 -0700 don't print out conf field in rnaStruct tables if not present. Added link to PseudoViewer diff --git src/hg/lib/rnaSecStr.c src/hg/lib/rnaSecStr.c index 3e7ddd2..426ab31 100644 --- src/hg/lib/rnaSecStr.c +++ src/hg/lib/rnaSecStr.c @@ -15,34 +15,52 @@ struct rnaSecStr *rnaSecStrLoad(char **row) /* Load a rnaSecStr from row fetched with select * from rnaSecStr * from database. Dispose of this with rnaSecStrFree(). */ { struct rnaSecStr *ret; AllocVar(ret); ret->size = sqlUnsigned(row[6]); ret->chrom = cloneString(row[0]); ret->chromStart = sqlUnsigned(row[1]); ret->chromEnd = sqlUnsigned(row[2]); ret->name = cloneString(row[3]); ret->score = sqlUnsigned(row[4]); strcpy(ret->strand, row[5]); ret->secStr = cloneString(row[7]); +return ret; +} + +struct rnaSecStr *rnaSecStrLoadConf(char **row) +{ +struct rnaSecStr *ret; +/* Load a rnaSecStr from row fetched with select * from rnaSecStr + * from database. Dispose of this with rnaSecStrFree(). */ + +AllocVar(ret); +ret->size = sqlUnsigned(row[6]); +ret->chrom = cloneString(row[0]); +ret->chromStart = sqlUnsigned(row[1]); +ret->chromEnd = sqlUnsigned(row[2]); +ret->name = cloneString(row[3]); +ret->score = sqlUnsigned(row[4]); +strcpy(ret->strand, row[5]); +ret->secStr = cloneString(row[7]); { int sizeOne; sqlDoubleDynamicArray(row[8], &ret->conf, &sizeOne); -//assert(sizeOne == ret->size); +assert(sizeOne == ret->size); } return ret; } struct rnaSecStr *rnaSecStrLoadAll(char *fileName) /* Load all rnaSecStr from a whitespace-separated file. * Dispose of this with rnaSecStrFreeList(). */ { struct rnaSecStr *list = NULL, *el; struct lineFile *lf = lineFileOpen(fileName, TRUE); char *row[9]; while (lineFileRow(lf, row)) { el = rnaSecStrLoad(row);