c43e813a238e650c17e8dee441653d9037a86e18 kate Sun Apr 15 21:51:04 2018 -0700 Fix problem with r,g,b color specs. Now also supports #RRGGBB anand 16 HTML color names. refs #21109 diff --git src/hg/hgc/interactClick.c src/hg/hgc/interactClick.c index 7ac27c0..e175468 100644 --- src/hg/hgc/interactClick.c +++ src/hg/hgc/interactClick.c @@ -25,56 +25,56 @@ } else { conn = hAllocConnTrack(database, tdb); table = tdb->table; } if (conn == NULL) return NULL; struct interact *inters = NULL, *inter = NULL; char **row; int offset; struct sqlResult *sr = hRangeQuery(conn, table, chrom, start, end, NULL, &offset); while ((row = sqlNextRow(sr)) != NULL) { - inter = interactLoad(row+offset); + inter = interactLoadAndValidate(row+offset); if (inter->chromStart != start || inter->chromEnd != end) continue; if (isNotEmpty(item) && differentString(inter->name, item)) continue; slAddHead(&inters, inter); } slSort(&inters, interactDistanceCmp); sqlFreeResult(&sr); hFreeConn(&conn); return inters; } static struct interact *getInteractFromFile(char *file, char *item, char *chrom, int start, int end) /* Retrieve interact BED item from big file */ { struct bbiFile *bbi = bigBedFileOpen(file); struct lm *lm = lmInit(0); struct bigBedInterval *bb, *bbList = bigBedIntervalQuery(bbi, chrom, start, end, 0, lm); struct interact *inters = NULL, *inter = NULL; for (bb = bbList; bb != NULL; bb = bb->next) { char startBuf[16], endBuf[16]; char *row[32]; bigBedIntervalToRow(bb, chrom, startBuf, endBuf, row, ArraySize(row)); - inter = interactLoad(row); + inter = interactLoadAndValidate(row); if (inter == NULL) continue; if (inter->chromStart != start || inter->chromEnd != end) continue; if (isNotEmpty(item) && differentString(inter->name, item)) continue; slAddHead(&inters, inter); } slSort(&inters, interactDistanceCmp); return inters; } static struct interact *getInteractions(struct trackDb *tdb, char *item, char *chrom, int start, int end) /* Retrieve interact BED item from track */