d7b8c8436b55a4f08f46a7caae8bf3ab88773f9f jcasper Fri May 17 13:40:41 2019 -0700 Changes in response to code review, refs #23481 diff --git src/hg/lib/hic.c src/hg/lib/hic.c index 31b1fb6..80c7afd 100644 --- src/hg/lib/hic.c +++ src/hg/lib/hic.c @@ -21,37 +21,38 @@ int nChroms, nBpRes; char *errMsg = CstrawHeader(filename, &genome, &chromosomes, &nChroms, &bpResolutions, &nBpRes, NULL, NULL); if (errMsg != NULL) return errMsg; struct hicMeta *newMeta = NULL; AllocVar(newMeta); newMeta->assembly = genome; newMeta->nRes = nBpRes; newMeta->resolutions = bpResolutions; newMeta->nChroms = nChroms; newMeta->chromNames = chromosomes; newMeta->ucscToAlias = NULL; -if (!trackHubDatabase(genome)) - { +*header = newMeta; +if (trackHubDatabase(genome)) + return NULL; + +// add alias hash in case file uses 1 vs chr1, etc. struct hash *aliasToUcsc = chromAliasMakeLookupTable(newMeta->assembly); if (aliasToUcsc != NULL) { struct hash *ucscToAlias = newHash(0); int i; for (i=0; i<nChroms; i++) { struct chromAlias *cA = hashFindVal(aliasToUcsc, chromosomes[i]); if (cA != NULL) { hashAdd(ucscToAlias, cA->chrom, cloneString(chromosomes[i])); } } newMeta->ucscToAlias = ucscToAlias; hashFree(&aliasToUcsc); } - } -*header = newMeta; return NULL; }