e2d7638b2848fe00bbf9b66bca395ec68a9ee9e6 braney Thu Oct 15 16:22:06 2015 -0700 first cut at bigMaf support #15935 diff --git src/hg/hgTracks/mafTrack.c src/hg/hgTracks/mafTrack.c index 53e57a2..a16aece 100644 --- src/hg/hgTracks/mafTrack.c +++ src/hg/hgTracks/mafTrack.c @@ -5,30 +5,31 @@ /* Copyright (C) 2014 The Regents of the University of California * See README in this or parent directory for licensing information. */ #include "common.h" #include "hash.h" #include "linefile.h" #include "jksql.h" #include "hdb.h" #include "hgTracks.h" #include "maf.h" #include "scoredRef.h" #include "hgMaf.h" #include "mafTrack.h" #include "customTrack.h" +#include "hubConnect.h" struct mafItem /* A maf track item. */ { struct mafItem *next; char *name; /* Common name */ char *db; /* Database */ int ix; /* Position in list. */ int height; /* Pixel height of item. */ }; static void mafItemFree(struct mafItem **pEl) /* Free up a mafItem. */ { @@ -577,31 +578,31 @@ * from list of MAF */ { struct mafAli *full, *sub = NULL, *maf = NULL; struct mafComp *mcMaster, *mc; char dbChrom[64]; int height1 = height-2; int ixMafAli = 0; /* alignment index, to allow alternating color */ int x1, x2; int lastAlignX2 = -1; double scale = scaleForPixels(width); if (doSnpMode) mafScoreUseSimple(); else mafScoreUseTraditional(); -safef(dbChrom, sizeof(dbChrom), "%s.%s", database, chromName); +safef(dbChrom, sizeof(dbChrom), "%s.%s", hubConnectSkipHubPrefix(database), chromName); for (full = mafList; full != NULL; full = full->next) { double *pixelScores = NULL; int i; int w; sub = NULL; if (mafNeedSubset(full, dbChrom, seqStart, seqEnd)) sub = maf = mafSubset(full, dbChrom, seqStart, seqEnd); else maf = full; if (maf != NULL) { ixMafAli++; mcMaster = mafFindComponent(maf, dbChrom); mc = mcMaster->next;