256b87a01941403ecb6d5b6ce2ed34aa0fd77514 markd Fri Dec 19 21:50:42 2014 -0800 added support for transmap V3 which includes source databases in mapped alignment idenitifier diff --git src/hg/hgTracks/transMapTracks.c src/hg/hgTracks/transMapTracks.c index 32bb38c..b41a7f4 100644 --- src/hg/hgTracks/transMapTracks.c +++ src/hg/hgTracks/transMapTracks.c @@ -72,31 +72,31 @@ unsigned labelSet, struct linkedFeatures *lf) /* get label for a transMap item */ { struct transMapInfo *info = NULL; 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, transMapIdToAcc(info->srcId)); + info->srcDb, transMapIdToSeqId(info->srcId)); } struct dyString *label = dyStringNew(64); if (labelSet & useOrgAbbrv && srcDbExists) addToLabel(label, orgShortForDb(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 @@ -132,31 +132,31 @@ static void loadTransMap(struct track *tg) /* Load up transMap alignments. */ { loadXenoPsl(tg); enum trackVisibility vis = limitVisibility(tg); if (!((vis == tvDense) || (vis == tvSquish))) lookupTransMapLabels(tg); if (vis != tvDense) slSort(&tg->items, linkedFeaturesCmpStart); } static char *transMapGetItemDataName(struct track *tg, char *itemName) /* translate itemName to data name (source accession). * WARNING: static return */ { -return transMapIdToAcc(itemName); +return transMapIdToSeqId(itemName); } 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);