48607395c5be6a047d54429310deeada24198b36
braney
Fri May 6 15:57:51 2016 -0700
some tweaks to get bigMaf custom tracks to work
diff --git src/hg/hgc/hgc.c src/hg/hgc/hgc.c
index 772fa1e..3a6a368 100644
--- src/hg/hgc/hgc.c
+++ src/hg/hgc/hgc.c
@@ -20736,30 +20736,32 @@
break;
if (ct == NULL)
errAbort("Couldn't find '%s' in '%s'", trackId, fileName);
type = ct->tdb->type;
cartWebStart(cart, database, "Custom Track: %s", ct->tdb->shortLabel);
itemName = skipLeadingSpaces(fileItem);
printf("
%s
\n", ct->tdb->longLabel);
if (sameWord(type, "array"))
doExpRatio(ct->tdb, fileItem, ct);
else if (sameWord(type, "encodePeak"))
doEncodePeak(ct->tdb, ct, fileName);
else if (sameWord(type, "bigWig"))
bigWigCustomClick(ct->tdb);
else if (sameWord(type, "bigPsl"))
genericBigPslClick(NULL, ct->tdb, item, start, end);
+else if (sameWord(type, "bigMaf"))
+ genericMafClick(NULL, ct->tdb, item, start);
else if (sameWord(type, "bigBed") || sameWord(type, "bigGenePred"))
bigBedCustomClick(ct->tdb);
#ifdef USE_BAM
else if (sameWord(type, "bam"))
doBamDetails(ct->tdb, itemName);
#endif//def USE_BAM
#ifdef USE_TABIX
else if (sameWord(type, "vcfTabix"))
doVcfTabixDetails(ct->tdb, itemName);
#endif//def USE_TABIX
else if (sameWord(type, "vcf"))
doVcfDetails(ct->tdb, itemName);
else if (sameWord(type, "makeItems"))
doMakeItemsDetails(ct, fileName); // fileName is first word, which is, go figure, id
else if (ct->wiggle)
@@ -24778,31 +24780,31 @@
cartString(cart, "c"), winStart, winEnd);
else
seqName = hDefaultChrom(database);
}
struct customTrack *ct = NULL;
if (isCustomTrack(track))
{
struct customTrack *ctList = getCtList();
for (ct = ctList; ct != NULL; ct = ct->next)
if (sameString(track, ct->tdb->track))
break;
}
if ((!isCustomTrack(track) && dbIsFound)
-|| ((ct!= NULL) && (ct->dbTrackType != NULL) && sameString(ct->dbTrackType, "maf")))
+|| ((ct!= NULL) && (((ct->dbTrackType != NULL) && sameString(ct->dbTrackType, "maf"))|| sameString(ct->tdb->type, "bigMaf"))))
{
trackHash = makeTrackHashWithComposites(database, seqName, TRUE);
if (sameString("htcBigPslAli", track) )
{
char *aliTable = cartString(cart, "aliTable");
if (isHubTrack(aliTable))
tdb = hubConnectAddHubForTrackAndFindTdb( database, aliTable, NULL, trackHash);
}
else if (isHubTrack(track))
{
tdb = hubConnectAddHubForTrackAndFindTdb( database, track, NULL, trackHash);
}
if (parentWigMaf)
{
int wordCount, i;