c55e112ffa131f0a5999f22b4eabd0178b50492e kate Tue May 9 10:30:54 2017 -0700 Add setting barChartMatrixUrl. Will replace barChartDataUrl (left in for now for internal user/QA convenience. Also fixed broken links in trackDb docs. refs #18736 diff --git src/hg/hgc/barChartClick.c src/hg/hgc/barChartClick.c index 1030bf5..3fdc9ae 100644 --- src/hg/hgc/barChartClick.c +++ src/hg/hgc/barChartClick.c @@ -257,31 +257,35 @@ AllocVar(data); data->sample = cloneString(val->sample); data->category = cloneString(sample->category); data->value = val->value; slAddHead(&sampleVals, data); } } return sampleVals; } static struct barChartItemData *getSampleVals(struct trackDb *tdb, struct barChartBed *chartItem, char **retMatrixUrl, char **retSampleUrl) /* Get data values for this item (locus) from all samples */ { struct barChartItemData *vals = NULL; -char *dataFile = trackDbSetting(tdb, "barChartDataUrl"); +char *dataFile = trackDbSetting(tdb, "barChartMatrixUrl"); +// for backwards compatibility during qa review +if (dataFile == NULL) + dataFile = trackDbSetting(tdb, "barChartDataUrl"); +// for backwards compatibility during qa review struct hash *categoryHash = getTrackCategories(tdb); if (dataFile != NULL) { char *sampleFile = trackDbSetting(tdb, "barChartSampleUrl"); if (sampleFile == NULL) return NULL; if (retMatrixUrl != NULL) *retMatrixUrl = dataFile; if (retSampleUrl != NULL) *retSampleUrl = sampleFile; vals = getSampleValsFromFile(tdb, categoryHash, chartItem, dataFile, sampleFile); } else vals = getSampleValsFromTable(tdb, categoryHash, chartItem); return vals;