314b81670d2d1446d4da81108ac0ce2a72fc569d markd Fri Jan 6 15:32:57 2017 -0800 bigTransMap hgc working diff --git src/hg/hgTracks/transMapTracks.c src/hg/hgTracks/transMapTracks.c index 5146263..386514e 100644 --- src/hg/hgTracks/transMapTracks.c +++ src/hg/hgTracks/transMapTracks.c @@ -77,31 +77,31 @@ struct transMapGene *gene = NULL; boolean srcDbExists = FALSE; if (labelSet & (useOrgCommon|useOrgAbbrv|useOrgDb|useGene)) { info = transMapInfoQuery(conn, transMapInfoTbl, lf->name); srcDbExists = sqlDatabaseExists(info->srcDb); } if ((labelSet & useGene) && (geneConn != NULL)) { gene = transMapGeneQuery(geneConn, transMapGeneTbl, info->srcDb, transMapIdToSeqId(info->srcId)); } struct dyString *label = dyStringNew(64); if (labelSet & useOrgAbbrv && srcDbExists) - addToLabel(label, orgShortForDb(info->srcDb)); + addToLabel(label, hOrgShortForDb(info->srcDb)); if (labelSet & useOrgCommon && srcDbExists) addToLabel(label, hOrganism(info->srcDb)); if (labelSet & useOrgDb) addToLabel(label, info->srcDb); if (labelSet & useGene) { if ((gene != NULL) && (strlen(gene->geneName) > 0)) addToLabel(label, gene->geneName); else labelSet |= useAcc; // no gene, so force acc } if (labelSet & useAcc) addToLabel(label, transMapIdToAcc(lf->name)); transMapInfoFree(&info); @@ -149,22 +149,25 @@ static void transMapMethods(struct track *tg) /* Make track for transMap alignments. */ { tg->loadItems = loadTransMap; tg->itemName = refGeneName; tg->mapItemName = linkedFeaturesName; tg->itemDataName = transMapGetItemDataName; } void transMapRegisterTrackHandlers() /* register track handlers for transMap tracks */ { registerTrackHandler("transMap", transMapMethods); +if (0) + { /// FIXME // FIXME: legacy, this can be removed once trackDb files with trackHandler -// attributes are ushed +// attributes are pushed registerTrackHandler("transMapAlnRefSeq", transMapMethods); registerTrackHandler("transMapAlnMRna", transMapMethods); registerTrackHandler("transMapAlnSplicedEst", transMapMethods); registerTrackHandler("transMapAlnUcscGenes", transMapMethods); } +}